From 5a76c37839f4cf9210f76f207937a9ca0ff2e611 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 29 Dec 2025 16:39:47 +0900 Subject: [PATCH] chore: move is_developer to UserPrefs --- dzgui/config/userprefs.py | 1 + dzgui/controllers/mc.py | 12 +++--------- dzgui/main.py | 3 ++- dzgui/views/base.py | 3 +-- dzgui/views/pages/options.py | 5 ++++- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dzgui/config/userprefs.py b/dzgui/config/userprefs.py index 5576544..d7c09f9 100644 --- a/dzgui/config/userprefs.py +++ b/dzgui/config/userprefs.py @@ -6,6 +6,7 @@ from dzgui.util.ip import Coords class UserPrefs: is_steam_deck: bool is_game_mode: bool + is_developer: bool coords: Coords | None version: str allow_updates: bool diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index 8fe3989..c520817 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -59,7 +59,6 @@ if TYPE_CHECKING: class Controller: def __init__(self) -> None: - self.is_developer: bool self.mediator: AppNavigation self.prefs: UserPrefs self.cooldown = 0 @@ -375,7 +374,6 @@ class Controller: msg = format_mods(total_size, total_mods) self.mediator.grid.statusbar.set_text(msg) - def calc_mod_size(self) -> tuple[int, int]: model = self.model_manager.get_mod_store() total_mods = len(model) @@ -387,10 +385,12 @@ class Controller: def menu_action(self, action: ContextMenu, path: Gtk.TreePath) -> None: match action: - # NOTE: manipulates server store + # NOTE: manipulates server stores # TODO: unimplemented case ContextMenu.ADD_SERVER: pass + case ContextMenu.ADD_FAV: + pass case ContextMenu.ADD_NOTE: pass case ContextMenu.COPY_CLIPBOARD: @@ -550,12 +550,6 @@ class Controller: logger.info(f"Using default window size {w},{h}") window.set_default_size(w, h) - def set_developer_mode(self, mode: bool) -> None: - self.is_developer = mode - - def get_developer_mode(self) -> bool: - return self.is_developer - def update_server_status(self) -> None: treeview = self.mediator.notebook.servers.get_active_treeview() model = treeview.get_model() diff --git a/dzgui/main.py b/dzgui/main.py index 166f70e..c9b692b 100644 --- a/dzgui/main.py +++ b/dzgui/main.py @@ -111,10 +111,11 @@ def main() -> None: prefs = UserPrefs( _is_steam_deck, _is_game_mode, + args.developers, local_coords, version, allow, XDG ) print("All OK. Loading UI...") - App(prefs, args.developers) + App(prefs) diff --git a/dzgui/views/base.py b/dzgui/views/base.py index e8dbb28..091e78b 100644 --- a/dzgui/views/base.py +++ b/dzgui/views/base.py @@ -540,10 +540,9 @@ class Grid(Gtk.Grid): class App(Gtk.Application): - def __init__(self, prefs, is_developer) -> None: + def __init__(self, prefs) -> None: GLib.set_prgname(APP_NAME) MainController.set_prefs(prefs) - MainController.set_developer_mode(is_developer) self.win = OuterWindow() diff --git a/dzgui/views/pages/options.py b/dzgui/views/pages/options.py index 4dc05ec..95fcb37 100644 --- a/dzgui/views/pages/options.py +++ b/dzgui/views/pages/options.py @@ -167,7 +167,10 @@ class Options(Gtk.Box): developers=Gtk.Button(label="Developers", halign=Gtk.Align.START) developers.connect("clicked", self._on_developers_clicked) - if self.controller.get_developer_mode(): + + prefs = self.controller.get_prefs() + is_developer = prefs.is_developer + if is_developer: grid.attach( developers, 1, 0, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT )