From 8a9d3d323025566de5446d46cde7fc765071da98 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Thu, 8 Feb 2024 15:00:36 +0700 Subject: [PATCH] UI: Fixed incorrect display of cLAN icon in window switcher --- pkgs/clan-vm-manager/clan_vm_manager/app.py | 5 ++--- pkgs/clan-vm-manager/clan_vm_manager/constants.py | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 pkgs/clan-vm-manager/clan_vm_manager/constants.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-vm-manager/clan_vm_manager/app.py index 92a5b297..35fcb378 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/app.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/app.py @@ -16,7 +16,6 @@ from clan_vm_manager.models.interfaces import ClanConfig from clan_vm_manager.models.use_join import GLib, GObject from clan_vm_manager.models.use_vms import VMS -from .constants import constants from .windows.main_window import MainWindow log = logging.getLogger(__name__) @@ -30,7 +29,6 @@ class MainApplication(Adw.Application): def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__( *args, - application_id=constants["APPID"], flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE, **kwargs, ) @@ -49,7 +47,6 @@ class MainApplication(Adw.Application): self.connect("activate", self.show_window) def do_command_line(self, command_line: Any) -> int: - log.info("Do command line executed") options = command_line.get_options_dict() # convert GVariantDict -> GVariant -> dict options = options.end().unpack() @@ -83,6 +80,8 @@ class MainApplication(Adw.Application): self.init_style() self.win = MainWindow(config=ClanConfig(initial_view="list")) self.win.set_application(self) + icon_path = assets.loc / "clan_black.png" + self.win.set_default_icon_name(str(icon_path)) self.win.present() # TODO: For css styling diff --git a/pkgs/clan-vm-manager/clan_vm_manager/constants.py b/pkgs/clan-vm-manager/clan_vm_manager/constants.py deleted file mode 100644 index fe307d99..00000000 --- a/pkgs/clan-vm-manager/clan_vm_manager/constants.py +++ /dev/null @@ -1,7 +0,0 @@ -constants = { - "APPID": "clan.lol", - "APPVERSION": "2.0.0-beta", - "APPNAME": "clan-vm-manager", - "SYSNAME": "clan-manager", - "RESOURCEID": "/git.clan.lol/clan/clan-core", -}