From 7dce6ad6c47e6040f81748f1750a2b791c7bffda Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 5 Jun 2024 12:10:26 +0200 Subject: [PATCH] clan-app: switch default view to webui --- pkgs/clan-app/clan_app/app.py | 2 +- pkgs/clan-app/clan_app/windows/main_window.py | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/clan-app/clan_app/app.py b/pkgs/clan-app/clan_app/app.py index 1e0acade3..ae7da49cb 100644 --- a/pkgs/clan-app/clan_app/app.py +++ b/pkgs/clan-app/clan_app/app.py @@ -106,7 +106,7 @@ class MainApplication(Adw.Application): def on_activate(self, source: "MainApplication") -> None: if not self.window: self.init_style() - self.window = MainWindow(config=ClanConfig(initial_view="list")) + self.window = MainWindow(config=ClanConfig(initial_view="webview")) self.window.set_application(self) self.window.show() diff --git a/pkgs/clan-app/clan_app/windows/main_window.py b/pkgs/clan-app/clan_app/windows/main_window.py index 6911b2434..9b2ac640d 100644 --- a/pkgs/clan-app/clan_app/windows/main_window.py +++ b/pkgs/clan-app/clan_app/windows/main_window.py @@ -16,7 +16,7 @@ from clan_app.views.webview import WebView gi.require_version("Adw", "1") -from gi.repository import Adw, Gio, GLib, Gtk +from gi.repository import Adw, Gio, GLib from clan_app.components.trayicon import TrayIcon @@ -29,6 +29,7 @@ class MainWindow(Adw.ApplicationWindow): self.set_title("Clan Manager") self.set_default_size(980, 850) + # Overlay for GTK side exclusive toasts overlay = ToastOverlay.use().overlay view = Adw.ToolbarView() overlay.set_child(view) @@ -45,28 +46,16 @@ class MainWindow(Adw.ApplicationWindow): # Initialize all ClanStore threading.Thread(target=self._populate_vms).start() - # Initialize all views stack_view = ViewStack.use().view - - clamp = Adw.Clamp() - clamp.set_child(stack_view) - clamp.set_maximum_size(1000) - - scroll = Gtk.ScrolledWindow() - scroll.set_propagate_natural_height(True) - scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) - scroll.set_child(clamp) - stack_view.add_named(ClanList(config), "list") stack_view.add_named(Details(), "details") stack_view.add_named(Logs(), "logs") webview = WebView(methods=API._registry) stack_view.add_named(webview.get_webview(), "webview") - stack_view.set_visible_child_name(config.initial_view) - view.set_content(scroll) + view.set_content(stack_view) self.connect("destroy", self.on_destroy)