Merge branch 'dzgui7' into chore/strict-typehinting

dzgui/api/steam.py

@@ -31,10 +31,10 @@ from dzgui.const.constants import (
     VDF_PATH,
 )
 from dzgui.const.endpoints import (
-    APP_DETAILS,
-    SUB_ENDPOINT,
+    STEAM_APP_DETAILS,
     STEAM_PUBLISHED_FILES,
-    UNSUB_ENDPOINT,
+    STEAM_SUB,
+    STEAM_UNSUB,
 )
 from dzgui.strings import wizard
 from dzgui.strings.errors import api_validation_error, workshop_endpoint_error
@@ -310,11 +310,11 @@ def update_workshop(key: str, mod: int, endpoint: str) -> None:
 
 
 def subscribe(key: str, mod: int) -> None:
-    update_workshop(key, mod, SUB_ENDPOINT)
+    update_workshop(key, mod, STEAM_SUB)
 
 
 def unsubscribe(key: str, mod: int) -> None:
-    update_workshop(key, mod, UNSUB_ENDPOINT)
+    update_workshop(key, mod, STEAM_UNSUB)
 
 
 def validate_mod(client: str, mod: str) -> None:
@@ -512,7 +512,7 @@ def get_app_path(folders_path: Path, appid: int) -> Path:
 
 def get_app_name(appid: int) -> str | None:
     payload = {"appids": [appid]}
-    res = requests.get(APP_DETAILS, params=payload)
+    res = requests.get(STEAM_APP_DETAILS, params=payload)
     if res.status_code != 200:
         return None
     try:

dzgui/const/constants.py

@@ -37,37 +37,8 @@ HEX_GREEN = "#32CD32"
 HEX_RED = "#FF0000"
 HEX_ORANGE = "#FFAC1C"
 
-# TODO: normalize icon names
-CALCULATOR = "accessories-calculator-symbolic"
-CARET_DOWN = "go-down-symbolic"
-CARET_UP = "go-up-symbolic"
-CLIPBOARD = "edit-copy-symbolic"
-CLOSE = "window-close-symbolic"
-FOLDER = "folder-symbolic"
-EDIT_DELETE = "edit-delete-symbolic"
-ERROR = "dialog-error-symbolic"
-HELP_BUBBLE = "help-about-symbolic"
-INPUT_KEYBOARD = "input-keyboard-symbolic"
-LIST_ADD = "list-add-symbolic"
-REFRESH_ICON = "view-refresh-symbolic"
-SEARCH_ICON = "system-search-symbolic"
-STEAM_ICON = "steam-tray-symbolic"
-VIEW_CONCEAL = "view-conceal-symbolic"
-VIEW_REVEAL = "view-reveal-symbolic"
-WARNING = "dialog-warning-symbolic"
-WEB_BROWSER = "web-browser-symbolic"
-DAY_ICON = "weather-clear-symbolic"
-NIGHT_ICON = "weather-clear-night-symbolic"
-
 SEPARATOR = "SEPARATOR"
 
-# TODO: drop
-NO_PADDING = 0
-NO_EXPAND = False
-NO_FILL = False
-EXPAND = True
-FILL = True
-
 SCROLL_INCREMENT = 50
 WINDOW_DEFAULT_X = 1400
 WINDOW_DEFAULT_Y = 800

dzgui/const/endpoints.py

@@ -3,9 +3,9 @@ STEAM_PUBLISHED_FILES = (
     "https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1"
 )
 STEAM_SERVERS = "https://api.steampowered.com/IGameServersService/GetServerList/v1"
-SUB_ENDPOINT = "https://api.steampowered.com/IPublishedFileService/Subscribe/v1"
-UNSUB_ENDPOINT = "https://api.steampowered.com/IPublishedFileService/Unsubscribe/v1"
-APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
+STEAM_SUB = "https://api.steampowered.com/IPublishedFileService/Subscribe/v1"
+STEAM_UNSUB = "https://api.steampowered.com/IPublishedFileService/Unsubscribe/v1"
+STEAM_APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
 
 GITHUB = "https://github.com/aclist"
 GITHUB_RELEASES = "https://api.github.com/repos/aclist/dztui/releases/latest"

dzgui/const/icons.py

@@ -0,0 +1,20 @@
+ICON_CALCULATOR = "accessories-calculator-symbolic"
+ICON_CARET_DOWN = "go-down-symbolic"
+ICON_CARET_UP = "go-up-symbolic"
+ICON_CLIPBOARD = "edit-copy-symbolic"
+ICON_CLOSE = "window-close-symbolic"
+ICON_DAY = "weather-clear-symbolic"
+ICON_EDIT_DELETE = "edit-delete-symbolic"
+ICON_ERROR = "dialog-error-symbolic"
+ICON_FOLDER = "folder-symbolic"
+ICON_HELP_BUBBLE = "help-about-symbolic"
+ICON_INPUT_KEYBOARD = "input-keyboard-symbolic"
+ICON_LIST_ADD = "list-add-symbolic"
+ICON_NIGHT = "weather-clear-night-symbolic"
+ICON_REFRESH = "view-refresh-symbolic"
+ICON_SEARCH = "system-search-symbolic"
+ICON_STEAM = "steam-tray-symbolic"
+ICON_VIEW_CONCEAL = "view-conceal-symbolic"
+ICON_VIEW_REVEAL = "view-reveal-symbolic"
+ICON_WARNING = "dialog-warning-symbolic"
+ICON_WEB_BROWSER = "web-browser-symbolic"

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

@@ -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)
 

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/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  # type: ignore[no-untyped-call]

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/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

@@ -8,7 +8,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/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

@@ -1,13 +1,13 @@
 import logging
 from typing import TYPE_CHECKING
 
-from dzgui.const.constants import APP_NAME, NO_EXPAND, NO_FILL, NO_PADDING
+from dzgui.const.constants import APP_NAME
 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)
 
@@ -63,7 +63,7 @@ class ButtonBox(Gtk.Box):
 
             self.buttons.append(button)
             button.connect("clicked", self._on_selection_button_clicked)
-            self.pack_start(button, NO_EXPAND, NO_FILL, NO_PADDING)
+            self.pack_start(button, expand=False, fill=False, padding=0)
 
     def _focus_first_button(self, emitter: "Emitter") -> None:
         self.buttons[0].grab_focus()

dzgui/views/components/buttons.py

@@ -5,21 +5,22 @@ from dzgui.strings import buttons
 from dzgui.util.strings import (
     atomic_buttons,
 )
-from dzgui.const.constants import (
-    CLIPBOARD,
-    CLOSE,
-    INPUT_KEYBOARD,
-    LIST_ADD,
-    REFRESH_ICON,
-    STEAM_ICON,
-    WEB_BROWSER,
+from dzgui.const.icons import (
+    ICON_CLIPBOARD,
+    ICON_CLOSE,
+    ICON_INPUT_KEYBOARD,
+    ICON_LIST_ADD,
+    ICON_REFRESH,
+    ICON_STEAM,
+    ICON_WARNING,
+    ICON_WEB_BROWSER,
 )
 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
@@ -98,8 +99,9 @@ class LargeIconTextButton(IconButton):
 
 
 class ClipboardButton(IconTextButton):
-    def __init__(self, func: Callable[[], str]) -> None:
-        super().__init__(CLIPBOARD, atomic_buttons.copy)
+    def __init__(self, controller: Union["Controller", None], func: Callable) -> None:
+        super().__init__(ICON_CLIPBOARD, atomic_buttons.copy)
+        self.controller = controller
         self.connect("clicked", self._on_button_clicked, func)
 
         # TODO: strings
@@ -126,7 +128,7 @@ class CopyIpButton(ClipboardButton):
 
 class CloseButton(IconTextButton):
     def __init__(self, label: str) -> None:
-        super().__init__(icon=CLOSE, label=label)
+        super().__init__(icon=ICON_CLOSE, label=label)
 
         # TODO: strings
         self.set_tooltip_text("Unset this server as favorite")
@@ -134,14 +136,14 @@ class CloseButton(IconTextButton):
 
 class WebButton(IconTextButton):
     def __init__(self, label: str) -> None:
-        super().__init__(icon=WEB_BROWSER, label=label)
+        super().__init__(icon=ICON_WEB_BROWSER, label=label)
         pass
 
 
 class RefreshButton(IconTextButton):
     def __init__(self, controller: "Controller") -> None:
         super().__init__(
-            icon=REFRESH_ICON,
+            icon=ICON_REFRESH,
             label=atomic_buttons.refresh,
         )
 
@@ -206,7 +208,7 @@ class RefreshButton(IconTextButton):
 
 class KeysButton(IconTextButton):
     def __init__(self, controller: "Controller") -> None:
-        super().__init__(icon=INPUT_KEYBOARD, label=atomic_buttons.keys)
+        super().__init__(icon=ICON_INPUT_KEYBOARD, label=atomic_buttons.keys)
 
         self.controller = controller
         self.set_margin_top(10)
@@ -223,7 +225,7 @@ class KeysButton(IconTextButton):
 
 class SteamConnectButton(LargeIconTextButton):
     def __init__(self) -> None:
-        super().__init__(icon=STEAM_ICON, label=connect_panel.connect_button)
+        super().__init__(icon=ICON_STEAM, label=connect_panel.connect_button)
         self.set_tooltip_text(connect_panel.connect_tooltip)
 
 
@@ -243,7 +245,7 @@ class SteamWorkshopButton(SteamTextButton):
 
 class AddButton(IconTextButton):
     def __init__(self) -> None:
-        super().__init__(icon=LIST_ADD, label=connect_panel.add_button)
+        super().__init__(icon=ICON_LIST_ADD, label=connect_panel.add_button)
         self.set_tooltip_text(connect_panel.add_tooltip)
 
 

dzgui/views/components/connect_panel.py

@@ -1,6 +1,7 @@
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.constants import CARET_DOWN, CARET_UP, UDP_PORT
+from dzgui.const.icons import ICON_CARET_DOWN, ICON_CARET_UP
+from dzgui.const.constants import UDP_PORT
 from dzgui.model.servers import ServerModelManager
 from dzgui.strings import connect_panel
 from dzgui.util.keys import is_ctrl_mask
@@ -18,7 +19,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
@@ -30,7 +31,7 @@ ROWS = 1
 
 class DockButton(IconButton):
     def __init__(self, child: Gtk.Widget) -> None:
-        super().__init__(CARET_DOWN)
+        super().__init__(ICON_CARET_DOWN)
 
         self.expanded = True
         self.child = child
@@ -43,12 +44,12 @@ class DockButton(IconButton):
         self.set_tooltip_text(self.collapse_text)
 
     def collapse(self) -> None:
-        self.set_image(Icon(CARET_UP))
+        self.set_image(Icon(ICON_CARET_UP))
         self.child.hide()
         self.set_tooltip_text(self.expand_text)
 
     def expand(self) -> None:
-        self.set_image(Icon(CARET_DOWN))
+        self.set_image(Icon(ICON_CARET_DOWN))
         self.child.show()
         self.set_tooltip_text(self.collapse_text)
 

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

dzgui/views/components/entry.py

@@ -1,7 +1,7 @@
 from typing import Any, Callable, TYPE_CHECKING
 
 from dzgui.api.servers import validate_ip
-from dzgui.const.constants import VIEW_CONCEAL, VIEW_REVEAL
+from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
 from dzgui.util.css import add_class, remove_class
 from dzgui.strings import connect_panel
 from dzgui.strings.errors import api_popover
@@ -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
@@ -146,7 +146,7 @@ class APIEntry(Gtk.Box):
         self.entry = Gtk.Entry(
             width_chars=60, hexpand=True, placeholder_text="Enter API key"
         )
-        self.entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, VIEW_REVEAL)
+        self.entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, ICON_VIEW_REVEAL)
         self.entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
         self.entry.set_visibility(False)
         self.entry.connect("changed", self._on_text_changed)
@@ -205,9 +205,9 @@ class APIEntry(Gtk.Box):
     ) -> None:
         visible = widget.get_visibility()
         if visible:
-            icon, state = VIEW_REVEAL, False
+            icon, state = ICON_VIEW_REVEAL, False
         else:
-            icon, state = VIEW_CONCEAL, True
+            icon, state = ICON_VIEW_CONCEAL, True
         widget.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon)
         widget.set_visibility(state)
 

dzgui/views/components/eventbox.py

@@ -1,12 +1,12 @@
 from typing import TYPE_CHECKING
 
 from dzgui.const.enum import NotebookPage
-from dzgui.const.constants import HELP_BUBBLE
+from dzgui.const.icons import ICON_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
@@ -20,7 +20,7 @@ class InfoEventBox(Gtk.EventBox):
         self.text = text
 
         self.icon = Gtk.Image.new_from_icon_name(
-            HELP_BUBBLE, Gtk.IconSize.LARGE_TOOLBAR
+            ICON_HELP_BUBBLE, Gtk.IconSize.LARGE_TOOLBAR
         )
         self.icon.set_opacity(0.8)
         box = Gtk.Box()

dzgui/views/components/filter_panel.py

@@ -3,12 +3,8 @@ from typing import Literal, TYPE_CHECKING
 
 from dzgui.const.constants import (
     APP_NAME,
-    EXPAND,
-    NO_EXPAND,
-    NO_FILL,
-    NO_PADDING,
-    SEARCH_ICON,
 )
+from dzgui.const.icons import ICON_SEARCH
 from dzgui.util.format import format_exception
 from dzgui.util.strings import all_maps
 from dzgui.views.components.maps_combo import MapsCombo
@@ -17,7 +13,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)
 
@@ -112,7 +108,7 @@ class KeywordEntry(Gtk.Entry):
         self.connect("key-press-event", self._on_keypress)
         self.connect("icon-release", lambda *args: self.activate())
 
-        self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, SEARCH_ICON)
+        self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, ICON_SEARCH)
         self.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
 
         self.emitter.connect("load_maps", self._on_maps_loaded)
@@ -204,7 +200,7 @@ class FilterPanel(Gtk.Box):
         self.maps_entry.connect("key-press-event", self._on_map_entry_keypress)
         self.maps_entry.connect("activate", self._on_maps_activated)
 
-        self.maps_combo.pack_start(renderer_text, EXPAND)
+        self.maps_combo.pack_start(renderer_text, expand=True)
         self.maps_combo.connect("changed", self._on_map_changed)
         self.maps_combo.connect("key-press-event", self._on_combo_keypress)
 
@@ -214,7 +210,7 @@ class FilterPanel(Gtk.Box):
             self.maps_combo,
             self.button_grid,
         ):
-            self.pack_start(el, NO_EXPAND, NO_FILL, NO_PADDING)
+            self.pack_start(el, expand=False, fill=False, padding=0)
 
     def _on_maps_activated(self, entry: Gtk.Entry) -> None:
         text = entry.get_text()

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/misc.py

@@ -1,7 +1,8 @@
 from typing import Self
 from warnings import deprecated
 
-from dzgui.const.constants import ERROR, FLATPAK_RUN_CMD, FLATPAK_SANDBOX, STEAM_CMD
+from dzgui.const.constants import FLATPAK_RUN_CMD, FLATPAK_SANDBOX, STEAM_CMD
+from dzgui.const.icons import ICON_ERROR
 from dzgui.init.prereqs import has_steam_client, has_flatpak_client
 from dzgui.strings import options
 from dzgui.views.components.box import HBox
@@ -73,7 +74,7 @@ class ErrorPopover(Gtk.Popover):
 
         self.hbox = HBox()
         self.label = Gtk.Label(label="", margin_start=10, margin_end=10)
-        error_icon = Icon(ERROR, margin_start=10)
+        error_icon = Icon(ICON_ERROR, margin_start=10)
         self.hbox.extend([error_icon, self.label])
         self.add(self.hbox)
         self.show_all()

dzgui/views/components/mod_panel.py

@@ -1,14 +1,13 @@
 from typing import Self, TYPE_CHECKING
 
 from dzgui.const.enum import ModButton
-from dzgui.const.constants import NO_EXPAND, FILL, NO_PADDING
 from dzgui.util.strings import mod_panel
 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
@@ -55,7 +54,7 @@ class ModSelectionPanel(Gtk.Box):
         for button in buttons:
             b = EnumeratedModButton(button)
             b.connect("clicked", self._on_button_clicked)
-            self.main_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING)
+            self.main_panel.pack_start(b, expand=False, fill=True, padding=0)
 
         self.stale_panel = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
         self.highlight_stale_button = ModPanelButton(ModButton.HIGHLIGHT_STALE)
@@ -67,11 +66,11 @@ class ModSelectionPanel(Gtk.Box):
             self.unhighlight_stale_button,
             self.select_stale_button,
         ):
-            self.stale_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING)
+            self.stale_panel.pack_start(b, expand=False, fill=True, padding=0)
             b.connect("clicked", self._on_button_clicked)
 
         for el in header, self.main_panel, self.stale_panel:
-            self.pack_start(el, NO_EXPAND, FILL, NO_PADDING)
+            self.pack_start(el, expand=False, fill=True, padding=0)
 
         self.connect("map", self._reinit_button)
 

dzgui/views/components/right_panel.py

@@ -6,10 +6,6 @@ from typing import Literal, TYPE_CHECKING
 
 from dzgui.const.constants import (
     APP_NAME,
-    NO_EXPAND,
-    NO_FILL,
-    FILL,
-    NO_PADDING,
 )
 from dzgui.const.enum import ServerTab
 from dzgui.managers.update import UpdateManager
@@ -23,7 +19,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
@@ -73,9 +69,9 @@ class RightPanel(Gtk.Box):
         eb.connect("button-press-event", self._on_version_clicked)
 
         for el in self.button_vbox, self.keys, self.filters_vbox, self.refresh_button:
-            self.pack_start(el, NO_EXPAND, FILL, NO_PADDING)
+            self.pack_start(el, expand=False, fill=True, padding=0)
 
-        self.pack_start(self.sel_panel, NO_EXPAND, NO_FILL, NO_PADDING)
+        self.pack_start(self.sel_panel, expand=False, fill=False, padding=0)
 
         self.update_button = IconTextButton(
             "dialog-information-symbolic", label="Updates available"
@@ -96,7 +92,7 @@ class RightPanel(Gtk.Box):
                     "clicked", self._on_update_button_clicked, exe_path, update
                 )
         self.gutter_box.add(eb)
-        self.pack_start(self.gutter_box, NO_EXPAND, FILL, NO_PADDING)
+        self.pack_start(self.gutter_box, expand=False, fill=True, padding=0)
 
     def _on_update_button_clicked(
         self, button: Gtk.Button, exe_path: str, url: str

dzgui/views/components/statusbar.py

@@ -6,7 +6,7 @@ from dzgui.util.strings import esc_to_return, question_to_return
 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

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/boot.py

@@ -14,7 +14,6 @@ from dzgui.const.constants import HEX_GREEN, HEX_RED
 from dzgui.init.coords import get_local_coords
 from dzgui.init.dayz import is_dayz_installed
 from dzgui.init.update import check_updates
-from dzgui.const.constants import EXPAND, FILL
 from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager
 from dzgui.strings import preboot, dialogs
 from dzgui.util.format import format_exception
@@ -118,8 +117,8 @@ class BootDialog(ColorAwareApp, Gtk.Dialog):  # type: ignore
         self.error_box.add(self.button_hbox)
 
         self.content = self.get_content_area()
-        self.content.pack_start(self.scrollable_tree, EXPAND, FILL, 0)
-        self.content.pack_start(self.error_box, EXPAND, FILL, 0)
+        self.content.pack_start(self.scrollable_tree, expand=True, fill=True, padding=0)
+        self.content.pack_start(self.error_box, expand=True, fill=True, padding=0)
         self.show_all()
 
         self.error_box.hide()

dzgui/views/dialogs/calc.py

@@ -3,14 +3,14 @@ from dataclasses import dataclass
 from datetime import datetime, time, timedelta
 from typing import Literal
 
-from dzgui.const.constants import DAY_ICON, NIGHT_ICON
+from dzgui.const.icons import ICON_DAY, ICON_NIGHT
 from dzgui.strings import calc
 from dzgui.views.components.icon import Icon
 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  # 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)
@@ -385,7 +385,7 @@ class TimePickerFrame(Gtk.Frame):
         h1 = BoldLabel(calc.heading_server_time)
         h2 = BoldLabel(calc.heading_target_time)
 
-        self.icon_indicator = Icon(DAY_ICON)
+        self.icon_indicator = Icon(ICON_DAY)
         self.update_server_icon()
 
         server_time_box = HBox(10)
@@ -411,7 +411,7 @@ class TimePickerFrame(Gtk.Frame):
         self.add(flowbox)
 
     def update_server_icon(self) -> None:
-        icon = DAY_ICON if self.server_time.is_day() else NIGHT_ICON
+        icon = ICON_DAY if self.server_time.is_day() else ICON_NIGHT
         self.icon_indicator.set_icon_name(icon)
 
     def _on_server_clock_increment(self, emitter: Emitter, time_now: datetime) -> None:

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

@@ -1,6 +1,5 @@
 from typing import Literal, Self, TYPE_CHECKING
 
-from dzgui.const.constants import NO_EXPAND, NO_FILL, NO_PADDING, EXPAND, FILL
 from dzgui.strings import dialogs
 from dzgui.util import strings
 from dzgui.views.components.buttons import ClipboardButton
@@ -8,7 +7,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
@@ -46,7 +45,7 @@ class GenericDialog(Gtk.MessageDialog):
 
     def pack(self, widget: Gtk.Widget) -> None:
         content = self.get_content_area()
-        content.pack_start(widget, EXPAND, FILL, NO_PADDING)
+        content.pack_start(widget, expand=True, fill=True, padding=0)
 
 
 class ConfirmationDialog(GenericDialog):
@@ -121,13 +120,13 @@ class WaitDialog(GenericDialog):
         spinner_box.add(spinner)
 
         if self.jobs > 1:
-            content.pack_start(self.prog, NO_EXPAND, NO_FILL, 0)
+            content.pack_start(self.prog, expand=False, fill=False, padding=0)
         else:
-            content.pack_start(spinner_box, NO_EXPAND, NO_FILL, 0)
+            content.pack_start(spinner_box, expand=False, fill=False, padding=0)
             spinner.start()
 
         if show_cancel is True:
-            content.pack_start(self.cancel, NO_EXPAND, NO_FILL, 0)
+            content.pack_start(self.cancel, expand=False, fill=False, padding=0)
 
     def update_text(self, msg: str) -> None:
         self.format_secondary_text(msg)
@@ -272,7 +271,7 @@ class ExceptionDialog(TextBufferDialog):
             bottom_margin=10,
         )
         textview.set_buffer(Gtk.TextBuffer(text=trace))
-        box.pack_start(textview, EXPAND, FILL, 0)
+        box.pack_start(textview, expand=True, fill=True, padding=0)
 
         self.error_details = Gtk.ScrolledWindow(
             overlay_scrolling=False,
@@ -296,7 +295,7 @@ class ExceptionDialog(TextBufferDialog):
         )
 
         details_textview.set_buffer(self.details_buffer)
-        details_box.pack_start(details_textview, EXPAND, FILL, 10)
+        details_box.pack_start(details_textview, expand=True, fill=True, padding=10)
         self.error_details.add(details_box)
 
         self.error_notebook = Gtk.Notebook(show_tabs=False, margin_bottom=15)

dzgui/views/dialogs/link_dialog.py

@@ -1,7 +1,6 @@
 import textwrap
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.constants import NO_EXPAND, NO_FILL
 from dzgui.util.strings import notice
 from dzgui.views.dialogs.generic import GenericDialog
 from dzgui.views.components.buttons import SteamTextButton
@@ -9,7 +8,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:
@@ -42,7 +41,7 @@ class WorkshopLinkDialog(GenericDialog):
             button.set_margin_start(60)
             button.set_margin_end(60)
             button.connect("clicked", self._on_button_clicked, uid)
-            self.dialogBox.pack_end(button, NO_EXPAND, NO_FILL, 0)
+            self.dialogBox.pack_end(button, expand=False, fill=False, padding=0)
 
         self.show_all()
         self.connect("response", self._on_dialog_response)

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/servers.py

@@ -2,7 +2,7 @@ import gi
 import html
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.constants import CALCULATOR
+from dzgui.const.icons import ICON_CALCULATOR
 from dzgui.const.enum import ContextMenuGroup
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import css
@@ -110,7 +110,7 @@ class ServerDetailsDialog(ServerDialog):
         text = format_hyperlinks(text)
         self.description.set_markup(html.escape(text))
 
-        calc_button = IconTextButton(CALCULATOR, dialogs.toggle_calc)
+        calc_button = IconTextButton(ICON_CALCULATOR, dialogs.toggle_calc)
         calc_button.connect("clicked", self._on_calc_pressed)
         calc_button.set_halign(Gtk.Align.END)
         calc_button.set_valign(Gtk.Align.START)

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

@@ -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

@@ -9,7 +9,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, Gdk
 
 logger = logging.getLogger(APP_NAME)
 

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/offline.py

@@ -3,14 +3,12 @@ from enum import Enum
 from typing import Self, TYPE_CHECKING, Union
 
 from dzgui.util import css
+from dzgui.const.icons import ICON_EDIT_DELETE, ICON_FOLDER, ICON_WARNING
 from dzgui.const.constants import (
     APPID_DAYZ,
     APPID_DAYZ_EXP,
     APPNAME_DAYZ,
     APPNAME_DAYZ_EXP_HUMAN,
-    EDIT_DELETE,
-    FOLDER,
-    WARNING,
 )
 from dzgui.const.enum import ContextMenuGroup, NotebookPage
 from dzgui.managers.offline import OfflineManager
@@ -87,7 +85,7 @@ class FolderHBox(HBox):
         self.emitter = controller.get_emitter()
 
         self.eb = InfoEventBox(eb_text, controller)
-        self.button = IconTextButton(FOLDER, btn_label, Gtk.PositionType.LEFT)
+        self.button = IconTextButton(ICON_FOLDER, btn_label, Gtk.PositionType.LEFT)
         self.button.set_halign(Gtk.Align.START)
         self.button.set_image_position(Gtk.PositionType.LEFT)
 
@@ -99,7 +97,7 @@ class FolderHBox(HBox):
         self.label = Gtk.Label()
         self.scrolled_label.add(self.label)
 
-        self.unset_button = IconTextButton(EDIT_DELETE, offline.unset_button)
+        self.unset_button = IconTextButton(ICON_EDIT_DELETE, offline.unset_button)
         self.unset_button.connect("clicked", self._on_unset_clicked)
 
         self.spinner = Gtk.Spinner()
@@ -195,7 +193,7 @@ class ModFrame(HeadingFrame):
         self.tree_vbox.extend([self.scrolled, self.status])
 
         self.no_mods = HBox(spacing=10)
-        no_mods_icon = Icon(WARNING, margin_start=10)
+        no_mods_icon = Icon(ICON_WARNING, margin_start=10)
         no_mods_label = Gtk.Label(label=offline.no_local_mods, halign=Gtk.Align.START)
         self.no_mods.extend([no_mods_icon, no_mods_label])
 

dzgui/views/pages/options.py

@@ -13,12 +13,8 @@ from dzgui.const.constants import (
     FLATPAK_RUN_CMD,
     FLATPAK_SANDBOX,
     FLATPAK_STEAM_PATH,
-    NO_EXPAND,
-    NO_FILL,
-    NO_PADDING,
-    VIEW_CONCEAL,
-    VIEW_REVEAL,
 )
+from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
 from dzgui.const.endpoints import STEAM_API_SETUP
 from dzgui.const.enum import Preferences, ServerTab
 from dzgui.strings import options
@@ -67,7 +63,7 @@ class SubmitField(Gtk.Box):
         # TODO: audit for all applicable callbacks
         if private:
             self.entry.set_icon_from_icon_name(
-                Gtk.EntryIconPosition.SECONDARY, VIEW_REVEAL
+                Gtk.EntryIconPosition.SECONDARY, ICON_VIEW_REVEAL
             )
             self.entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
             self.entry.connect("icon-release", self._on_icon_release)
@@ -131,9 +127,9 @@ class SubmitField(Gtk.Box):
     ) -> None:
         visible = widget.get_visibility()
         if visible:
-            icon, state = VIEW_REVEAL, False
+            icon, state = ICON_VIEW_REVEAL, False
         else:
-            icon, state = VIEW_CONCEAL, True
+            icon, state = ICON_VIEW_CONCEAL, True
         widget.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon)
         widget.set_visibility(state)
 
@@ -234,8 +230,8 @@ class ToggleField(Gtk.Box):
         self.radio1 = Gtk.RadioButton.new_with_label(None, first_option)
         self.radio2 = Gtk.RadioButton.new_from_widget(self.radio1)
         self.radio2.set_label(second_option)
-        self.pack_start(self.radio1, NO_EXPAND, NO_FILL, NO_PADDING)
-        self.pack_start(self.radio2, NO_EXPAND, NO_FILL, NO_PADDING)
+        self.pack_start(self.radio1, expand=False, fill=False, padding=0)
+        self.pack_start(self.radio2, expand=False, fill=False, padding=0)
 
     def set_suboption_active(self, state: bool) -> None:
         # NOTE: defer connection of signal until after state is set

dzgui/views/pages/preconnect.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from typing import Self, Sequence, TYPE_CHECKING
 
-from dzgui.const.constants import (
-    ERROR,
-    WARNING,
+from dzgui.const.icons import (
+    ICON_ERROR,
+    ICON_WARNING,
 )
 from dzgui.const.enum import NotebookPage
 from dzgui.util.css import add_class
@@ -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:
@@ -166,7 +166,7 @@ class PreConnectionAssistant(Gtk.Box):
 
         # TODO: abstract into components
         self.warning_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.warning_tree = MaskedTree(WARNING)
+        self.warning_tree = MaskedTree(ICON_WARNING)
         self.warning_placeholder = Placeholder(preconnect.placeholder_no_warnings)
         self.warning_box.add(self.warning_tree)
         self.warning_box.add(self.warning_placeholder)
@@ -175,7 +175,7 @@ class PreConnectionAssistant(Gtk.Box):
         )
 
         self.error_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.error_tree = MaskedTree(ERROR)
+        self.error_tree = MaskedTree(ICON_ERROR)
         self.error_placeholder = Placeholder(preconnect.no_errors)
         self.error_box.add(self.error_tree)
         self.error_box.add(self.error_placeholder)

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