From f1642c6c71f1d28f017b8d91087b2186751e61bc Mon Sep 17 00:00:00 2001 From: Qubasa Date: Sun, 31 Dec 2023 14:13:11 +0100 Subject: [PATCH] vm-manager: Fixed quit application not working bug --- pkgs/clan-cli/clan_cli/clan_uri.py | 3 +++ pkgs/clan-vm-manager/clan_vm_manager/app.py | 3 +++ pkgs/clan-vm-manager/clan_vm_manager/ui/clan_select_list.py | 1 - pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py | 3 --- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/clan_uri.py b/pkgs/clan-cli/clan_cli/clan_uri.py index 29a7da6a8..264d911d3 100644 --- a/pkgs/clan-cli/clan_cli/clan_uri.py +++ b/pkgs/clan-cli/clan_cli/clan_uri.py @@ -146,3 +146,6 @@ class ClanURI: def __str__(self) -> str: return self.get_full_uri() + + def __repr__(self) -> str: + return f"ClanURI({self.get_full_uri()})" diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-vm-manager/clan_vm_manager/app.py index 244d3a711..fb3068d0d 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/app.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/app.py @@ -95,6 +95,7 @@ class Application(Gtk.Application): def show_list(self) -> None: prev = self.window self.window = self.windows.__dict__["overview"](cbs=self.cbs) + self.window.set_application(self) prev.hide() def show_join(self) -> None: @@ -102,6 +103,7 @@ class Application(Gtk.Application): self.window = self.windows.__dict__["join"]( cbs=self.cbs, initial_values=InitialJoinValues(url=None) ) + self.window.set_application(self) prev.hide() def show_flash(self) -> None: @@ -109,6 +111,7 @@ class Application(Gtk.Application): self.window = self.windows.__dict__["flash_usb"]( cbs=self.cbs, initial_values=FlashUSBWindow(InitialFlashValues(None)) ) + self.window.set_application(self) prev.hide() def do_startup(self) -> None: diff --git a/pkgs/clan-vm-manager/clan_vm_manager/ui/clan_select_list.py b/pkgs/clan-vm-manager/clan_vm_manager/ui/clan_select_list.py index b8d12b4b0..5be8696f3 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/ui/clan_select_list.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/ui/clan_select_list.py @@ -152,7 +152,6 @@ class ClanList(Gtk.Box): self.remount_edit_view() def on_select_vm(self, vm: VMBase) -> None: - print(f"on_select_vm: {vm.name}") if self.show_toolbar: if vm is None: self.toolbar.set_is_selected(False) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py index e0a65b681..7d88b9d68 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py @@ -52,9 +52,6 @@ class OverviewWindow(Gtk.ApplicationWindow): def set_selected(self, sel: VMBase | None) -> None: self.selected_vm = sel - if self.selected_vm: - print(f"APP selected + {self.selected_vm.name}") - def remount_list_view(self) -> None: widget = self.stack.get_child_by_name("list") print("Remounting ClanListView")