diff --git a/dzgui/managers/config.py b/dzgui/managers/config.py index 7490b15..de5d12b 100644 --- a/dzgui/managers/config.py +++ b/dzgui/managers/config.py @@ -162,7 +162,7 @@ class ConfigManager: trace = traceback.format_exc() dialog = ExceptionDialog(self.controller, trace) dialog.show_all() - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def save_res_and_quit(self, tv: "ServerTreeView", window: "OuterWindow") -> None: columns = tv.get_columns() diff --git a/dzgui/managers/connection.py b/dzgui/managers/connection.py index 89c35f0..80291fa 100644 --- a/dzgui/managers/connection.py +++ b/dzgui/managers/connection.py @@ -298,22 +298,22 @@ class ConnectionManager: def _present_modlist_dialog(self, mods: list[list[str]]) -> None: dialog = ServerModDialog(self.controller, mods) - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def _present_details_dialog(self, details: Servers.Details) -> None: dialog = ServerDetailsDialog(self.controller, details) - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def _workshop_timeout(self, msg: str) -> None: dialog = ExceptionDialog(self.controller, msg) dialog.show_all() - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def _server_timeout(self) -> None: dialog = ExceptionDialog(self.controller, server_timeout) dialog.set_details_buffer(kb.DZG_006) dialog.show_all() - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def get_debug_args(self) -> str: addr = f"{self.record.ip}:{self.record.gameport}" diff --git a/dzgui/managers/filter.py b/dzgui/managers/filter.py index 4151bc5..f3f175c 100644 --- a/dzgui/managers/filter.py +++ b/dzgui/managers/filter.py @@ -79,7 +79,7 @@ class FilterManager: """Deep copy of defaults""" return dict(self.default_filters) - def get_filters(self) -> dict: + def get_filters(self) -> dict[str, bool]: return self.enabled_filters def set_filter(self, label: str, state: bool) -> None: diff --git a/dzgui/managers/mods.py b/dzgui/managers/mods.py index 6a98e02..b94a1c5 100644 --- a/dzgui/managers/mods.py +++ b/dzgui/managers/mods.py @@ -221,7 +221,7 @@ class ModManager: total_size += mod[3] return total_mods, total_size - def _on_stale_mods_found(self, stale_mods: list) -> None: + def _on_stale_mods_found(self, stale_mods: list[int]) -> None: """Manipulates attached ListStore in the main event loop""" model = self.treeview.get_model() if model is None: diff --git a/dzgui/managers/offline.py b/dzgui/managers/offline.py index 645a682..d16acaa 100644 --- a/dzgui/managers/offline.py +++ b/dzgui/managers/offline.py @@ -52,7 +52,7 @@ class OfflineManager: is_valid = is_mission(folder) self.emitter.emit("custom_mission_loaded", str(folder), is_valid) - def find_custom_mods(self, callback: Callable) -> None: + def find_custom_mods(self, callback: Callable[[], None]) -> None: folder = self.open_folderpicker(dialogs.custom_mod_dialog) window = self.controller.get_window() window.set_sensitive(False) diff --git a/dzgui/managers/threading.py b/dzgui/managers/threading.py index c20f324..023f017 100644 --- a/dzgui/managers/threading.py +++ b/dzgui/managers/threading.py @@ -22,8 +22,8 @@ logger = logging.getLogger(APP_NAME) def call_on_thread( dialog_str: str, show_dialog: bool = True, show_cancel: bool = False -) -> Callable: - def decorator(func: Callable) -> Callable: +) -> Callable[..., Any]: + def decorator(func: Callable[..., Any]) -> Callable[..., Any]: @wraps(func) def wrapper(*args: Any, **kwargs: Any) -> None: self = args[0] @@ -42,7 +42,7 @@ def call_on_thread( class StoredFunc: - def __init__(self, func: Callable, *args: Any, **kwargs: Any) -> None: + def __init__(self, func: Callable[..., Any], *args: Any, **kwargs: Any) -> None: sig = inspect.signature(func) self.func = func self.bindings = sig.bind(*args, **kwargs) diff --git a/dzgui/managers/update.py b/dzgui/managers/update.py index ff64fb4..4bf201b 100644 --- a/dzgui/managers/update.py +++ b/dzgui/managers/update.py @@ -60,9 +60,9 @@ class UpdateManager: def _on_update_success(self) -> None: msg = dialogs.update_success dialog = QuitDialog(self.controller, msg) - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def _on_update_failure(self, msg: str) -> None: dialog = ExceptionDialog(self.controller, msg) dialog.show_all() - dialog.run() + dialog.run() # type: ignore[no-untyped-call] diff --git a/dzgui/model/servers.py b/dzgui/model/servers.py index a1d3082..22fca92 100644 --- a/dzgui/model/servers.py +++ b/dzgui/model/servers.py @@ -432,7 +432,7 @@ class ServerModelManager: if show_dialog: dialog = ExceptionDialog(self.controller, dialogs.load_error_lan) dialog.show_all() - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def _cleanup_on_failure(self, show_dialog: bool = True) -> None: # TODO: disable map, keyword, and filter widgets if model is None @@ -451,14 +451,14 @@ class ServerModelManager: dialog = ExceptionDialog(self.controller, server_timeout) dialog.set_details_buffer(kb.DZG_006) dialog.show_all() - dialog.run() + dialog.run() # type: ignore[no-untyped-call] def _push_data(self, data: list[Any]) -> None: self._get_proxy_man().push(data) self._sort_unique_maps(data) self.thread_man.set_cleanup_func(StoredFunc(self._cleanup_on_success)) - def _sort_unique_maps(self, data: list) -> None: + def _sort_unique_maps(self, data: list[Any]) -> None: u_maps = set([row[1] for row in data]) self._set_new_maps(sorted(u_maps)) diff --git a/dzgui/views/components/filter_panel.py b/dzgui/views/components/filter_panel.py index 75c51e9..59c0e46 100644 --- a/dzgui/views/components/filter_panel.py +++ b/dzgui/views/components/filter_panel.py @@ -42,7 +42,10 @@ class ButtonGrid(Gtk.Grid): self.checks: list[Gtk.CheckButton] = [] flowbox = Gtk.FlowBox( - halign=Gtk.Align.CENTER, min_children_per_line=3, max_children_per_line=3, selection_mode=Gtk.SelectionMode.NONE + halign=Gtk.Align.CENTER, + min_children_per_line=3, + max_children_per_line=3, + selection_mode=Gtk.SelectionMode.NONE, ) for check in defaults.keys(): @@ -305,6 +308,7 @@ class FilterPanel(Gtk.Box): Gdk.KEY_0: 9, Gdk.KEY_minus: 10, Gdk.KEY_backslash: 11, + Gdk.KEY_apostrophe: 12, } if keyval not in mappings: return False diff --git a/dzgui/views/dialogs/wizard.py b/dzgui/views/dialogs/wizard.py index 5dbcdb4..9a44e09 100644 --- a/dzgui/views/dialogs/wizard.py +++ b/dzgui/views/dialogs/wizard.py @@ -14,7 +14,7 @@ from dzgui.const.constants import ( HERO_PATH, FLATPAK_ROOT_PATH, LEGACY_CONFIG_PATH, - TMP_PATH + TMP_PATH, ) from dzgui.const.boilerplate import config_boilerplate from dzgui.const.endpoints import STEAM_API_SETUP @@ -168,7 +168,12 @@ class NotificationFrame(Gtk.Frame): class APIValidationPage(EnumeratedWizardPage): def __init__( - self, enum: PageNum, heading: str, description: str, link: str, func: Callable + self, + enum: PageNum, + heading: str, + description: str, + link: str, + func: Callable[[str], None], ) -> None: super().__init__( enum=enum, diff --git a/dzgui/views/pages/options.py b/dzgui/views/pages/options.py index b5633ca..718c556 100644 --- a/dzgui/views/pages/options.py +++ b/dzgui/views/pages/options.py @@ -55,7 +55,7 @@ class SubmitField(Gtk.Box): ) -> None: super().__init__(orientation=Gtk.Orientation.HORIZONTAL, spacing=10) - self.callback: Callable + self.callback: Callable[[], None] self.controller = controller self.context = context @@ -143,7 +143,7 @@ class SubmitField(Gtk.Box): return self.save_option() - def set_callback(self, callback: Callable) -> None: + def set_callback(self, callback: Callable[[], None]) -> None: self.callback = callback def save_option(self) -> None: @@ -210,7 +210,7 @@ class NameSubmitField(SubmitField): Preferences.NAME, private=False, ) - self.entry.set_width_chars(30) # type: ignore + self.entry.set_width_chars(30) self.set_callback(self.save_player_name) def save_player_name(self) -> None: @@ -439,7 +439,7 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore if prefs.paths.config.is_file() is False: dialog = ExceptionDialog(self.controller, strings.config_not_found) dialog.show_all() - dialog.run() + dialog.run() # type: ignore[no-untyped-call] raise OSError(f"Config file '{prefs.paths.config}' not found") config = query.get_config(prefs.paths.config) diff --git a/dzgui/views/pages/preconnect.py b/dzgui/views/pages/preconnect.py index b737ff0..983e760 100644 --- a/dzgui/views/pages/preconnect.py +++ b/dzgui/views/pages/preconnect.py @@ -231,7 +231,7 @@ class PreConnectionAssistant(Gtk.Box): args = self.controller.get_debug_args() d = DebugDialog(self.controller, args) d.show_all() - d.run() + d.run() # type: ignore[no-untyped-call] def _on_ok_clicked(self, button: Gtk.Button) -> None: self.controller.update_and_connect() diff --git a/dzgui/views/trees/tree_servers.py b/dzgui/views/trees/tree_servers.py index 3143c6d..284b9c6 100644 --- a/dzgui/views/trees/tree_servers.py +++ b/dzgui/views/trees/tree_servers.py @@ -406,7 +406,7 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore path = model.get_path(it) row_index = path.get_indices()[0] try: - start, end = self.get_visible_range() + start, end = self.get_visible_range() # type: ignore[no-untyped-call] except Exception: return if row_index >= start[0] <= end[0]: