From 4377f9de7c6cfd844ecf1c0105e27d9c479f2aeb Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Wed, 29 Apr 2026 00:44:33 +0900 Subject: [PATCH] chore: clear typehinting errors --- dzgui/controllers/mc.py | 10 ++++++---- dzgui/managers/contextmenu.py | 1 - dzgui/model/servers.py | 3 ++- dzgui/views/components/filter_panel.py | 3 ++- dzgui/views/components/maps_combo.py | 2 +- dzgui/views/pages/servers.py | 10 +++++++--- dzgui/views/trees/tree_menu.py | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index decac12..851b9d9 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -158,7 +158,7 @@ class Controller(GObject.GObject): return self.config_man.lookup(key) def is_auto_install(self) -> bool: - return self.query_config(Preferences.INSTALL) + return bool(self.query_config(Preferences.INSTALL)) def suppress_signal( self, owner: Gtk.Widget, widget: Gtk.Widget, func_name: str, state: bool @@ -173,7 +173,7 @@ class Controller(GObject.GObject): def toggle_debug_mode(self) -> None: self.toggle_config(Preferences.DEBUG) - def get_active_context(self) -> Gtk.TreeView: + def get_active_context(self) -> "ServerTab": return self.get_active_treeview().get_enum() def get_active_treeview(self) -> "ServerTreeView": @@ -295,6 +295,8 @@ class Controller(GObject.GObject): def highlight_stale_cleanup(self, stale_mods: list) -> None: """Manipulates attached ListStore in the main event loop""" model = self.get_mod_store() + if model is None: + return for mod in model: it = mod.iter path = model.get_path(it) @@ -358,7 +360,7 @@ class Controller(GObject.GObject): self.delete_single_mod(path) total_mods, total_size = self.calc_mod_size() - self.update_mod_statusbar() + self.format_mod_statusbar() def delete_single_mod_cleanup(self, _iter: Gtk.TreeIter) -> None: self.get_mod_store().remove(_iter) @@ -420,7 +422,7 @@ class Controller(GObject.GObject): logger.critical(e) return - def menu_action(self, action: ContextMenu, tree: Gtk.TreeView) -> None: + def menu_action(self, action: ContextMenu, tree: "ServerTreeView") -> None: context_man = ContextMenuManager(tree, self) context_man.process(action) diff --git a/dzgui/managers/contextmenu.py b/dzgui/managers/contextmenu.py index 7e31c6d..1ecc6f8 100644 --- a/dzgui/managers/contextmenu.py +++ b/dzgui/managers/contextmenu.py @@ -3,7 +3,6 @@ import logging from typing import TYPE_CHECKING from dzgui.const.enum import ContextMenu, Preferences -from dzgui.util import strings from dzgui.util.clip import copy_clipboard from dzgui.util.open_links import open_workshop_page diff --git a/dzgui/model/servers.py b/dzgui/model/servers.py index 2a1ba42..c175d15 100644 --- a/dzgui/model/servers.py +++ b/dzgui/model/servers.py @@ -27,6 +27,7 @@ API_TIMEOUT = 3 if TYPE_CHECKING: from dzgui.controllers.mc import Controller from dzgui.model.proxy_model import ProxyModelManager + from dzgui.views.trees.tree_servers import ServerTreeView logger = logging.getLogger(__name__) @@ -39,7 +40,7 @@ class NewPlayerCount: class ServerModelManager: - def __init__(self, controller: "Controller", tv: Gtk.TreeView) -> None: + def __init__(self, controller: "Controller", tv: "ServerTreeView") -> None: self.tv = tv self.enum = tv.get_enum() diff --git a/dzgui/views/components/filter_panel.py b/dzgui/views/components/filter_panel.py index bd3eb88..0cf6b4e 100644 --- a/dzgui/views/components/filter_panel.py +++ b/dzgui/views/components/filter_panel.py @@ -227,7 +227,7 @@ class FilterPanel(Gtk.Box): # state = self.default_filters[label] # check.set_active(state) - def _on_map_entry_keypress(self, entry: Gtk.Entry, event: Gdk.EventKey) -> None: + def _on_map_entry_keypress(self, entry: Gtk.Entry, event: Gdk.EventKey) -> bool: match event.keyval: case Gdk.KEY_Escape: GLib.idle_add(self.restore_focus_to_treeview) @@ -237,6 +237,7 @@ class FilterPanel(Gtk.Box): """ text = self.maps_entry.get_text() self.maps_entry.set_position(len(text)) + return True case _: return False diff --git a/dzgui/views/components/maps_combo.py b/dzgui/views/components/maps_combo.py index dfbc948..0eea10f 100644 --- a/dzgui/views/components/maps_combo.py +++ b/dzgui/views/components/maps_combo.py @@ -5,7 +5,7 @@ from gi.repository import Gtk, GLib # noqa E402 class MapsCombo(Gtk.EntryCompletion): - def __init__(self): + def __init__(self) -> None: super().__init__(inline_completion=True) self.set_text_column(0) self.set_minimum_key_length(1) diff --git a/dzgui/views/pages/servers.py b/dzgui/views/pages/servers.py index 92da14d..e7d14c2 100644 --- a/dzgui/views/pages/servers.py +++ b/dzgui/views/pages/servers.py @@ -94,16 +94,20 @@ class ServerNotebook(Gtk.ScrolledWindow): self.emitter.emit("server_page_toggled", False) def _on_keypress(self, widget: Self, event: Gdk.EventKey) -> Optional[False]: - if event.state is Gdk.ModifierType.CONTROL_MASK: + # NOTE: abort if modifier mask is active + if event.state != 0: return False match event.keyval: case Gdk.KEY_n: self.notebook.next_page() + self.grab_content_area() + return True case Gdk.KEY_p: self.notebook.prev_page() + self.grab_content_area() + return True case _: - return - self.grab_content_area() + return False def grab_content_area(self) -> None: self.get_active_treeview().grab_focus() diff --git a/dzgui/views/trees/tree_menu.py b/dzgui/views/trees/tree_menu.py index 8292bb1..a88819e 100644 --- a/dzgui/views/trees/tree_menu.py +++ b/dzgui/views/trees/tree_menu.py @@ -70,7 +70,7 @@ class MenuTreeView(TreeView): if row_type in docs: open_link_by_rowtype(row_type) - def get_row_enum(self) -> Any: + def get_row_enum(self) -> str: # NOTE: col 1 contains a RowType enum model = self.get_model() _iter = self.get_focused_row_iter()