diff --git a/dzgui/main.py b/dzgui/main.py index 5ed56fa..57a09dd 100644 --- a/dzgui/main.py +++ b/dzgui/main.py @@ -107,6 +107,7 @@ def main() -> None: rebuild_symlinks(XDG.config) remove_stale_signatures(XDG.config, XDG.version) + # TODO: handle IP DB failure get_ipdb(XDG.ips) local_coords = get_local_coords(XDG.ips) diff --git a/dzgui/views/trees/tree_base.py b/dzgui/views/trees/tree_base.py index 528389d..7e4ce7c 100644 --- a/dzgui/views/trees/tree_base.py +++ b/dzgui/views/trees/tree_base.py @@ -1,18 +1,15 @@ import logging -import multiprocessing -import subprocess + +from typing import Callable, TYPE_CHECKING + +from dzgui.const.constants import SEPARATOR +from dzgui.util.keys import is_navkey +from dzgui.views.mixins.cursor_mixin import CursorMixin import gi gi.require_version("Gtk", "3.0") from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa -from dzgui.const.constants import SEPARATOR -from dzgui.util.keys import is_navkey -from dzgui.util import strings -from typing import Any, Callable, TYPE_CHECKING - -from dzgui.views.mixins.cursor_mixin import CursorMixin - logger = logging.getLogger(__name__) if TYPE_CHECKING: @@ -85,7 +82,6 @@ class TreeView(CursorMixin, Gtk.TreeView): self, treeview: Gtk.TreeView, event: Gdk.EventKey ) -> None: - keyname = Gdk.keyval_name(event.keyval) if is_navkey(event.keyval): # TODO: investigate this if self.sel_blocked is False: diff --git a/dzgui/views/trees/tree_log.py b/dzgui/views/trees/tree_log.py index 6fd2de7..b85c9a8 100644 --- a/dzgui/views/trees/tree_log.py +++ b/dzgui/views/trees/tree_log.py @@ -1,23 +1,16 @@ import logging -import multiprocessing -import subprocess + +from typing import TYPE_CHECKING + +from dzgui.const.enum import ContextMenuGroup +from dzgui.util import strings +from dzgui.views.trees.tree_base import TreeView +from dzgui.views.mixins.context_mixin import ContextMixin import gi gi.require_version("Gtk", "3.0") from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 -from dzgui.util.keys import is_navkey -from dzgui.util import strings -from typing import Any, TYPE_CHECKING - -from dzgui.views.trees.tree_base import TreeView -from dzgui.views.mixins.context_mixin import ContextMixin -from dzgui.const.enum import ContextMenuGroup - -from typing import Any -import dzgui.util._json as JSON # noqa - - if TYPE_CHECKING: from dzgui.controllers.mc import Controller @@ -34,8 +27,8 @@ class LogTreeView(ContextMixin, TreeView): self.set_headers_visible(True) self.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) - s = self.controller.get_log_store() - self.set_model(s) + model = self.controller.get_log_store() + self.set_model(model) for i, column_title in enumerate(strings.log_cols): renderer = Gtk.CellRendererText() diff --git a/dzgui/views/trees/tree_menu.py b/dzgui/views/trees/tree_menu.py index ccc5014..0b91ff3 100644 --- a/dzgui/views/trees/tree_menu.py +++ b/dzgui/views/trees/tree_menu.py @@ -1,16 +1,14 @@ import logging -import multiprocessing -import subprocess from typing import TYPE_CHECKING -import gi -gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa - from dzgui.const.enum import RowType, NotebookPage from dzgui.util.open_links import open_link_by_rowtype from dzgui.views.trees.tree_base import TreeView +import gi +gi.require_version("Gtk", "3.0") +from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa + logger = logging.getLogger(__name__) if TYPE_CHECKING: diff --git a/dzgui/views/trees/tree_mods.py b/dzgui/views/trees/tree_mods.py index 9195abc..b7417d4 100644 --- a/dzgui/views/trees/tree_mods.py +++ b/dzgui/views/trees/tree_mods.py @@ -1,18 +1,18 @@ import logging -from typing import Any, Literal, TYPE_CHECKING +from typing import Any, TYPE_CHECKING + +from dzgui.util import strings, localize +from dzgui.views.trees.tree_base import TreeView +from dzgui.views.mixins.context_mixin import ContextMixin +from dzgui.views.mixins.mods_mixin import ModsMixin +from dzgui.const.enum import ( + ContextMenuGroup, + ) import gi gi.require_version("Gtk", "3.0") from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa -from dzgui.const.enum import ( - ContextMenuGroup, - RowType, - ) -from dzgui.util import strings, localize -from dzgui.views.trees.tree_base import TreeView -from dzgui.views.mixins.context_mixin import ContextMixin -from dzgui.views.mixins.mods_mixin import ModsMixin if TYPE_CHECKING: from dzgui.controllers.mc import Controller