dzgui/api/steam.py

@@ -71,21 +71,21 @@ def get_local_signatures(version_file: Path) -> dict[str, int]:
     for line in lines:
         data = line.split(",")
         _id = data[0]
-        mod_hash = int(data[1])
-        hashes[_id] = mod_hash
+        _hash = int(data[1])
+        hashes[_id] = _hash
     return hashes
 
 
 def get_needs_update(
     version_file: Path, remote_hashes: list[tuple[str, str, int, int]]
 ) -> list[tuple[str, str, int, int]]:
-    local_stamps = get_local_signatures(version_file)
+    local_hashes = get_local_signatures(version_file)
     needs_update: list[tuple[str, str, int, int]] = []
-    for title, _id, stamp, size in remote_hashes:
-        if _id not in local_stamps:
-            needs_update.append((title, _id, stamp, size))
-        elif stamp != local_stamps[_id]:
-            needs_update.append((title, _id, stamp, size))
+    for title, _id, mod_hash, size in remote_hashes:
+        if _id not in local_hashes:
+            needs_update.append((title, _id, mod_hash, size))
+        elif _hash != local_hashes[_id]:
+            needs_update.append((title, _id, mod_hash, size))
         else:
             continue
     return needs_update
@@ -252,7 +252,6 @@ def subscribe(key: str, mod: int) -> None:
 def unsubscribe(key: str, mod: int) -> None:
     update_workshop(key, mod, UNSUB_ENDPOINT)
 
-
 def gen_shortcut() -> None:
     # TODO:
     """
@@ -266,7 +265,6 @@ def gen_shortcut() -> None:
     # STEAMID_64 & 0xFFFFFFFF
     pass
 
-
 @deprecated("Use subscribe()")
 def enqueue_mod(client: str, mod: str, appid: int) -> None:
     client_args = concat_bash_args(client)

dzgui/controllers/mc.py

@@ -523,11 +523,11 @@ class Controller(GObject.GObject):
         ind = self.config_man.get_start_tab()
         self.get_servers().notebook.set_current_page(ind)
 
-    def update_and_load_to_menu(self) -> None:
-        self.connection_man.update_and_connect(menu_only=True)
+    def update_and_load_to_menu(self, raise_window: bool) -> None:
+        self.connection_man.update_and_connect(raise_window, menu_only=True)
 
-    def update_and_connect(self) -> None:
-        self.connection_man.update_and_connect()
+    def update_and_connect(self, raise_window: bool) -> None:
+        self.connection_man.update_and_connect(raise_window)
 
     def update_status(self) -> None:
         self.mediator.preconnect.mark_finished()

dzgui/managers/connection.py

@@ -294,7 +294,7 @@ class ConnectionManager:
         self.controller.add_to_history(self.history, self.record)
         self.controller.open_page(NotebookPage.SERVERS)
 
-    def _update_mods(self, menu_only: bool = False) -> None:
+    def _update_mods(self, raise_window: bool, menu_only: bool = False) -> None:
         prefs = self.controller.get_prefs()
         config_man = self.controller.get_config_man()
         key = config_man.lookup(Preferences.STEAM)
@@ -305,6 +305,10 @@ class ConnectionManager:
             subscribe(key, int(mod))
             time.sleep(RATE_LIMIT_THRESHOLD)
 
+        if raise_window is True:
+            logger.info("Bringing window to foreground")
+            GLib.idle_add(self.controller.present_window)
+
         for title, mod, stamp, size in self.missing_mods:
             mod_path = self.workshop / mod
 
@@ -327,8 +331,8 @@ class ConnectionManager:
         self._connect_steam(menu_only)
 
     @call_on_thread(waiting_for_mods, show_cancel=True)
-    def update_and_connect(self, menu_only: bool = False) -> None:
+    def update_and_connect(self, raise_window: bool, menu_only: bool = False) -> None:
         if len(self.missing_mods) > 0:
-            self._update_mods(menu_only)
+            self._update_mods(raise_window, menu_only)
         else:
             self._connect_steam(menu_only)

dzgui/views/components/box.py

@@ -1,25 +0,0 @@
-from typing import Sequence
-
-import gi
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk  # noqa
-
-
-class GenericBox(Gtk.Box):
-    def __init__(self, orientation: Gtk.Orientation, spacing: int = 0) -> None:
-        super().__init__(orientation=orientation, spacing=spacing)
-
-    def extend(self, els: Sequence[Gtk.Widget]) -> None:
-        for el in els:
-            self.add(el)
-
-
-class HBox(GenericBox):
-    def __init__(self, spacing: int = 0) -> None:
-        super().__init__(orientation=Gtk.Orientation.HORIZONTAL, spacing=spacing)
-
-
-class VBox(GenericBox):
-    def __init__(self, spacing: int = 0) -> None:
-        super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=spacing)

dzgui/views/components/buttons.py

@@ -208,8 +208,6 @@ class SteamWorkshopButton(SteamTextButton):
     def __init__(self) -> None:
         super().__init__(label=buttons.workshop)
         self.set_tooltip_text(buttons.workshop_tooltip)
-        self.set_margin_top(10)
-        self.set_margin_bottom(10)
 
 
 class AddButton(IconTextButton):

dzgui/views/pages/mods.py

@@ -3,7 +3,6 @@ from pathlib import Path
 from typing import Self, TYPE_CHECKING
 from dzgui.api.steam import find_user_id
 from dzgui.const.enum import NotebookPage, Preferences
-from dzgui.views.components.box import HBox
 from dzgui.views.components.buttons import SteamWorkshopButton
 from dzgui.views.components.scrollable import NoOverlayScrolledWindow
 from dzgui.views.trees.tree_mods import ModTreeView
@@ -37,8 +36,10 @@ class Mods(Gtk.Box):
         uid = find_user_id(steam_path)
 
         pretty_uid = "" if uid is None else uid
-        hbox = HBox(spacing=10)
+        hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=10)
         workshop_button = SteamWorkshopButton()
+        workshop_button.set_margin_top(10)
+        workshop_button.set_margin_bottom(10)
         workshop_button.connect(
             "clicked", lambda _: self.controller.open_user_workshop(pretty_uid)
         )

dzgui/views/pages/offline.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from enum import Enum
-from typing import Self, TYPE_CHECKING, Union
+from typing import Self, Sequence, TYPE_CHECKING, Union
 
 from dzgui.util import css
 from dzgui.const.constants import (
@@ -16,7 +16,6 @@ from dzgui.const.constants import (
 from dzgui.const.enum import ContextMenuGroup, NotebookPage
 from dzgui.managers.offline import OfflineManager
 from dzgui.strings import generic, offline
-from dzgui.views.components.box import HBox, VBox
 from dzgui.views.components.buttons import Icon, IconTextButton
 from dzgui.views.components.eventbox import InfoEventBox
 from dzgui.views.components.frame import HeadingFrame
@@ -40,6 +39,25 @@ class FolderError(Enum):
     NO_VALID_MISSION = 2
 
 
+class GenericBox(Gtk.Box):
+    def __init__(self, orientation: Gtk.Orientation, spacing: int = 0) -> None:
+        super().__init__(orientation=orientation, spacing=spacing)
+
+    def extend(self, els: Sequence[Gtk.Widget]) -> None:
+        for el in els:
+            self.add(el)
+
+
+class HBox(GenericBox):
+    def __init__(self, spacing: int = 0) -> None:
+        super().__init__(orientation=Gtk.Orientation.HORIZONTAL, spacing=spacing)
+
+
+class VBox(GenericBox):
+    def __init__(self, spacing: int = 0) -> None:
+        super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=spacing)
+
+
 class PageHeading(Gtk.Label):
     def __init__(self, label: str) -> None:
         super().__init__(label=label, halign=Gtk.Align.CENTER)

dzgui/views/pages/preconnect.py

@@ -112,6 +112,18 @@ class PreConnectionAssistant(Gtk.Box):
             tooltip_text=preconnect.connect_last_tooltip,
         )
 
+        # TODO: abstract
+        self.raise_window = Gtk.CheckButton(
+            label="Foreground DZGUI while downloading",
+            halign=Gtk.Align.END,
+            hexpand=True,
+            valign=Gtk.Align.END,
+            visible=False,
+            has_tooltip=True,
+            sensitive=False,
+            tooltip_text="Foreground the DZGUI window after mod downloads are queued",
+            active=True,
+        )
         self.button_box = Gtk.Box(
             orientation=Gtk.Orientation.VERTICAL,
             valign=Gtk.Align.END,
@@ -121,7 +133,8 @@ class PreConnectionAssistant(Gtk.Box):
         box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
         for button in self.back, self.ok, self.connect_last:
             box.add(button)
-        self.button_box.add(box)
+        for el in self.raise_window, box:
+            self.button_box.add(el)
 
         self.back.connect("clicked", self._on_back_clicked)
         self.ok.connect("clicked", self._on_ok_clicked)
@@ -204,6 +217,8 @@ class PreConnectionAssistant(Gtk.Box):
         for child in widgets:
             child.set_visible(True)
 
+        self.raise_window.set_visible(False)
+        self.raise_window.set_sensitive(False)
         self.ok.set_sensitive(True)
         self.ok.set_label(preconnect.update_mods)
 
@@ -215,10 +230,10 @@ class PreConnectionAssistant(Gtk.Box):
                 self.ok.emit("clicked")
 
     def _on_connect_last_clicked(self, button: Gtk.Button) -> None:
-        self.controller.update_and_load_to_menu()
+        self.controller.update_and_load_to_menu(self.raise_window.get_active())
 
     def _on_ok_clicked(self, button: Gtk.Button) -> None:
-        self.controller.update_and_connect()
+        self.controller.update_and_connect(self.raise_window.get_active())
 
     def _on_back_clicked(self, button: Gtk.Button) -> None:
         self.controller.open_page(NotebookPage.SERVERS)
@@ -302,6 +317,10 @@ class PreConnectionAssistant(Gtk.Box):
 
         if prereqs.required_space == 0:
             self.ok.set_label(preconnect.connect)
+            self.raise_window.set_visible(False)
+        else:
+            self.raise_window.set_visible(True)
+            self.raise_window.set_sensitive(True)
 
             pretty = number(prereqs.required_space)
             suffix = f" Need to download {pretty} MiB of mod updates."