chore: update pyproject.toml

README.md

@@ -37,8 +37,6 @@ Users wishing to review the licenses to these components can inspect the `LICENS
 
 Steam and the Steam logo are trademarks and/or registered trademarks of Valve Corporation in the U.S. and/or other countries.
 
-DayZ is a trademark and brand of Bohemia Interactive a.s.
-
 ## Disclaimer
 
 DZGUI is beta-quality software and is provided as-is.

dzgui/config/query.py

@@ -5,7 +5,6 @@ from dzgui.util._json import read_json
 
 from dzgui.const.enum import Preferences
 
-
 class ConfigFileError(Exception):
     pass
 
@@ -40,4 +39,4 @@ def get_favorites(path: Path) -> list[str]:
 
 
 def enum_to_key(enum: Preferences) -> str:
-    return str(enum.key)
+    return str(enum.dict["key"])

dzgui/const/enum.py

@@ -1,9 +1,7 @@
-from __future__ import annotations
-from dataclasses import dataclass
 from enum import Enum
+from typing import Any, Self
 
 from dzgui.util import strings
-from dzgui.strings import rows
 
 
 class Port(Enum):
@@ -48,61 +46,125 @@ class FilterMode(Enum):
     TOGGLE_ON = 3
 
 
-@dataclass(slots=True, frozen=True)
-class ModButtonMeta:
-    label: str
-    tooltip: str
+class EnumWithAttrs(Enum):
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
+        value = len(cls.__members__) + 1
+        obj = object.__new__(cls)
+        obj._value_ = value
+        return obj
+
+    def __init__(self, d: dict):
+        self.dict = d
 
 
-@dataclass(slots=True, frozen=True)
-class ButtonTypeMeta:
-    label: str
-    tooltip: str
-    opens: NotebookPage | None
+class Preferences(EnumWithAttrs):
+    STEAM = {
+        "key": "steam_api",
+    }
+    CLIENT = {
+        "key": "client",
+    }
+    WINDOW = {
+        "key": "fullscreen",
+    }
+    DIST = {
+        "key": "use_miles",
+    }
+    NAME = {
+        "key": "name",
+    }
+    DEFAULT = {
+        "key": "default_steam_path",
+    }
+    FAV_LBL = {
+        "key": "fav_label",
+    }
+    FAV_SRV = {
+        "key": "fav_server",
+    }
+    IP_LIST = {
+        "key": "ip_list",
+    }
+    START_TAB = {
+        "key": "start_tab",
+    }
 
 
-@dataclass(slots=True, frozen=True)
-class ConfigKey:
-    key: str
+class NotebookPage(EnumWithAttrs):
+    OFFLINE = {"crumbs": strings.crumbs.offline, "statusbar": True}
+    CHANGELOG = {"crumbs": strings.crumbs.changelog, "statusbar": True}
+    DEVELOPERS = {"crumbs": strings.crumbs.developers, "statusbar": False}
+    HELP = {"crumbs": strings.crumbs._help, "statusbar": True}
+    KEYS = {"crumbs": strings.crumbs.keys, "statusbar": True}
+    LOG = {"crumbs": strings.crumbs.log, "statusbar": True}
+    MODS = {"crumbs": strings.crumbs.mods, "statusbar": True}
+    OPTIONS = {"crumbs": strings.crumbs.options, "statusbar": False}
+    SERVERS = {"crumbs": strings.crumbs.servers, "statusbar": True}
+    THANKS = {"crumbs": strings.crumbs.thanks, "statusbar": True}
+    CONNECTION = {"crumbs": "Connect", "statusbar": True}
 
 
-@dataclass(slots=True, frozen=True)
-class NotebookMeta:
-    crumbs: str
-    has_statusbar: bool
+class RowType(EnumWithAttrs):
+    # TODO: strings
+    CHANGELOG = {
+        "label": "View changelog",
+        "tooltip": "Opens the DZGUI changelog",
+    }
+    SHOW_LOG = {
+        "label": "Show debug log",
+        "tooltip": "Read the DZGUI log generated since startup",
+    }
+    SEPARATOR = {
+        "label": "SEPARATOR",
+        "tooltip": "",
+    }
+    DUMP_LOG = {
+        "label": "Output system info to log file",
+        "tooltip": "Dump diagnostic data for troubleshooting",
+    }
+    DOCS = {
+        "label": "Documentation/help files (GitHub) ⧉",
+        "tooltip": "Open the DZGUI documentation in a browser",
+    }
+    DOCS_FALLBACK = {
+        "label": "Documentation/help files (Codeberg mirror) ⧉",
+        "tooltip": "Open the DZGUI documentation in a browser",
+    }
+    BUGS = {
+        "label": "Report a bug (GitHub) ⧉",
+        "tooltip": "Open the DZGUI issue tracker in a browser",
+    }
+    FORUM = {
+        "label": "DZGUI Subreddit ⧉",
+        "tooltip": "Open the DZGUI discussion forum in a browser",
+    }
+    SPONSOR = {
+        "label": "Sponsor (GitHub) ⧉",
+        "tooltip": "Sponsor development of the DZGUI project",
+    }
+    THANKS = {
+        "label": "Special thanks",
+        "tooltip": "A list of contributors, testers, and sponsors",
+    }
 
 
-@dataclass(slots=True, frozen=True)
-class RowMeta:
-    label: str
-    tooltip: str
-
-
-@dataclass(slots=True, frozen=True)
-class ContextMenuMeta:
-    label: str
-
-
-class ContextMenuItem(Enum):
-    ADD_NOTE = ContextMenuMeta(strings.add_note)
-    ADD_SERVER = ContextMenuMeta(strings.add)
-    CONNECT = ContextMenuMeta(strings.connect)
-    COPY_LOG_CLIPBOARD = ContextMenuMeta(strings.copy_log)
-    COPY_SERVER_IP = ContextMenuMeta(strings.copy_ip)
-    COPY_SERVER_NAME = ContextMenuMeta(strings.copy_name)
-    UNSUB_MOD = ContextMenuMeta(strings.unsub_mod)
-    VALIDATE_MOD = ContextMenuMeta(strings.validate_mod)
-    OPEN_WORKSHOP = ContextMenuMeta(strings.open_workshop)
-    REFRESH_PLAYERS = ContextMenuMeta(strings.refresh_players)
-    REMOVE_HISTORY = ContextMenuMeta(strings.remove_history)
-    REMOVE_SERVER = ContextMenuMeta(strings.remove)
-    SET_FAV = ContextMenuMeta(strings.add_fav)
-    SHOW_DETAILS = ContextMenuMeta(strings.show_details)
-    SHOW_MODS = ContextMenuMeta(strings.show_mods)
-
-    @property
-    def label(self) -> str:
-        return self.value.label
+# TODO: rename to ContextMenuItem
+class ContextMenu(EnumWithAttrs):
+    ADD_NOTE = {"label": strings.add_note}
+    ADD_SERVER = {"label": strings.add}
+    CONNECT = {"label": strings.connect}
+    COPY_LOG_CLIPBOARD = {"label": strings.copy_log}
+    COPY_SERVER_IP = {"label": strings.copy_ip}
+    COPY_SERVER_NAME = {"label": strings.copy_name}
+    UNSUB_MOD = {"label": strings.unsub_mod}
+    VALIDATE_MOD = {"label": strings.validate_mod}
+    OPEN_WORKSHOP = {"label": strings.open_workshop}
+    REFRESH_PLAYERS = {"label": strings.refresh_players}
+    REMOVE_HISTORY = {"label": strings.remove_history}
+    REMOVE_SERVER = {"label": strings.remove}
+    SET_FAV = {"label": strings.add_fav}
+    SHOW_DETAILS = {"label": strings.show_details}
+    SHOW_MODS = {"label": strings.show_mods}
 
 
 class ContextMenuGroup(Enum):
@@ -110,193 +172,113 @@ class ContextMenuGroup(Enum):
     Groupings of context menu items
     """
 
-    SERVER_MOD = (ContextMenuItem.OPEN_WORKSHOP,)
-    MOD = (
-        ContextMenuItem.OPEN_WORKSHOP,
-        ContextMenuItem.UNSUB_MOD,
-        ContextMenuItem.VALIDATE_MOD,
-    )
+    SERVER_MOD = (ContextMenu.OPEN_WORKSHOP,)
+    MOD = (ContextMenu.OPEN_WORKSHOP, ContextMenu.UNSUB_MOD, ContextMenu.VALIDATE_MOD)
     MOD_OFFLINE = (None,)
-    LOG = (ContextMenuItem.COPY_LOG_CLIPBOARD,)
+    LOG = (ContextMenu.COPY_LOG_CLIPBOARD,)
     SERVER_BROWSER = (
-        ContextMenuItem.CONNECT,
-        ContextMenuItem.ADD_SERVER,
-        ContextMenuItem.SET_FAV,
-        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.CONNECT,
+        ContextMenu.ADD_SERVER,
+        ContextMenu.SET_FAV,
+        ContextMenu.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_IP,
+        ContextMenu.ADD_NOTE,
+        ContextMenu.SHOW_MODS,
+        ContextMenu.SHOW_DETAILS,
+        ContextMenu.REFRESH_PLAYERS,
     )
     SCAN_LAN = (
-        ContextMenuItem.CONNECT,
-        ContextMenuItem.SET_FAV,
-        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.CONNECT,
+        ContextMenu.SET_FAV,
+        ContextMenu.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_IP,
+        ContextMenu.ADD_NOTE,
+        ContextMenu.SHOW_MODS,
+        ContextMenu.SHOW_DETAILS,
+        ContextMenu.REFRESH_PLAYERS,
     )
     SAVED = (
-        ContextMenuItem.CONNECT,
-        ContextMenuItem.SET_FAV,
-        ContextMenuItem.REMOVE_SERVER,
-        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.CONNECT,
+        ContextMenu.SET_FAV,
+        ContextMenu.REMOVE_SERVER,
+        ContextMenu.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_IP,
+        ContextMenu.ADD_NOTE,
+        ContextMenu.SHOW_MODS,
+        ContextMenu.SHOW_DETAILS,
+        ContextMenu.REFRESH_PLAYERS,
     )
     RECENT = (
-        ContextMenuItem.CONNECT,
-        ContextMenuItem.ADD_SERVER,
-        ContextMenuItem.SET_FAV,
-        ContextMenuItem.REMOVE_HISTORY,
-        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.CONNECT,
+        ContextMenu.ADD_SERVER,
+        ContextMenu.SET_FAV,
+        ContextMenu.REMOVE_HISTORY,
+        ContextMenu.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_IP,
+        ContextMenu.ADD_NOTE,
+        ContextMenu.SHOW_MODS,
+        ContextMenu.SHOW_DETAILS,
+        ContextMenu.REFRESH_PLAYERS,
     )
 
 
-class Preferences(Enum):
-    STEAM = ConfigKey("steam_api")
-    CLIENT = ConfigKey("client")
-    WINDOW = ConfigKey("fullscreen")
-    DIST = ConfigKey("use_miles")
-    NAME = ConfigKey("name")
-    DEFAULT = ConfigKey("default_steam_path")
-    FAV_LBL = ConfigKey("fav_label")
-    FAV_SRV = ConfigKey("fav_server")
-    IP_LIST = ConfigKey("ip_list")
-    START_TAB = ConfigKey("start_tab")
-
-    @property
-    def key(self) -> str:
-        return self.value.key
+class ModButton(EnumWithAttrs):
+    SELECT_ALL = {
+        "label": strings.mod_panel.select_all,
+        "tooltip": strings.mod_panel.select_all_tooltip,
+    }
+    UNSELECT_ALL = {
+        "label": strings.mod_panel.unselect_all,
+        "tooltip": strings.mod_panel.unselect_all_tooltip,
+    }
+    HIGHLIGHT_STALE = {
+        "label": strings.mod_panel.highlight_stale,
+        "tooltip": strings.mod_panel.highlight_stale_tooltip,
+    }
+    UNHIGHLIGHT_STALE = {
+        "label": strings.mod_panel.unhighlight_stale,
+        "tooltip": strings.mod_panel.unhighlight_stale_tooltip,
+    }
+    UNSUB_SELECTED = {
+        "label": strings.mod_panel.unsub_selected,
+        "tooltip": strings.mod_panel.unsub_selected_tooltip,
+    }
+    SELECT_STALE = {
+        "label": strings.mod_panel.select_stale,
+        "tooltip": strings.mod_panel.select_stale_tooltip,
+    }
+    VALIDATE = {
+        "label": strings.mod_panel.validate,
+        "tooltip": strings.mod_panel.validate_tooltip,
+    }
 
 
-class NotebookPage(Enum):
-    OFFLINE = NotebookMeta(strings.crumbs.offline, True)
-    CHANGELOG = NotebookMeta(strings.crumbs.changelog, True)
-    DEVELOPERS = NotebookMeta(strings.crumbs.developers, False)
-    HELP = NotebookMeta(strings.crumbs._help, True)
-    KEYS = NotebookMeta(strings.crumbs.keys, True)
-    LOG = NotebookMeta(strings.crumbs.log, True)
-    MODS = NotebookMeta(strings.crumbs.mods, True)
-    OPTIONS = NotebookMeta(strings.crumbs.options, False)
-    SERVERS = NotebookMeta(strings.crumbs.servers, True)
-    THANKS = NotebookMeta(strings.crumbs.thanks, True)
-    CONNECTION = NotebookMeta(strings.crumbs.connect, True)
-
-    @property
-    def crumbs(self) -> str:
-        return self.value.crumbs
-
-    @property
-    def has_statusbar(self) -> bool:
-        return self.value.has_statusbar
-
-
-class RowType(Enum):
-    CHANGELOG = RowMeta(rows.changelog_label, rows.changelog_status)
-    SHOW_LOG = RowMeta(rows.log_label, rows.log_status)
-    SEPARATOR = RowMeta(rows.separator_label, rows.separator_status)
-    DUMP_LOG = RowMeta(rows.system_log_label, rows.system_log_status)
-    DOCS = RowMeta(rows.docs_label, rows.docs_status)
-    DOCS_FALLBACK = RowMeta(rows.docs_fallback_label, rows.docs_fallback_status)
-    BUGS = RowMeta(rows.bugs_label, rows.bugs_status)
-    FORUM = RowMeta(rows.forum_label, rows.forum_status)
-    SPONSOR = RowMeta(rows.sponsor_label, rows.sponsor_status)
-    THANKS = RowMeta(rows.thanks_label, rows.thanks_status)
-
-    @property
-    def label(self) -> str:
-        return self.value.label
-
-    @property
-    def tooltip(self) -> str:
-        return self.value.tooltip
-
-
-class ModButton(Enum):
-    SELECT_ALL = ModButtonMeta(
-        strings.mod_panel.select_all, strings.mod_panel.select_all_tooltip
-    )
-    UNSELECT_ALL = ModButtonMeta(
-        strings.mod_panel.unselect_all, strings.mod_panel.unselect_all_tooltip
-    )
-    HIGHLIGHT_STALE = ModButtonMeta(
-        strings.mod_panel.highlight_stale, strings.mod_panel.highlight_stale_tooltip
-    )
-    UNHIGHLIGHT_STALE = ModButtonMeta(
-        strings.mod_panel.unhighlight_stale, strings.mod_panel.unhighlight_stale_tooltip
-    )
-    UNSUB_SELECTED = ModButtonMeta(
-        strings.mod_panel.unsub_selected,
-        strings.mod_panel.unsub_selected_tooltip,
-    )
-    SELECT_STALE = ModButtonMeta(
-        strings.mod_panel.select_stale,
-        strings.mod_panel.select_stale_tooltip,
-    )
-    VALIDATE = ModButtonMeta(
-        strings.mod_panel.validate,
-        strings.mod_panel.validate_tooltip,
-    )
-
-    @property
-    def label(self) -> str:
-        return self.value.label
-
-    @property
-    def tooltip(self) -> str:
-        return self.value.tooltip
-
-
-class ButtonType(Enum):
-    SERVERS = ButtonTypeMeta(
-        strings.buttons.servers_label,
-        strings.buttons.servers_tooltip,
-        NotebookPage.SERVERS,
-    )
-    MODS = ButtonTypeMeta(
-        strings.buttons.mods_label,
-        strings.buttons.mods_tooltip,
-        NotebookPage.MODS,
-    )
-    OPTIONS = ButtonTypeMeta(
-        strings.buttons.options_label,
-        strings.buttons.options_tooltip,
-        NotebookPage.OPTIONS,
-    )
-    HELP = ButtonTypeMeta(
-        strings.buttons.help_label,
-        strings.buttons.help_tooltip,
-        NotebookPage.HELP,
-    )
-    EXIT = ButtonTypeMeta(
-        strings.buttons.exit_label,
-        strings.buttons.exit_tooltip,
-        None,
-    )
-
-    @property
-    def label(self) -> str:
-        return self.value.label
-
-    @property
-    def tooltip(self) -> str:
-        return self.value.tooltip
-
-    @property
-    def opens(self) -> NotebookPage | None:
-        return self.value.opens
+class ButtonType(EnumWithAttrs):
+    SERVERS = {
+        "label": strings.buttons.servers_label,
+        "tooltip": strings.buttons.servers_tooltip,
+        "opens": NotebookPage.SERVERS,
+    }
+    MODS = {
+        "label": strings.buttons.mods_label,
+        "tooltip": strings.buttons.mods_tooltip,
+        "opens": NotebookPage.MODS,
+    }
+    OPTIONS = {
+        "label": strings.buttons.options_label,
+        "tooltip": strings.buttons.options_tooltip,
+        "opens": NotebookPage.OPTIONS,
+    }
+    HELP = {
+        "label": strings.buttons.help_label,
+        "tooltip": strings.buttons.help_tooltip,
+        "opens": NotebookPage.HELP,
+    }
+    EXIT = {
+        "label": strings.buttons.exit_label,
+        "tooltip": strings.buttons.exit_tooltip,
+        "opens": None,
+    }
 
 
 HELP_MENU_ROWS = (

dzgui/controllers/emitter.py

@@ -3,8 +3,8 @@ from typing import TYPE_CHECKING
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository.Gtk import ListStore  # noqa E402
-from gi.repository import Gdk, GObject  # noqa E402
+from gi.repository.Gtk import ListStore
+from gi.repository import GObject
 
 if TYPE_CHECKING:
     from dzgui.const.enum import NotebookPage, ServerTab

dzgui/controllers/mc.py

@@ -8,7 +8,7 @@ import dzgui.util._json as JSON  # noqa
 
 from dzgui.const.enum import (
     ButtonType,
-    ContextMenuItem,
+    ContextMenu,
     FilterMode,
     NotebookPage,
     Preferences,
@@ -32,7 +32,7 @@ from dzgui.views.dialogs.generic import ExceptionDialog
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, GObject  # noqa E402
+from gi.repository import Gtk, Gdk, GLib, GObject
 
 logger = logging.getLogger(APP_NAME)
 
@@ -196,9 +196,7 @@ class Controller(GObject.GObject):
     def show_developers_page(self) -> None:
         self.open_page(NotebookPage.DEVELOPERS)
 
-    def open_page(self, page: NotebookPage | None) -> None:
-        if page is None:
-            return
+    def open_page(self, page: NotebookPage) -> None:
         self.mediator.grid.notebook.set_page_by_enum(page)
 
     def open_page_by_button(self, button: "ContextualButton") -> None:
@@ -264,7 +262,7 @@ class Controller(GObject.GObject):
             logger.critical(e)
             return
 
-    def menu_action(self, action: ContextMenuItem, tree: "ServerTreeView") -> None:
+    def menu_action(self, action: ContextMenu, tree: "ServerTreeView") -> None:
         context_man = ContextMenuManager(tree, self)
         context_man.process(action)
 
@@ -276,7 +274,7 @@ class Controller(GObject.GObject):
         except Exception as e:
             dialog = ExceptionDialog(self, str(e))
             dialog.show_all()
-            dialog.run()  # type: ignore[no-untyped-call]
+            dialog.run()
 
     def select_colorized(self) -> None:
         mod_man = self.mediator.modtreeview.get_mod_man()
@@ -310,7 +308,7 @@ class Controller(GObject.GObject):
             except Exception as e:
                 dialog = ExceptionDialog(self, str(e))
                 dialog.show_all()
-                dialog.run()  # type: ignore[no-untyped-call]
+                dialog.run()
 
     def update_steam_api_key(self, text: str) -> None:
         self.config_man.update_steam_api_key(text)
@@ -367,11 +365,12 @@ class Controller(GObject.GObject):
         filter_man = self.get_filter_man()
         return filter_man.get_map_store()
 
-    def get_enabled_filters(self) -> dict[str, bool]:
+    def get_enabled_filters(self) -> dict:
         filter_man = self.get_filter_man()
         return filter_man.get_filters()
 
     # FIXME: wipe maps store when changing tabs if model is none
+
     def has_server_model(self) -> bool:
         treeview = self.get_active_treeview()
         proxy_man = treeview.get_proxy_man()

dzgui/managers/config.py

@@ -124,7 +124,7 @@ class ConfigManager:
         return False
 
     def enum_to_key(self, enum: Preferences) -> str:
-        return str(enum.key)
+        return str(enum.dict["key"])
 
     def toggle_config(self, key: Preferences) -> None:
         try:

dzgui/managers/connection.py

@@ -55,11 +55,6 @@ from dzgui.util.symlink import rebuild_symlinks
 from dzgui.views.dialogs.generic import ExceptionDialog
 from dzgui.views.dialogs.servers import ServerDetailsDialog, ServerModDialog
 
-import gi
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib  # noqa E402
-
 if TYPE_CHECKING:
     from dzgui.api.servers import A2SInfo, Record
     from dzgui.controllers.mc import Controller

dzgui/managers/contextmenu.py

@@ -2,7 +2,7 @@ import logging
 from typing import TYPE_CHECKING
 
 from dzgui.const.constants import APP_NAME
-from dzgui.const.enum import ContextMenuItem, Preferences
+from dzgui.const.enum import ContextMenu, Preferences
 from dzgui.util.clip import copy_clipboard
 from dzgui.util.open_links import open_workshop_page
 
@@ -34,7 +34,7 @@ class ContextMenuManager:
         self.controller = controller
         self.treeview = treeview
 
-    def process(self, action: ContextMenuItem) -> None:
+    def process(self, action: ContextMenu) -> None:
         if isinstance(self.treeview, ServerTreeView):
             record = self.treeview.get_record()
             if record is None:
@@ -42,14 +42,14 @@ class ContextMenuManager:
 
             match action:
                 # UNTHREADED
-                case ContextMenuItem.ADD_NOTE:
+                case ContextMenu.ADD_NOTE:
                     dialog = NoteDialog(self.controller)
-                    dialog.run()  # type: ignore[no-untyped-call]
-                case ContextMenuItem.COPY_SERVER_IP:
+                    dialog.run()
+                case ContextMenu.COPY_SERVER_IP:
                     self.copy_server_ip()
-                case ContextMenuItem.COPY_SERVER_NAME:
+                case ContextMenu.COPY_SERVER_NAME:
                     self.copy_server_name()
-                case ContextMenuItem.SET_FAV:
+                case ContextMenu.SET_FAV:
                     name = self.treeview.get_value_at_index(0)
                     # NOTE: fully qualified ip
                     fqip = self.treeview.get_record_string()
@@ -58,40 +58,40 @@ class ContextMenuManager:
                     self.controller.set_fav(name, fqip, simple)
 
                 # THREADED
-                case ContextMenuItem.ADD_SERVER:
+                case ContextMenu.ADD_SERVER:
                     self.controller.add_by_record(record)
-                case ContextMenuItem.CONNECT:
+                case ContextMenu.CONNECT:
                     self.controller.connect_by_record(record)
-                case ContextMenuItem.REFRESH_PLAYERS:
+                case ContextMenu.REFRESH_PLAYERS:
                     self.controller.refresh_players(record)
-                case ContextMenuItem.REMOVE_HISTORY:
+                case ContextMenu.REMOVE_HISTORY:
                     self.controller.remove_from_history(record)
-                case ContextMenuItem.REMOVE_SERVER:
+                case ContextMenu.REMOVE_SERVER:
                     self.controller.remove_by_record(record)
-                case ContextMenuItem.SHOW_DETAILS:
+                case ContextMenu.SHOW_DETAILS:
                     self.controller.get_details(record)
-                case ContextMenuItem.SHOW_MODS:
+                case ContextMenu.SHOW_MODS:
                     self.controller.get_modlist(record)
 
         if isinstance(self.treeview, (ModTreeView, OfflineModTreeView)):
             match action:
-                case ContextMenuItem.OPEN_WORKSHOP:
+                case ContextMenu.OPEN_WORKSHOP:
                     self.open_mod_page()
-                case ContextMenuItem.UNSUB_MOD:
+                case ContextMenu.UNSUB_MOD:
                     self.controller.unsub_mods(self.treeview)
-                case ContextMenuItem.VALIDATE_MOD:
+                case ContextMenu.VALIDATE_MOD:
                     self.controller.validate_mods(self.treeview)
                 case _:
                     pass
 
         if isinstance(self.treeview, LogTreeView):
             match action:
-                case ContextMenuItem.COPY_LOG_CLIPBOARD:
+                case ContextMenu.COPY_LOG_CLIPBOARD:
                     self.copy_log()
 
         if isinstance(self.treeview, ServerModTreeView):
             match action:
-                case ContextMenuItem.OPEN_WORKSHOP:
+                case ContextMenu.OPEN_WORKSHOP:
                     self.open_mod_page()
 
     def copy_server_ip(self) -> None:

dzgui/managers/mods.py

@@ -30,7 +30,7 @@ import dzgui.api.pefile as PeFile
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/managers/threading.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib  # noqa E402
+from gi.repository import GLib
 
 logger = logging.getLogger(APP_NAME)
 

dzgui/managers/update.py

@@ -15,11 +15,6 @@ from dzgui.strings import dialogs
 from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager
 from dzgui.views.dialogs.generic import ExceptionDialog, QuitDialog
 
-import gi
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib  # noqa E402
-
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
 

dzgui/model/model_factory.py

@@ -7,8 +7,8 @@ from dzgui.util.strings import delimiter
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository.Gtk import ListStore, TreeIter  # noqa E402
-from gi.repository import GObject  # noqa E402
+from gi.repository.Gtk import ListStore, TreeIter
+from gi.repository import GObject
 
 GTYPE_TO_PYTHON = {
     GObject.type_from_name(GObject.type_name(ptype)): ptype
@@ -147,7 +147,7 @@ class ModelFactory:
 
     def make_help_store(self) -> FastInsertListStore:
         store = self.new_model_from_class(MenuCols)
-        rows = [[row.label, row] for row in HELP_MENU_ROWS]
+        rows = [[row.dict["label"], row] for row in HELP_MENU_ROWS]
         store.extend(rows)
         return store
 

dzgui/model/servers.py

@@ -21,7 +21,7 @@ from dzgui.views.dialogs.generic import ExceptionDialog
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib  # noqa E402
+from gi.repository import Gtk, GLib
 
 if TYPE_CHECKING:
     from dzgui.api.servers import A2SInfo, Record

dzgui/strings/rows.py

@@ -1,29 +0,0 @@
-changelog_label = "View changelog"
-changelog_status = "Opens the DZGUI changelog"
-
-log_label = "Show debug log"
-log_status = "Read the DZGUI log generated since startup"
-
-separator_label = "SEPARATOR"
-separator_status = ""
-
-system_log_label = "Output system info to log file"
-system_log_status = "Dump diagnostic data for troubleshooting"
-
-docs_label = "Documentation/help files (GitHub) ⧉"
-docs_status = "Open the DZGUI documentation in a browser"
-
-docs_fallback_label = "Documentation/help files (Codeberg mirror) ⧉"
-docs_fallback_status = "Open the DZGUI documentation in a browser"
-
-bugs_label = "Report a bug (GitHub) ⧉"
-bugs_status = "Open the DZGUI issue tracker in a browser"
-
-forum_label = "DZGUI Subreddit ⧉"
-forum_status = "Open the DZGUI discussion forum in a browser"
-
-sponsor_label = "Sponsor (GitHub) ⧉"
-sponsor_status = "Sponsor development of the DZGUI project"
-
-thanks_label = "Special thanks"
-thanks_status = "A list of contributors, testers, and sponsors"

dzgui/util/clip.py

@@ -1,8 +1,7 @@
 import gi
 
 gi.require_version("Gtk", "3.0")
-gi.require_version("Gdk", "3.0")
-from gi.repository import Gtk, Gdk  # noqa E402
+from gi.repository import Gtk, Gdk
 
 
 def copy_clipboard(text: str) -> None:

dzgui/util/css.py

@@ -5,7 +5,7 @@ from dzgui.const.constants import APP_NAME_LOWER, CSS_PATH
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk  # noqa E402
+from gi.repository import Gtk, Gdk
 
 
 def add_class(widget: Gtk.Widget, label: str) -> None:

dzgui/util/dist.py

@@ -7,11 +7,6 @@ from dzgui.const.constants import APP_NAME
 from dzgui.util.ip import get_coords
 from dzgui.util.localize import number
 
-import gi
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
-
 if TYPE_CHECKING:
     from queue import Queue
     from dzgui.const.enum import ServerTab

dzgui/util/format.py

@@ -7,7 +7,7 @@ from dzgui.util.strings import no_mods, no_servers, workshop
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 
 def format_pango(text: str) -> str:

dzgui/util/keys.py

@@ -1,6 +1,8 @@
 import gi
+
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk  # noqa E402
+from gi.repository import Gdk
+
 
 def is_navkey(key: int) -> bool:
     nav_keys = [
@@ -18,6 +20,7 @@ def is_navkey(key: int) -> bool:
         return True
     return False
 
+
 def is_ctrl_mask(event: Gdk.EventKey) -> bool:
     if event.state is Gdk.ModifierType.CONTROL_MASK:
         return True

dzgui/util/margins.py

@@ -1,6 +1,8 @@
 import gi
+
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
+
 
 def set_surrounding_margins(widget: Gtk.Widget, margin: int) -> None:
     """

dzgui/util/save_screenshot.py

@@ -4,7 +4,7 @@ from typing import cast, TYPE_CHECKING
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib  # noqa E402
+from gi.repository import Gdk, GLib
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/util/strings.py

@@ -252,7 +252,6 @@ class Crumbs:
     developers: str
     default: str
     offline: str
-    connect: str
 
 
 @dataclass(slots=True, frozen=True)
@@ -440,7 +439,6 @@ crumbs = Crumbs(
     developers="Options > Developers",
     default="Servers > ",
     offline="Mods > Play offline",
-    connect="Connect",
 )
 
 no_mods = "No local mods found."

dzgui/views/base.py

@@ -38,7 +38,7 @@ import gi
 
 gi.require_version("Gtk", "3.0")
 gi.require_version("GLibUnix", "2.0")
-from gi.repository import Gtk, GLib, GLibUnix, Gdk  # type: ignore # noqa E402
+from gi.repository import Gtk, GLib, GLibUnix, Gdk  # type: ignore
 
 if TYPE_CHECKING:
     from dzgui.config.userprefs import UserPrefs

dzgui/views/components/buttonbox.py

@@ -7,7 +7,7 @@ from dzgui.const.enum import ButtonType
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk  # noqa E402
+from gi.repository import Gtk, Gdk
 
 logger = logging.getLogger(APP_NAME)
 
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 
 class ContextualButton(Gtk.Button):
     def __init__(
-        self, label: str, opens: "NotebookPage" | None, tooltip: str, context: ButtonType
+        self, label: str, opens: "NotebookPage", tooltip: str, context: ButtonType
     ) -> None:
         super().__init__(
             label=label,
@@ -51,9 +51,9 @@ class ButtonBox(Gtk.Box):
 
         for side_button in ButtonType:
             button = ContextualButton(
-                label=side_button.label,
-                opens=side_button.opens,
-                tooltip=side_button.tooltip,
+                label=side_button.dict["label"],
+                opens=side_button.dict["opens"],
+                tooltip=side_button.dict["tooltip"],
                 context=side_button,
             )
 

dzgui/views/components/buttons.py

@@ -22,7 +22,7 @@ from dzgui.strings import connect_panel
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib  # noqa E402
+from gi.repository import Gtk, GLib
 
 if TYPE_CHECKING:
     from gi.repository import GLib

dzgui/views/components/connect_panel.py

@@ -18,7 +18,7 @@ from dzgui.views.components.labels import BoldLabel
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk  # noqa E402
+from gi.repository import Gtk, Gdk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/components/crumbs.py

@@ -7,7 +7,7 @@ from dzgui.util.format import embolden
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -43,7 +43,7 @@ class Breadcrumbs(Gtk.Label):
             label = page.get_current_tab_text()
             self.set_server_crumbs(label)
         else:
-            crumbs = enum.crumbs
+            crumbs = enum.dict["crumbs"]
             self.set_crumbs(crumbs)
 
     def set_server_crumbs(self, suffix: str) -> None:

dzgui/views/components/entry.py

@@ -9,7 +9,7 @@ from dzgui.strings.errors import api_popover
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GObject  # noqa E402
+from gi.repository import Gtk, Gdk, GObject
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/components/eventbox.py

@@ -6,7 +6,7 @@ from dzgui.const.constants import HELP_BUBBLE
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk  # noqa E402
+from gi.repository import Gtk, Gdk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/components/filter_panel.py

@@ -17,7 +17,7 @@ from dzgui.views.components.labels import BoldLabel
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, Pango, GLib  # noqa E402
+from gi.repository import Gtk, Gdk, Pango, GLib
 
 logger = logging.getLogger(APP_NAME)
 
@@ -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():

dzgui/views/components/icon.py

@@ -1,7 +1,7 @@
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 
 class Icon(Gtk.Image):

dzgui/views/components/labels.py

@@ -3,7 +3,7 @@ from dzgui.util.format import embolden
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 
 class BoldLabel(Gtk.Label):

dzgui/views/components/maps_combo.py

@@ -1,7 +1,7 @@
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib  # noqa E402
+from gi.repository import Gtk
 
 
 class MapsCombo(Gtk.EntryCompletion):

dzgui/views/components/mod_panel.py

@@ -8,7 +8,7 @@ from dzgui.views.components.labels import BoldLabel
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -20,8 +20,8 @@ class EnumeratedModButton(Gtk.Button):
         super().__init__(margin_start=10, margin_end=10, focus_on_click=False)
 
         self.enum = enum
-        self.set_label(enum.label)
-        self.set_tooltip_text(enum.tooltip)
+        self.set_label(enum.dict["label"])
+        self.set_tooltip_text(enum.dict["tooltip"])
 
 
 class ModPanelButton(EnumeratedModButton):

dzgui/views/components/right_panel.py

@@ -23,7 +23,7 @@ from dzgui.views.components.buttons import IconTextButton, RefreshButton, KeysBu
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib  # noqa E402
+from gi.repository import Gtk, Gdk, GLib
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/components/statusbar.py

@@ -7,7 +7,7 @@ from dzgui.views.components.buttons import LoggerAlertsButton
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.const.enum import ServerTab
@@ -60,7 +60,7 @@ class Statusbar(Gtk.Grid):
             return
 
         enum = notebook.get_page_by_enum()
-        show_statusbar = enum.has_statusbar
+        show_statusbar = enum.dict["statusbar"]
 
         if show_statusbar is False:
             self.set_by_context(enum, "")
@@ -152,5 +152,5 @@ class Statusbar(Gtk.Grid):
         row = tree.get_value_at_index(1)
         if self.controller.loaded is False:
             return
-        tooltip = row.tooltip
+        tooltip = row.dict["tooltip"]
         self.set_by_context(NotebookPage.HELP, tooltip)

dzgui/views/components/toast.py

@@ -2,8 +2,9 @@ from typing import Literal
 from dzgui.util import css
 
 import gi
+
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib  # noqa E402
+from gi.repository import Gtk, GLib
 
 
 class Toast(Gtk.EventBox):

dzgui/views/dialogs/calc.py

@@ -10,7 +10,7 @@ from dzgui.views.components.labels import BoldLabel
 from dzgui.views.components.box import VBox, HBox
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, GObject  # type: ignore  # noqa E402
+from gi.repository import Gtk, GLib, GObject
 
 DAY_START_TIME = time(hour=6, minute=0, second=0)
 DAY_END_TIME = time(hour=18, minute=0, second=0)

dzgui/views/dialogs/early_alert.py

@@ -8,7 +8,7 @@ from dzgui.views.mixins.colorscheme import ColorAwareApp
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 
 class AbortDialog(ColorAwareApp, Gtk.MessageDialog):  # type: ignore

dzgui/views/dialogs/filepicker.py

@@ -2,10 +2,10 @@ from pathlib import Path
 
 from dzgui.util.strings import picker
 
-import gi  # noqa E402
+import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 
 class FilePicker(Gtk.FileChooserDialog):

dzgui/views/dialogs/generic.py

@@ -8,7 +8,7 @@ from dzgui.views.components.buttons import ClipboardButton
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
+from gi.repository import Gtk, GLib
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/dialogs/link_dialog.py

@@ -9,7 +9,7 @@ from dzgui.views.components.buttons import SteamTextButton
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
+from gi.repository import Gtk
 
 
 if TYPE_CHECKING:

dzgui/views/dialogs/note.py

@@ -3,10 +3,10 @@ from typing import Self, TYPE_CHECKING
 from dzgui.views.components.entry import ValidatedEntry
 from dzgui.views.dialogs.generic import GenericDialog
 
-import gi  # noqa E402
+import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/dialogs/uninstall.py

@@ -18,7 +18,7 @@ from dzgui.views.mixins.colorscheme import ColorAwareApp
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Pango  # noqa E402
+from gi.repository import Gtk, GLib, Pango
 
 
 class Assistant(Gtk.Assistant):

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
@@ -35,7 +35,7 @@ from dzgui.views.trees.tree_simple import SimpleTree
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, Gtk, GLib, GObject, GdkPixbuf  # noqa E402
+from gi.repository import Gtk, GLib, GObject, GdkPixbuf
 
 if TYPE_CHECKING:
     from dzgui.config.xdg import Xdg

dzgui/views/mixins/context_mixin.py

@@ -1,7 +1,7 @@
 import logging
 
 from dzgui.const.constants import APP_NAME
-from dzgui.const.enum import ContextMenuItem
+from dzgui.const.enum import ContextMenu
 from dzgui.util.keys import is_ctrl_mask, is_navkey
 from dzgui.util.strings import edit_note
 from dzgui.views.trees.tree_base import TreeView
@@ -9,13 +9,15 @@ 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 E402
+from gi.repository import Gtk, Gdk
 
 logger = logging.getLogger(APP_NAME)
 
 
 class ContextMixin(TreeView):
-    def present_menu(self, widget: Gtk.Widget, event: Gdk.Event) -> bool:
+    def present_menu(
+        self, widget: Gtk.Widget, event: Gdk.Event
+    ) -> bool:
 
         if self.menu is None:
             return False
@@ -58,17 +60,17 @@ class ContextMixin(TreeView):
         self.context_menu.select_first(False)
         return True
 
-    def _process_dynamic_row(self, row: ContextMenuItem) -> Gtk.MenuItem:
-        if row == ContextMenuItem.ADD_SERVER and self.is_in_favs():  # type: ignore
-            row = ContextMenuItem.REMOVE_SERVER
+    def _process_dynamic_row(self, row: ContextMenu) -> Gtk.MenuItem:
+        if row == ContextMenu.ADD_SERVER and self.is_in_favs():  # type: ignore
+            row = ContextMenu.REMOVE_SERVER
 
-        item = Gtk.MenuItem(label=row.label)
+        item = Gtk.MenuItem(label=row.dict["label"])
         item.connect("activate", self._on_menu_click, row)
 
-        if row == ContextMenuItem.SHOW_MODS:
+        if row == ContextMenu.SHOW_MODS:
             item.set_sensitive(self.is_modded())  # type: ignore
 
-        if row == ContextMenuItem.ADD_NOTE:
+        if row == ContextMenu.ADD_NOTE:
             if self.controller.has_note():
                 item.set_label(edit_note)
 
@@ -92,7 +94,7 @@ class ContextMixin(TreeView):
         except AttributeError:
             return False
 
-    def _on_menu_click(self, widget: Gtk.MenuItem, enum: ContextMenuItem) -> None:
+    def _on_menu_click(self, widget: Gtk.MenuItem, enum: ContextMenu) -> None:
         self.controller.menu_action(enum, self)  # type: ignore
 
     def _on_key(self, menu: Gtk.Menu, event: Gdk.EventKey) -> bool | None:

dzgui/views/mixins/cursor_mixin.py

@@ -5,7 +5,7 @@ from dzgui.util.keys import is_ctrl_mask
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
+from gi.repository import Gtk, Gdk
 
 
 class CursorMixin:

dzgui/views/mixins/mods_mixin.py

@@ -3,7 +3,7 @@ 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 E402
+from gi.repository import Gtk
 
 
 class ModsMixin:

dzgui/views/pages/changelog.py

@@ -15,7 +15,7 @@ from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 logger = logging.getLogger(APP_NAME)
 

dzgui/views/pages/devs.py

@@ -7,10 +7,10 @@ from dzgui.util.strings import developers
 from dzgui.views.components.labels import BoldLabel
 from dzgui.views.trees.tree_base import TreeView
 
-import gi  # noqa E402
+import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/pages/help.py

@@ -4,7 +4,7 @@ from dzgui.views.trees.tree_menu import MenuTreeView
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/pages/keys.py

@@ -7,7 +7,7 @@ from dzgui.util.css import add_class
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/pages/log.py

@@ -9,7 +9,7 @@ from dzgui.views.trees.tree_log import LogTreeView
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller

dzgui/views/pages/preconnect.py

@@ -18,7 +18,7 @@ from dzgui.views.trees.tree_server_mods import ServerModTreeView
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, Gtk  # noqa E402
+from gi.repository import Gdk, Gtk
 
 
 if TYPE_CHECKING:

dzgui/views/pages/servers.py

@@ -10,7 +10,7 @@ from dzgui.util.strings import server_labels
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib  # noqa E402
+from gi.repository import Gtk, Gdk
 
 logger = logging.getLogger(APP_NAME)
 

dzgui/views/pages/thanks.py

@@ -8,7 +8,7 @@ from dzgui.views.mixins.scrollable_mixin import ScrollableMixin
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 # TODO: wrap and center long values
 if TYPE_CHECKING:

dzgui/views/trees/tree_log.py

@@ -12,7 +12,7 @@ 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 gi.repository import Gtk, Gdk
 
 if TYPE_CHECKING:
     from pathlib import Path

dzgui/views/trees/tree_menu.py

@@ -77,4 +77,4 @@ class MenuTreeView(TreeView):
             raise ValueError("Trying to call a method on non-existent model")
         _iter = self.get_focused_row_iter()
         rowtype = model.get_value(_iter, 1)
-        return str(rowtype.tooltip)
+        return str(rowtype.dict["tooltip"])

dzgui/views/trees/tree_servers.py

@@ -7,7 +7,7 @@ from warnings import deprecated
 
 from dzgui.api.servers import ping, Record
 from dzgui.const.constants import APP_NAME
-from dzgui.const.enum import ContextMenuItem, ContextMenuGroup, ServerTab
+from dzgui.const.enum import ContextMenu, ContextMenuGroup, ServerTab
 from dzgui.managers.filter import FilterManager
 from dzgui.model.proxy_model import ProxyModelManager
 from dzgui.util import strings
@@ -250,9 +250,9 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
                     if self.enum is ServerTab.LAN:
                         self.emitter.emit("request_custom_port_focus")
                 case Gdk.KEY_c:
-                    self.controller.menu_action(ContextMenuItem.COPY_SERVER_IP, self)
+                    self.controller.menu_action(ContextMenu.COPY_SERVER_IP, self)
                 case Gdk.KEY_r:
-                    self.controller.menu_action(ContextMenuItem.REFRESH_PLAYERS, self)
+                    self.controller.menu_action(ContextMenu.REFRESH_PLAYERS, self)
         else:
             match event.keyval:
                 case Gdk.KEY_l | Gdk.KEY_Right:

pyproject.toml

@@ -78,6 +78,7 @@ line-length = 88
 indent-width = 4
 extend-exclude = ["*lib/a2s"]
 lint.unfixable = ["F401", "I001"]
+lint.ignore = ["E402"]
 
 [tool.ruff.format]
 quote-style = "double"

scripts/unused_imports.py

@@ -1,38 +0,0 @@
-from pathlib import Path
-
-
-def iterate(search_str: str) -> None:
-    # TODO: exclude files from .gitignore
-    print()
-    print(f"Searching for '{search_str}'")
-    print()
-    files = Path(".").rglob("*")
-    ignore = [
-        "scripts/",
-        ".git",
-        "egg",
-        "CHANGELOG",
-        ".mypy",
-        "build/",
-        "test.py",
-        "bugs",
-        "pyproject.toml",
-    ]
-    for file in files:
-        if file.is_dir():
-            continue
-        if any(s in str(file) for s in ignore):
-            continue
-        try:
-            text = file.read_text()
-            if search_str in text:
-                c = text.count(search_str)
-                if 0 < c < 2:
-                    print(file, c)
-        except Exception:
-            continue
-
-
-imports = ["Pango", "GObject", "GLib", "Gdk", "Gtk"]
-for i in imports:
-    iterate(i)

tests/test_html_escaping.py

@@ -6,7 +6,7 @@ from dzgui.views.dialogs.servers import ServerDetailsDialog
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa E402
+from gi.repository import Gtk
 
 
 class MockController: