chore: clear typehinting errors

dzgui/views/trees/tree_log.py

@@ -21,7 +21,7 @@ if TYPE_CHECKING:
 logger = logging.getLogger(APP_NAME)
 
 
-class LogTreeView(ContextMixin, TreeView):
+class LogTreeView(ContextMixin, TreeView):  # type: ignore
     def __init__(self, controller: "Controller") -> None:
         super().__init__(controller, menu=ContextMenuGroup.LOG)
 
@@ -56,7 +56,8 @@ class LogTreeView(ContextMixin, TreeView):
         sortable = Gtk.TreeModelSort(_filter)
         self.set_model(sortable)
         _filter.refilter()
-        self.set_cursor(0)
+        path = Gtk.TreePath.new_from_indices([0])
+        self.set_cursor(path)
 
     def toggle_filter(self, _filter: str) -> None:
         if _filter in self.filters:
@@ -64,19 +65,20 @@ class LogTreeView(ContextMixin, TreeView):
         else:
             self.filters.append(_filter)
         # NOTE: unwrap TreeModelSort and TreeModelFilter
-        self.get_model().get_model().refilter()
+        self.get_model().get_model().refilter()  # type: ignore
 
     def _filter_rows(
-        self, model: Gtk.ListStore, _iter: Gtk.TreeIter, data: Any
-    ) -> None:
+        self, filter_model: Gtk.TreeModelFilter, _iter: Gtk.TreeIter, data: Any
+    ) -> bool:
         if len(self.filters) < 1:
             return False
-        return model[_iter][1] in self.filters
+        return filter_model[_iter][1] in self.filters
 
-    def _on_log_buttonpress(self, widget: Gtk.Widget, event: Gdk.EventButton) -> None:
+    def _on_log_buttonpress(self, widget: Gtk.Widget, event: Gdk.EventButton) -> bool:
         if event.button == Gdk.BUTTON_SECONDARY:
             self.present_menu(widget, event)
             return True
+        return False
 
     def _on_log_keypress(self, widget: Gtk.Widget, event: Gdk.EventKey) -> None:
         self.present_menu(widget, event)

dzgui/views/trees/tree_mods.py

@@ -21,7 +21,7 @@ if TYPE_CHECKING:
 logger = logging.getLogger(APP_NAME)
 
 
-class ModTreeView(ModsMixin, ContextMixin, TreeView):
+class ModTreeView(ModsMixin, ContextMixin, TreeView):  # type: ignore
     def __init__(self, controller: "Controller") -> None:
         super().__init__(controller, menu=ContextMenuGroup.MOD)
         self.controller = controller
@@ -64,31 +64,17 @@ class ModTreeView(ModsMixin, ContextMixin, TreeView):
     def _on_mods_updated(self, emitter: "Emitter", msg: str, mods: int) -> None:
         if mods < 1:
             return
-        self.set_cursor(0)
+        path = Gtk.TreePath.new_from_indices([0])
+        self.set_cursor(path)
 
     def get_selected_mod(self) -> str:
         path = self.get_focused_row_path()
         model = self.get_model()
         tree_iter = model.get_iter(path)
         mod = model.get(tree_iter, 2)[0]
-        return mod
-        # return mod, tree_iter
+        return str(mod)
 
-    # def _on_mods_keypress(self, widget: Gtk.Widget, event: Gdk.EventKey) -> None:
-    #     # TODO: multiselect
-    #     # if event.keyval is Gdk.KEY_space:
-    #     #    it = self.get_focused_row_iter()
-    #     #    self.get_selection().select_iter(it)
-    #     #    path = self.get_focused_row_path()
-    #     #    self.set_cursor(path)
-    #     #    return False
-    #     self.present_menu(widget, event)
-
-    # def _on_mods_button_press(self, widget: Gtk.Widget, event: Gdk.EventButton) -> None:
-    #     if event.button == 3:
-    #         self.present_menu(widget, event)
-
-    def _parent_selection_changed(self, base_class: TreeView, sel: Gtk.TreeSelection):
+    def _parent_selection_changed(self, base_class: TreeView, sel: Gtk.TreeSelection) -> None:
         pass
 
     def _format_color(

dzgui/views/trees/tree_servers.py

@@ -35,7 +35,7 @@ if TYPE_CHECKING:
 QUEUE_CHECK_DELAY = 200
 
 
-class ServerTreeView(ContextMixin, TreeView):
+class ServerTreeView(ContextMixin, TreeView):  # type: ignore
     def __init__(
         self, controller: "Controller", enum: ServerTab, menu: ContextMenuGroup
     ) -> None:
@@ -58,9 +58,9 @@ class ServerTreeView(ContextMixin, TreeView):
 
         self.queue_id: int
         self.handler_id: int
-        self.queue = Queue()
+        self.queue: Queue = Queue()
 
-        self.seen_cache = []
+        self.seen_cache: list[str] = []
 
         prefs = self.controller.get_prefs()
         columns = prefs.paths.columns
@@ -119,7 +119,7 @@ class ServerTreeView(ContextMixin, TreeView):
 
     def _on_tooltip(
         self,
-        widget: Gtk.Widget,
+        treeview: Self,
         x: int,
         y: int,
         keyboard_mode: bool,
@@ -128,12 +128,13 @@ class ServerTreeView(ContextMixin, TreeView):
         """
         Present record data for the hovered row even if it is unfocused
         """
-        coords = widget.convert_widget_to_bin_window_coords(x, y)
-        path = self.get_path_at_pos(coords.bx, coords.by)
-        if path is None:
+        coords_x, coords_y = treeview.convert_widget_to_bin_window_coords(x, y)
+        path = self.get_path_at_pos(coords_x, coords_y)
+        if path is None or path[0] is None:
             return False
-
         model = self.get_model()
+        if model is None:
+            return False
         tree_iter = model.get_iter(path[0])
         ip = model.get_value(tree_iter, 7)
         qport = model.get_value(tree_iter, 8)
@@ -188,7 +189,7 @@ class ServerTreeView(ContextMixin, TreeView):
         # NOTE: get final width after drag action completes
         GLib.idle_add(self.controller.propagate_column_width, col)
 
-    def start_distcalc(self, emitter: Optional["Emitter"] = None):
+    def start_distcalc(self, emitter: Union["Emitter", None] = None) -> None:
         self.emitter.emit("distcalc_started")
         record = self.get_record()
         if record is None:
@@ -248,14 +249,10 @@ class ServerTreeView(ContextMixin, TreeView):
                 case Gdk.KEY_r:
                     # TODO: unimplemented, needs threading
                     self.controller.menu_action(ContextMenu.REFRESH_PLAYERS, self)
-                case _:
-                    return False
-            return True
         else:
             match event.keyval:
                 case Gdk.KEY_l | Gdk.KEY_Right:
                     self.emitter.emit("request_button_box_focus")
-                    return True
                 case _:
                     self.emitter.emit("check_button_pressed", event.keyval)
 
@@ -266,12 +263,13 @@ class ServerTreeView(ContextMixin, TreeView):
         path = pathlist[0]
         tree_iter = model.get_iter(path)
         has_mods = model.get_value(tree_iter, 11)
-        return has_mods
+        return bool(has_mods)
 
-    def get_selected_row(self) -> Gtk.TreeModelRow:
-        sel = self.get_selection()
-        sels = sel.get_selected_rows()
-        return sels[0]
+    #def get_selected_row(self) -> Gtk.TreeModelRow:
+    #    sel = self.get_selection()
+    #    sels = sel.get_selected_rows()
+    #    print(type(sels[0]))
+    #    return sels[0]
 
     def is_in_favs(self) -> bool:
         record = self.get_record_string()
@@ -283,6 +281,8 @@ class ServerTreeView(ContextMixin, TreeView):
         self, tree: TreeView, path: Gtk.TreePath, column: Gtk.TreeViewColumn
     ) -> None:
         record = self.get_record()
+        if record is None:
+            return
         self.controller.connect_by_record(record)
 
     def _parent_selection_changed(
@@ -321,14 +321,14 @@ class ServerTreeView(ContextMixin, TreeView):
     def set_loaded(self, status: bool) -> None:
         self.loaded = status
 
-    def get_model_and_control_model(self) -> tuple[Union["FastInsertListStore", None], list[Any]]:
+    def get_model_and_control_model(self) -> tuple[Union[Gtk.TreeModel, None], list[Any]]:
         model = self.get_model()
         control = self.proxy_man.get_control()
         return model, control
 
     @staticmethod
     def ping_server(
-        model, _iter: Gtk.TreeIter, ip: str, qport: int, ping_column: int
+            model: "FastInsertListStore", _iter: Gtk.TreeIter, ip: str, qport: int, ping_column: int
     ) -> None:
         _ping = ping(ip, qport)
         GLib.idle_add(lambda: model.set(_iter, ping_column, _ping))