From ff189dd2b733208aad583e40514c59662035d705 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 23 Apr 2024 16:17:09 +0200 Subject: [PATCH] vm-manager: add empty list screen --- pkgs/clan-vm-manager/clan_vm_manager/assets/__init__.py | 2 +- .../clan-vm-manager/clan_vm_manager/components/gkvstore.py | 2 +- .../clan_vm_manager/components/list_splash.py | 7 ++++--- .../clan-vm-manager/clan_vm_manager/windows/main_window.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/__init__.py b/pkgs/clan-vm-manager/clan_vm_manager/assets/__init__.py index dc7d75b3a..3c5a1dbb1 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/assets/__init__.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/assets/__init__.py @@ -4,5 +4,5 @@ from typing import Union loc: Path = Path(__file__).parent -def get_asset(name: Union[str, Path]) -> Path: +def get_asset(name: str | Path) -> Path: return loc / name diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py b/pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py index 0ad3aad8e..227f323c1 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py @@ -1,6 +1,6 @@ import logging from collections.abc import Callable -from typing import Any, Generic, TypeVar, ClassVar +from typing import Any, ClassVar, Generic, TypeVar import gi diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/list_splash.py b/pkgs/clan-vm-manager/clan_vm_manager/components/list_splash.py index 36791df6b..e9de642b5 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/list_splash.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/components/list_splash.py @@ -1,12 +1,13 @@ import logging -from typing import Callable, Optional, TypeVar +from collections.abc import Callable +from typing import TypeVar import gi from clan_vm_manager import assets gi.require_version("Adw", "1") -from gi.repository import Adw, Gio, GObject, Gtk, GdkPixbuf +from gi.repository import Adw, GdkPixbuf, Gio, GObject, Gtk log = logging.getLogger(__name__) @@ -53,7 +54,7 @@ class EmptySplash(Gtk.Box): self.append(clamp) - def load_image(self, file_path: str) -> Optional[GdkPixbuf.Pixbuf]: + def load_image(self, file_path: str) -> GdkPixbuf.Pixbuf | None: try: pixbuf = GdkPixbuf.Pixbuf.new_from_file(file_path) return pixbuf diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py index fcc801d43..cba0a56f7 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py @@ -1,6 +1,6 @@ import logging import threading -from typing import Callable +from collections.abc import Callable import gi from clan_cli.history.list import list_history