Merge 07cbf7a36a into 04e9e5dcf0

CHANGELOG.md

@@ -52,11 +52,6 @@
 - Filter button tooltips
 - Expand/collapse changelog versions
 - Support local light/dark mode changes on system theme
-- Server time calculator
-- Add "Unmodded" filter to servers
-- List timestamp of last DayZ client update
-- Validate mods via Mod page to pull in updates
-- Support for Nasdara (Badlands) DLC
 
 ### Changed
 - Conform to PEP 440 versioning for beta versions
@@ -78,7 +73,6 @@
 - Enable LAN page Empty/Full filters on first run of app
 - Propagate subscribed mods to Steam client
 - Make j/k keys in context menus follow same wraparound logic as down arrow/up arrow
-- Use SQLite DB for geolocation records
 
 ### Dropped
 - Battlemetrics API support
@@ -96,9 +90,6 @@
 - Rare segfaults when changing maps (threading)
 - Moved dialogs out of threads
 - History table not being in lock-step with state file
-- Current keyword filter not being applied when refreshing table
-- Steam Flatpak cannot run DZGUI as a non-Steam game
-- Collisions between native Steam and Steam Flatpak clients
 
 ### Unreleased
 - Load offline mods

HISTORY.md

@@ -1,124 +0,0 @@
-# History of the project
-This file collects notable milestones and events related to DZGUI, mainly around DZGUI as a framework and the history of development.
-A chronological summary of features can be found in CHANGELOG.md.
-
-## 2021
-### 2021-12-03: DayZ adds support for Battleye over Proton
-DayZ was among a handful of games with whitelisted anti-cheat support under Valve's emerging WINE-based Proton compatibility layer.
-While adding anti-cheat compatibility at a technical level, this change did not actually allow the client to connect to servers running complex modlists.
-
-Development of the precursor to DZGUI began at around this time.
-
-### 2021-12-12: initial version of DZTUI is created
-DZTUI, a Bash script and terminal user interface, was the precursor to DZGUI.
-This was an initial attempt at bootstrapping the Steam client to handle mods correctly when launching DayZ.
-Due to user interest, features continued to be added. This early tool is archived under the 'dztui' branch.
-
-## 2022
-### 2022-05-09: addition of zenity GUI and project name change (DZGUI)
-With the introduction of the Steam Deck, more users wanted a graphical user interface
-to interact with DZTUI. Being that DZTUI was purely a Bash script, a method of
-drawing menus was needed, so the "zenity" package was used to create prefabricated dialogs.
-While this met the minimum requirement to show prompts and selectable options, no rich customization was possible.
-
-The introduction of zenity as a dependency marked the shift from "DZTUI" to "DZGUI".
-
-Throughout 2022, the limits of zenity for DZGUI's purposes were tested, particularly in the context of SteamOS.
-This led to the discovery of a number of bugs in zenity, GTK, and SteamOS, which were reported up to their respective channels.
-While this was improving the SteamOS user experience, it started to become clear that a fully custom UI was needed.
-
-This barebones version of DZGUI sufficed for some time, with the Bash script and some standalone Python modules doing the heavy lifting,
-and this period served to surface a number of bugs and interesting interactions with the Steam client.
-
-## 2023
-### 2023-11-23: Python 3.10 dependency
-Prior to this time, DZGUI open-endedly allowed you to use any Python version for its modules, without any significant handling for
-the idiosyncrasies of different versions. A minimum requirement of Python 3.10 was thus instituted to normalize expected behavior.
-
-Throughout 2023, various features related to server browsing were added, such as filters and more granular search parameters.
-
-There were still a lot of unknowns at this time, so things were being resolved through trial and error.
-
-## 2024
-### 2024-01-31: DZGUI 5 API introduces GTK UI
-Using zenity as a simple GUI had exposed some bugs and limitations in that package, particularly when trying to push huge lists of server records
-into tables and sorting them in a performant manner.
-
-Around this time it became clear that a more robust UI framework was needed. While keeping the original Bash script and Python modules for
-background processing, PyGObject (GTK) was added to the project in order to ship a custom UI that could be designed from the ground up.
-
-However, it should be noted that at this point, the DZGUI logic itself was still a (increasingly large) Bash script to which a GTK UI had been stitched on.
-These were totally separate components, with UI actions on the GTK side triggering calls to Bash functions in an overly complex helper file.
-The UI was basically a thin client around the old Bash logic, but this was still a far cry from an integrated application with proper signals and dedicated components.
-
-Effectively, DZGUI 5 through 6 were a stepping stone that set the groundwork to go from DZGUI 4 (pure Bash script) to
-DZGUI 7 (standalone Python application). Today, little of DZGUI 5's original logic remains outside of the basic UI grid.
-
-### 2024-10-15: Frostline DLC released, widespread parsing problems
-DayZ's first DLC introduced a new format for server responses that packed extra metadata into the A2S_RULES format.
-Upon its release, all third-party DayZ launchers and server listing web sites were unable to parse the mod information being returned from Frostline servers.
-
-For a period of two weeks, this remained unsolved and various attempts were made to understand the updated specification.
-
-### 2024-10-30: DZGUI hotfix adds support for Frostline servers
-DZGUI was the first third-party tool to fix parsing for Frostline servers and restore functionality.
-This was a small milestone, because it meant DZGUI was evolving from a "dumb" launcher to a featureful tool
-touching upon and improving all aspects of the end-to-end DayZ experience.
-
-Particularly around this time, the sheer diversity of needs of modders, server operators, and players started to become clear.
-Users had highly specific and diverse use cases for setting up their game environment, and requested a number of features to support that on
-the DZGUI side.
-
-## 2025
-### 2025-01-17: DZGUI 6 API
-With DZGUI 6, the difficult decision to enforce a Python 3.13 dependency was made.
-While the previous dependency was Python 3.10+, it was deemed better to develop against and target identical versions.
-
-However, due to the vagaries of managing Python environments on end-user systems, this change added unnecessary complexity and frustration.
-Users had to properly set up virtual environments, install the relevant dependencies, and create a wrapper script to run this version, whereas
-previous versions had essentially been point and click.
-
-### 2025-10-23: DZGUI 7 API and the "Ship of Theseus"
-It had become clear that the situation above was untenable and the legacy Bash script was unmaintainable given the project's enlarged scope.
-The lack of a robust testing or typehinting framework made it difficult to diagnose rare bugs.
-
-Shipping a standalone, turnkey application with zero or minimal dependencies was the most urgent priority.
-DZGUI was still carrying around small bits and pieces of the old Bash script logic, so the decision was made to
-refactor the application into a pure Python + GTK tool. This would effectively be a total rewrite of all logic,
-only preserving the most minimal skeleton of the original UI layout as a reference.
-
-Over the course of a year, a wholesale "Ship of Theseus" rewrite took place.
-Nearly every component of DZGUI 6, both API and UI side, was taken apart and replaced.
-
-A soft alpha and beta phase were used to iterate on this concept further. DZGUI 7 was increasingly recommended to users
-as the preferred choice. This allowed for keeping the established userbase on the (relatively) stable DZGUI 6 spec, while building up
-the new spec and making it available to more users as features were elaborated.
-
-Through late 2025, several LLM-generated applications that recycled significant parts of DZGUI's code without the applicable GPL license were found.
-The maintainers of those projects were advised to excise the offending segments or apply the necessary GPL licenses.
-
-## 2026
-### 2026-05-17: Switch to standalone releases
-The DZGUI 7 beta starts shipping standalone glibc builds with an integrated setup wizard and installer.
-
-DZGUI 6 had relied on "over the air" updates delivered via either a "stable" or "testing" branch
-(archived respectively under the "dzgui" and "testing" branches). Effectively, the script would bootstrap itself and
-fetch raw files directly from the repository. This was prone to problems because updates were monolithic, not giving
-an easy escape hatch if the user needed to rollback in the event of a regression.
-
-This was changed to atomic, tagged releases. In addition to updating directly through DZGUI, these prebuilt releases can be
-downloaded manually as needed, and rollbacks are available for all prior versions under the DZGUI 7 specification.
-
-### 2026-10-27: 500 tickets closed
-The milestone of 500 tickets/PRs being closed was reached.
-
-2026 was by far DZGUI's most intensive year by commits, perhaps suggesting the scope of the rewrite:
-
-- 2021: 16
-- 2022: 434
-- 2023: 322
-- 2024: 347
-- 2025: 426
-- 2026: 1300
-
-DZGUI 7 is scheduled to release as a stable version within the year.

README.md

@@ -1,23 +1,15 @@
 ## What this is
-DZGUI is a turnkey server browser and mod manager for DayZ on Linux. It allows you to connect to both official and modded/community DayZ servers on Linux via a graphical user interface (GUI).
+DZGUI is a turnkey browser and mod manager for DayZ on Linux. It allows you to connect to both official and modded/community DayZ servers on Linux via a graphical user interface (GUI).
 
 This overcomes certain limitations in the Linux client and helps prepare the game to launch by providing features like:
 
 - Search for and display global and LAN servers via an interactive table
 - Supports official, third-party, and modded DayZ servers
 - Automatically find and prepare mods being requested by servers
+- Add/delete/manage favorite servers by IP or ID
 - Quick-connect to favorite/recent servers
-- Manage and delete local mods
+- Manage local mods and symlinks
-- And more
+- Prepare launch options to pass to Steam
-
-## Design philosophy
-
-DZGUI follows a specific set of guidelines, enumerated below:
-
-- Provide a free and open-source tool under GPL
-- Do not use undocumented, third-party servers to aggregate data; no central "DZGUI" server
-- All connections go to Steam and DayZ servers directly; the tool should function in perpetuity without intermediary endpoints
-- Target Linux desktop and Steam Deck specifically; not a cross-platform tool
 
 ## Setup and usage
 
@@ -26,7 +18,7 @@ Please refer to the documentation for installation and setup instructions:
 - [GitHub](https://aclist.github.io/dzgui/index.html)
 - [Codeberg (Mirror)](https://aclist.codeberg.page)
 
-![A screenshot of DZGUI](/dzgui/data/images/example.png)
+![A screenshot of DZGUI](/images/example.png)
 
 ## Attribution
 
@@ -35,10 +27,6 @@ Geolocation records from [DB-IP](https://db-ip.com) under [CC 4.0 license](https
 Executable versions of DZGUI published as release binaries ship with various runtime dependencies and the Python interpreter built in.
 Users wishing to review the licenses to these components can inspect the `LICENSE` file located in the release tarball.
 
-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/api/acf.py

@@ -1,18 +1,15 @@
 import logging
 import re
 
-from datetime import datetime
+from collections.abc import Iterator
 from pathlib import Path
-from typing import Any, TYPE_CHECKING
+from typing import Any
 from warnings import deprecated
 
 from dzgui.const.constants import APP_NAME
 
 logger = logging.getLogger(APP_NAME)
 
-if TYPE_CHECKING:
-    from collections.abc import Iterator
-
 
 class ACF:
     def __init__(self, file: Path) -> None:
@@ -45,7 +42,7 @@ class ACF:
     def dequote(cls, s: str) -> str:
         return s.rstrip('"').lstrip('"')
 
-    def parse(self, lines: "Iterator[list[str]]") -> dict[str, str]:
+    def parse(self, lines: Iterator[list[str]]) -> dict[str, str]:
         acf: dict[str, Any] = {}
         try:
             while True:
@@ -72,28 +69,6 @@ class ACF:
         except StopIteration:
             return acf
 
-    def search_key(self, key: str) -> str:
-        return str(self.dict["AppState"][key])
-
-    def date_to_str(self, epoch: int) -> str | None:
-        if epoch == 0:
-            return None
-        return datetime.fromtimestamp(epoch).isoformat(" ")
-
-    def get_date_by_key(self, key: str) -> str | None:
-        try:
-            stamp = int(self.search_key(key))
-            return self.date_to_str(stamp)
-        except Exception as e:
-            logger.critical(e)
-            return None
-
-    def get_last_updated(self) -> str | None:
-        return self.get_date_by_key("LastUpdated")
-
-    def get_last_played(self) -> str | None:
-        return self.get_date_by_key("LastPlayed")
-
     def get_allows_downloads(self) -> int | None:
         try:
             # TODO: consider coercing strs to ints on initial import
@@ -111,8 +86,7 @@ class WorkshopACF(ACF):
     def __init__(self, file: Path) -> None:
         super().__init__(file)
 
-    def unpack(self, d: dict[str, Any], lines: list[Any] = []) -> str:
+    def unpack(self, d: dict, lines: list[Any] = []) -> str:
-        self.indent: int
         t1 = "AppWorkshop"
         t2 = ("WorkshopItemsInstalled", "WorkshopItemDetails")
         for k, v in d.items():

dzgui/api/mods.py

@@ -24,6 +24,14 @@ from typing import Any
 logger = logging.getLogger(APP_NAME)
 
 
+@dataclass
+class ModMeta:
+    protocol: str
+    published_id: str
+    name: str
+    timestamp: str
+
+
 def get_local_mod_ids(steam_path: Path) -> list[int]:
     workshop_path = get_local_mod_path(steam_path)
     mods = get_local_mods(workshop_path)
@@ -106,6 +114,10 @@ def get_delimited_mods(steam_path: Path) -> list[Any]:
     return parse_mods(mods)
 
 
+def get_missing_mods(local: list, remote: list) -> list:
+    return [mod for mod in remote if mod not in local]
+
+
 def _hash(uid: str, use_custom: bool = False) -> str:
     md5 = hashlib.md5()
     md5.update(uid.encode("ascii"))
@@ -140,7 +152,7 @@ def remove_stale_signatures(
 
 
 def find_stale_mods(config: Path) -> list[int]:
-    def push_record(rec: str) -> list[int]:
+    def push_record(rec: str) -> list:
         record = fqip_to_record(rec)
         if record is None:
             return []

dzgui/api/pefile.py

@@ -255,28 +255,16 @@ class PeFileError(Exception):
 
     pass
 
-
 def parse_version_number(data: BinaryIO) -> FileVersion:
     # https://learn.microsoft.com/en-us/windows/win32/api/verrsrc/ns-verrsrc-vs_fixedfileinfo
-    """
+    minor = struct.unpack("<L", data.read(4))[0] >> 16 & 0xFFFF
-    Note: structure differs from standard VS_FIXEDFILEINFO
+    major = struct.unpack("<L", data.read(4))[0] >> 0 & 0xFFFF
-    Major: lower 16 bits of first DWORD
+    build = struct.unpack("<L", data.read(4))[0] >> 0 & 0xFFFF
-    Minor: upper 16 bits of first DWORD
+    # NOTE: 0-pad revision number
-    Build: lower 16 bits of third DWORD
+    revision = str(struct.unpack("<L", data.read(4))[0] >> 16 & 0xFFFF)
-    Revision: upper 16 bits of second DWORD, zero-padded
+    offset = 3 - len(revision)
-    Lower 16 bits of revision DWORD appear unused.
+    padded = "0" * offset + revision
-    """
+    return FileVersion(major, minor, build, padded)
-    major_minor = struct.unpack("<I", data.read(4))[0]
-    revision_pair = struct.unpack("<I", data.read(4))[0]
-    build_dword = struct.unpack("<I", data.read(4))[0]
-
-    major = major_minor & 0xFFFF
-    minor = (major_minor >> 16) & 0xFFFF
-    build = build_dword & 0xFFFF
-    revision = (revision_pair >> 16) & 0xFFFF
-    revision = f"{revision:03d}"
-
-    return FileVersion(major, minor, build, revision)
 
 
 def seek_to_hex(address: str, data: BinaryIO) -> None:

dzgui/api/servers.py

@@ -54,16 +54,19 @@ class Res:
 
 @dataclass(slots=True, frozen=True)
 class Details:
-    data: list[list[str]]
+    data: Union[list, None]
-    name: str
     description: str
-    gametime: str
+    success: bool
-    day_accel: float
-    night_accel: float
 
 
-@dataclass(slots=True, frozen=True)
+@dataclass(slots=True)
 class Record:
+    # TODO: investigate whether this enum is still being used;
+    # can this be frozen?
+    """
+    The gameport field is manipulated by the RowType.CONN_BY_IP method
+    """
+
     ip: str
     gameport: int
     qport: int
@@ -111,7 +114,7 @@ def get_netmask() -> str:
 
 
 # TODO: rename
-def test_ip(suffix: int, port: int, event: threading.Event) -> dict[str, Any] | None:
+def test_ip(suffix: int, port: int, event: threading.Event) -> dict | None:
     if event.is_set():
         return None
     netmask = get_netmask()
@@ -139,9 +142,7 @@ def sanitize(name: str) -> str:
     return name
 
 
-def parse_json(
+def parse_json(json: list) -> list:
-    json: list[dict[str, Any]],
-) -> list[tuple[str, str, str, str, int, int, int, str, int, int, str, bool]]:
     """
     Server metadata is underspecified and server operators
     tend to insert random garbage in the headers. In case
@@ -282,41 +283,43 @@ def query_direct(ip: str, qport: int, timeout: float = 3.0) -> dict[str, Any] |
         info = a2s.info((ip, qport), timeout)
         return source_info_to_dict(ip, qport, info)
     except Exception as e:
-        logger.debug(e)
+        logger.warning(e)
         return None
 
 
-def get_details(record: Record) -> Details | None:
+def get_details(record: Record) -> Details:
+    # TODO: consolidate try/except statements
     ip = record.ip
     qport = record.qport
     default_str = strings.none_provided
 
     try:
         info = a2s.info((ip, qport))
+    except (TimeoutError, a2s.exceptions.BrokenMessageError):
+        return Details(None, default_str, False)
+    try:
         rules = dayzquery.dayz_rules((ip, qport))
+    except Exception:
+        return Details(None, default_str, False)
+
+    try:
         keywords = info.keywords.split(",")
-    except Exception as e:
+    except AttributeError:
-        logger.critical(e)
+        return Details(None, default_str, False)
-        return None
 
     battleye = strings.disabled
     if "battleye" in keywords:
         battleye = strings.enabled
 
-    name = info.server_name
+    day_accel = 0.0
-    day_accel = 1.0
+    night_accel = 0.0
-    night_accel = 1.0
-    gametime = "00:00"
     for keyword in keywords:
         if "etm" in keyword:
             day_accel = float(keyword.lstrip("etm"))
             day_accel = float(f"{day_accel:g}")
-        if "entm" in keyword:
+        if "entm" in keywords:
             night_accel = float(keyword.lstrip("entm"))
             night_accel = float(f"{night_accel:g}")
-        time_reg = r"^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9]$)"
-        if re.match(time_reg, keyword):
-            gametime = keyword
 
     try:
         password = info.password_protected
@@ -343,15 +346,10 @@ def get_details(record: Record) -> Details | None:
 
     try:
         dlc = rules.dlc_flags
-        match dlc:
+        if dlc == 0:
-            case 0:
+            dlc = strings.none
-                dlc = strings.dlc_none
+        if dlc == 2:
-            case 2:
+            dlc = strings.dlc_frostline
-                dlc = strings.dlc_frostline
-            case 4:
-                dlc = strings.dlc_badlands
-            case _:
-                dlc = strings.unspecified
     except AttributeError:
         dlc = strings.unspecified
 
@@ -382,7 +380,7 @@ def get_details(record: Record) -> Details | None:
         ["Version", version],
     ]
 
-    return Details(rows, name, description, gametime, day_accel, night_accel)
+    return Details(rows, description, True)
 
 
 def ping(ip: str, qport: int) -> int:
@@ -509,14 +507,14 @@ def record_to_fqip(record: Record) -> str:
     return f"{record.ip}:{record.gameport}:{record.qport}"
 
 
-def response_to_fqip(res: dict[str, Any]) -> str:
+def response_to_fqip(res: dict) -> str:
     ip = res["addr"].split(":")[0]
     gameport = res["gameport"]
     qport = res["addr"].split(":")[1]
     return f"{ip}:{gameport}:{qport}"
 
 
-def response_to_record(res: dict[str, Any]) -> Record:
+def response_to_record(res: dict) -> Record:
     ip = res["addr"].split(":")[0]
     gameport = res["gameport"]
     qport = res["addr"].split(":")[1]

dzgui/api/shortcuts.py

@@ -11,7 +11,7 @@ from typing import Any
 
 from dzgui.api.steam import find_user_id_32
 from dzgui.const.constants import APP_NAME, APP_NAME_LOWER, IMAGES_PATH
-from dzgui.util.dirs import copy_dzgui_to_xdg_data, make_parents
+from dzgui.util.dirs import copy_dzgui_to_xdg_data
 from dzgui.util.strings import unknown
 
 logger = logging.getLogger(APP_NAME)
@@ -75,8 +75,6 @@ class Shortcuts:
                 shortcuts = vdf.binary_load(f)
             self.shortcuts = shortcuts
             logger.debug("Loaded shortcuts file")
-        except FileNotFoundError:
-            self.shortcuts = {"shortcuts": {}}
         except Exception as e:
             logger.critical(e)
             raise e
@@ -111,7 +109,6 @@ class Shortcuts:
         for img in ("_hero", "p", "_logo"):
             filename = str(self.bpid) + img
             dest = grid_path.joinpath(filename).with_suffix(".png")
-            make_parents(dest)
             b = images.joinpath(img).with_suffix(".png").read_bytes()
             dest.write_bytes(b)
 
@@ -159,7 +156,6 @@ class Shortcuts:
         NEW_ENTRY["DevkitOverrideAppID"] = 0
         NEW_ENTRY["LastPlayTime"] = 0
         NEW_ENTRY["FlatpakAppID"] = ""
-
         NEW_ENTRY["sortas"] = ""
         NEW_ENTRY["tags"] = {}
         return NEW_ENTRY
@@ -173,13 +169,9 @@ class Shortcuts:
         self.save_shortcuts()
 
     def save_shortcuts(self) -> None:
-        if self.shortcuts_path.is_file():
-            try:
-                backup = self.shortcuts_path.with_suffix(".vdf.bak")
-                shutil.copy(self.shortcuts_path, backup)
-            except Exception as e:
-                logger.critical(e)
         try:
+            backup = self.shortcuts_path.with_suffix(".vdf.bak")
+            shutil.copy(self.shortcuts_path, backup)
             with open(self.shortcuts_path, "wb") as f:
                 vdf.binary_dump(self.shortcuts, f)
         except Exception as e:

dzgui/api/steam.py

@@ -1,20 +1,16 @@
 import logging
 import os
 import psutil
-import re
 import requests
 import subprocess
 import vdf  # type: ignore
 
 from pathlib import Path
-from requests.exceptions import HTTPError
+from typing import Any, Union
-from typing import Any, Generator, Union
 from warnings import deprecated
 
 from dzgui.api.acf import ACF
-from dzgui.const.endpoints import VALIDATE
+from dzgui.init.prereqs import has_steam_client
-from dzgui.init.prereqs import has_any_client
-from dzgui.init.prereqs import has_flatpak_client, has_steam_client
 from dzgui.const.constants import (
     APPID_DAYZ,
     APPID_DAYZ_EXP,
@@ -23,21 +19,19 @@ from dzgui.const.constants import (
     DAYZ_LAUNCHER,
     DEBIAN_STEAM_PATH,
     DEFAULT_STEAM_PATH,
-    DOWNLOADS_PATH,
     FLATPAK_STEAM_PATH,
     LIBRARYFOLDERS_PATH,
-    REQUEST_TIMEOUT,
     UBUNTU_STEAM_PATH,
+    REQUEST_TIMEOUT,
     VDF_PATH,
 )
 from dzgui.const.endpoints import (
-    STEAM_APP_DETAILS,
+    APP_DETAILS,
+    SUB_ENDPOINT,
     STEAM_PUBLISHED_FILES,
-    STEAM_SUB,
+    UNSUB_ENDPOINT,
-    STEAM_UNSUB,
 )
 from dzgui.strings import wizard
-from dzgui.strings.errors import api_validation_error, workshop_endpoint_error
 from dzgui.util.bash import concat_bash_args
 
 logger = logging.getLogger(APP_NAME)
@@ -63,7 +57,7 @@ class VDFLoadError(Exception):
 
 def get_steam_paths() -> list[tuple[Path, str]]:
     paths = []
-    if has_any_client():
+    if has_steam_client():
         HOME = Path.home()
         env = os.environ.get("XDG_DATA_HOME")
         if env is not None:
@@ -84,10 +78,6 @@ def get_steam_paths() -> list[tuple[Path, str]]:
         }
 
         for path in DEFAULT_PATH, FLATPAK_PATH, UBUNTU_PATH, DEBIAN_PATH:
-            if path is FLATPAK_PATH and has_flatpak_client() is False:
-                continue
-            if path is not FLATPAK_PATH and has_steam_client() is False:
-                continue
             if path.joinpath(VDF_PATH).is_file():
                 paths.append((path, human[path]))
     return paths
@@ -161,9 +151,7 @@ def get_remote_signatures(mods: list[str]) -> list[tuple[str, str, int, int]]:
     return hashes
 
 
-def connect_debug(
+def connect_debug(client: str, addr: str, appid: int, name: str, mods: list[str]) -> str:
-    client: str, addr: str, appid: int, name: str, mods: list[str]
-) -> str:
     concat = concat_mods(mods)
     client_args = concat_bash_args(client)
     params = [
@@ -179,7 +167,6 @@ def connect_debug(
     client_args.extend(params)
     return " ".join(client_args)
 
-
 # TODO: set config to name=user, use official server and no mods,
 # ensure that formatted string is identical to fixture with same hash
 def connect(client: str, addr: str, appid: int, name: str, mods: list[str]) -> int:
@@ -204,7 +191,6 @@ def load_to_menu(client: str, appid: int, name: str, mods: list[str]) -> int:
     """Loads to the menu screen with the selected mods; used for AFK/pre-joining"""
     concat = concat_mods(mods)
     client_args = concat_bash_args(client)
-    logger.debug(f"Setting client arguments to: {client_args}")
     params = [
         "-applaunch",
         str(appid),
@@ -249,18 +235,14 @@ def find_user_id(path: Path) -> str | None:
     try:
         with open(resolved_path, "r") as f:
             v = vdf.load(f)
-            users = v["users"]
+            # NOTE: beta client
-            # NOTE: beta client: /package/beta
+            # /package/beta
-            last_user = str(next(iter(users)))
+            if len(v["users"]) == 1:
-            if len(users) == 1:
+                return str(list(v["users"].keys())[0])
-                return last_user
+            for user in v["users"]:
-            last_stamp = int(users[last_user]["timestamp"])
+                if v["users"][user]["MostRecent"] == "1":
-            for user in users:
+                    return str(user)
-                stamp = int(users[user]["timestamp"])
+            return None
-                if stamp > last_stamp:
-                    last_stamp = stamp
-                    last_user = user
-            return last_user
     except Exception as e:
         logger.debug(e)
         return None
@@ -273,16 +255,6 @@ def find_user_id_32(path: Path) -> int:
     return int(uid) & 0xFFFFFFFF
 
 
-class SteamAPIKeyError(Exception):
-    def __init__(self, msg: str | None = None) -> None:
-        super().__init__(msg or api_validation_error)
-
-
-class SteamWorkshopEndpointError(Exception):
-    def __init__(self, msg: str | None = None) -> None:
-        super().__init__(msg or workshop_endpoint_error)
-
-
 def update_workshop(key: str, mod: int, endpoint: str) -> None:
     payload: dict[str, Union[int, str]] = {
         "publishedfileid": mod,
@@ -294,32 +266,22 @@ def update_workshop(key: str, mod: int, endpoint: str) -> None:
     try:
         res = requests.post(endpoint, params=payload, timeout=REQUEST_TIMEOUT)
         res.raise_for_status()
-    except HTTPError as e:
-        logger.critical(e)
-        match res.status_code:
-            case 403:
-                raise SteamAPIKeyError()
-            case 404:
-                raise SteamWorkshopEndpointError()
-            case _:
-                # TODO: apply redaction filter
-                raise e
     except Exception as e:
         logger.critical(e)
-        raise e
 
 
 def subscribe(key: str, mod: int) -> None:
-    update_workshop(key, mod, STEAM_SUB)
+    update_workshop(key, mod, SUB_ENDPOINT)
 
 
 def unsubscribe(key: str, mod: int) -> None:
-    update_workshop(key, mod, STEAM_UNSUB)
+    update_workshop(key, mod, UNSUB_ENDPOINT)
 
 
-def validate_mod(client: str, mod: str) -> None:
+@deprecated("Use subscribe()")
+def enqueue_mod(client: str, mod: str, appid: int) -> None:
     client_args = concat_bash_args(client)
-    subprocess.Popen([*client_args, "+workshop_download_item", str(APPID_DAYZ), mod])
+    subprocess.Popen([*client_args, "+workshop_download_item", str(appid), mod])
 
 
 @deprecated("Cf. https://github.com/ValveSoftware/steam-for-linux/issues/9672")
@@ -389,26 +351,6 @@ def get_running_app() -> int | None:
     return None
 
 
-def get_last_updated(path: Path, appid: int) -> str | None:
-    root_path = get_app_path(path, appid)
-    acf = root_path.joinpath(f"steamapps/appmanifest_{appid}.acf")
-    try:
-        return ACF(acf).get_last_updated()
-    except Exception as e:
-        logger.critical(e)
-        return None
-
-
-def get_last_played(path: Path, appid: int) -> str | None:
-    root_path = get_app_path(path, appid)
-    acf = root_path.joinpath(f"steamapps/appmanifest_{appid}.acf")
-    try:
-        return ACF(acf).get_last_played()
-    except Exception as e:
-        logger.critical(e)
-        return None
-
-
 def get_app_allows_downloads(path: Path, appid: int) -> bool:
     try:
         root_path = get_app_path(path, appid)
@@ -467,22 +409,6 @@ def is_dayz_running() -> bool:
     return any(s in item for sublist in procs for item in sublist for s in substring)
 
 
-def get_pending_downloads(steam_path: Path, appid: int) -> Generator[Path, None, None]:
-    root_path = get_app_path(steam_path, appid)
-    downloads_dir = root_path / DOWNLOADS_PATH
-    files = downloads_dir.iterdir()
-    return files
-
-
-def is_dayz_downloading(steam_path: Path, appid: int) -> bool:
-    files = get_pending_downloads(steam_path, appid)
-    reg = re.compile(rf"^state_(?:{APPID_DAYZ_EXP}|{APPID_DAYZ})_.*\.patch$")
-    pending = [f for f in files if reg.match(f.name)]
-    if len(pending) > 0:
-        return True
-    return False
-
-
 def get_app_path(folders_path: Path, appid: int) -> Path:
     app_path = None
 
@@ -512,7 +438,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(STEAM_APP_DETAILS, params=payload)
+    res = requests.get(APP_DETAILS, params=payload)
     if res.status_code != 200:
         return None
     try:
@@ -520,10 +446,3 @@ def get_app_name(appid: int) -> str | None:
     except Exception as e:
         logger.debug(e)
         return None
-
-
-@deprecated("Currently unused")
-def validate_dayz(client: str) -> None:
-    client_args = concat_bash_args(client)
-    uri = VALIDATE + str(APPID_DAYZ)
-    subprocess.Popen([*client_args, uri])

dzgui/app_init.py

@@ -1,18 +1,10 @@
 import logging
 import os
 import shutil
-
-from importlib import resources
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 
-from dzgui.const.constants import (
+from dzgui.const.constants import APP_NAME
-    APP_NAME,
-    APP_NAME_LOWER,
-    FLATPAK_ROOT_PATH,
-    ICONS_PATH,
-)
 from dzgui.const.enum import Preferences
 from dzgui.config.query import lookup
 from dzgui.config.userprefs import UserPrefs
@@ -22,7 +14,8 @@ from dzgui.init.migrate import (
     copy_state_files,
     migrate_cols_file,
 )
-from dzgui.init.prereqs import has_flatpak_client, has_steam_client
+from dzgui.init.flock import lock_acquire
+from dzgui.init.prereqs import has_steam_client
 from dzgui.strings import boot
 
 from dzgui.util.deck import is_steam_deck, is_game_mode
@@ -103,24 +96,9 @@ def copy_bare_configs(config: "Path", resolution: "Path") -> tuple[bool, bool]:
     return (config_changed, state_changed)
 
 
-def load_steam_icon() -> None:
+def load_gui(version: str, is_debug: bool) -> None:
-    import gi
+    lock = lock_acquire()  # noqa
 
-    gi.require_version("Gtk", "3.0")
-    from gi.repository import Gtk  # noqa
-
-    try:
-        traversable = resources.files(APP_NAME_LOWER).joinpath(ICONS_PATH)
-        icons = Path(str(traversable))
-
-        theme = Gtk.IconTheme.get_default()
-        paths = theme.get_search_path()
-        theme.set_search_path(paths + [str(icons)])
-    except Exception as e:
-        logger.critical(e)
-
-
-def build_gui(version: str, is_debug: bool) -> App | None:
     set_locale()
     # NOTE: consider aborting this check if steam deck
     xdg_paths = get_xdg_paths()
@@ -145,28 +123,26 @@ def build_gui(version: str, is_debug: bool) -> App | None:
         migrate_cols_file(XDG.columns)
         copy_state_files(xdg_paths["XDG_STATE_HOME"])
         # TODO: add logging inside wizard
-        wizard = SetupWizard(_is_steam_deck, XDG, xdg_paths)
+        wizard = SetupWizard(_is_steam_deck, XDG)
 
         if not wizard.is_setup_complete():
-            return None
+            return
 
     setup_logger(XDG.debug)
     with open(XDG.debug, "w") as f:
         f.truncate(0)
 
     if _is_steam_deck is False:
-        if FLATPAK_ROOT_PATH in lookup(XDG.config, Preferences.DEFAULT):
+        # TODO: sudo escalation dialog
-            has_client = has_flatpak_client()
+        # count = get_map_count()
-        else:
+        # TODO: move into module
-            has_client = has_steam_client()
+        if has_steam_client() is False:
-        if has_client is False:
             EarlyAlertDialog(init.requires_steam)
 
     bootwin = BootWindow(XDG, version)
     local_coords, latest_release = bootwin.get_results()
 
     use_miles = lookup(XDG.config, Preferences.DIST)
-
     prefs = UserPrefs(
         is_steam_deck=_is_steam_deck,
         is_game_mode=_is_game_mode,
@@ -178,6 +154,5 @@ def build_gui(version: str, is_debug: bool) -> App | None:
         use_miles=use_miles,
     )
     print(boot.all_ok)
-    load_steam_icon()
     app = App(prefs)
-    return app
+    app.run(None)

dzgui/config/ipdb.py

@@ -3,9 +3,6 @@ import logging
 import re
 import requests
 import shutil
-import socket
-import sqlite3
-import time
 
 from pathlib import Path
 
@@ -25,16 +22,15 @@ def find_download_url(url: str) -> str | None:
     return str(urls[0])
 
 
-def get_ipdb(db_path: Path) -> None:
+def get_ipdb(ips_path: Path) -> None:
     try:
         url = find_download_url(DB_IP)
         if url is None:
             return
 
-        ips_path = db_path.with_suffix(".csv")
-        month_file = db_path.parent / ".month"
         date = find_date(url)
-        if db_path.exists() and month_file.exists():
+        month_file = ips_path.parent / ".month"
+        if ips_path.exists() and month_file.exists():
             old_date = month_file.read_text().rstrip("\n")
             if old_date == date:
                 logger.info(f"IP DB date matches: {date}")
@@ -49,9 +45,6 @@ def get_ipdb(db_path: Path) -> None:
         logger.info("Stripping IPv6 records")
         strip_ipv6(ips_path)
 
-        create_table(db_path, ips_path)
-        ips_path.unlink()
-
         with open(month_file, "w") as f:
             f.write(date)
         logger.info(f"Wrote {date} to {month_file}")
@@ -115,95 +108,3 @@ def strip_ipv6(path: Path) -> None:
             out.write(merged)
     path.unlink()
     alt_path.rename(path)
-
-
-def ip_to_int(ip: str) -> int:
-    return int.from_bytes(socket.inet_aton(ip), "big")
-
-
-def marshal_rows(ip_file: Path) -> list[tuple[int, int, str, str]]:
-    YIELD = 0.003
-    SLEEP = 0.001
-    with open(ip_file, "r") as f:
-        rows: list[tuple[int, int, str, str]] = []
-        # NOTE: yield to GIL periodically to reduce load on spinner
-        last_yield = time.monotonic()
-        for row in f:
-            start, end, lat, lon = row.rstrip("\n").split(",")
-            int_start = ip_to_int(start)
-            int_end = ip_to_int(end)
-            rows.append((int_start, int_end, lat, lon))
-
-            now = time.monotonic()
-            if (now - last_yield) >= YIELD:
-                time.sleep(SLEEP)
-                last_yield = time.monotonic()
-    return rows
-
-
-def create_table(db_file: Path, ip_file: Path) -> None:
-    create = """
-    CREATE TABLE IF NOT EXISTS ips (
-    start_range INTEGER PRIMARY KEY,
-    end_range INTEGER,
-    latitude REAL,
-    longitude REAL
-    ) WITHOUT ROWID;
-    """
-    insert = """
-        INSERT INTO ips
-        (start_range, end_range, latitude, longitude)
-        values(?, ?, ?, ?)
-    """
-
-    if db_file.exists():
-        db_file.unlink()
-
-    conn = sqlite3.connect(":memory:")
-    c = conn.cursor()
-
-    try:
-        c.execute(create)
-        rows = marshal_rows(ip_file)
-        c.executemany(insert, rows)
-        logger.info(f"Inserted {len(rows)} IP records into database")
-        conn.commit()
-        with sqlite3.connect(db_file) as dest:
-            conn.backup(dest)
-        logger.info(f"Serialized IP records to database: '{db_file}'")
-        conn.close()
-    except Exception as e:
-        logger.critical(e)
-
-
-def read_from_table(db_path: Path, ip: str) -> tuple[float, float]:
-    if not db_path.exists():
-        raise FileNotFoundError(f"No file found at the location '{db_path}")
-
-    conn = sqlite3.connect(db_path)
-    c = conn.cursor()
-
-    int_ip = ip_to_int(ip)
-
-    query = """
-    SELECT end_range, latitude, longitude
-    FROM ips
-    WHERE start_range <= ?
-    ORDER BY start_range DESC
-    LIMIT 1
-    """
-    index = """
-    CREATE INDEX IF NOT EXISTS start_index
-    ON ips(start_range);
-    """
-    try:
-        c.execute(index)
-        conn.commit()
-        c.execute(query, (int_ip,))
-        row = c.fetchone()
-        end, lat, lon = row
-        conn.close()
-        return lat, lon
-    except Exception as e:
-        logger.critical(e)
-        raise e

dzgui/config/query.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from dzgui.util._json import read_json
 
 from dzgui.const.enum import Preferences
+from dzgui.const.constants import STEAM_CMD, FLATPAK_RUN_CMD, FLATPAK_SANDBOX
 
 
 class ConfigFileError(Exception):
@@ -39,5 +40,23 @@ def get_favorites(path: Path) -> list[str]:
     return list(conf["ip_list"])
 
 
+# def is_in_favs(record: str, path: Path) -> bool:
+#    favs = get_favorites(path)
+#    if record in favs:
+#        return True
+#    return False
+
+
 def enum_to_key(enum: Preferences) -> str:
-    return str(enum.key)
+    return str(enum.dict["key"])
+
+
+def get_client_index(client: str) -> int:
+    if client == STEAM_CMD:
+        return 0
+    elif client == FLATPAK_RUN_CMD:
+        return 1
+    elif client == FLATPAK_SANDBOX:
+        return 2
+    else:
+        return 0

dzgui/config/xdg.py

@@ -3,13 +3,7 @@ import os
 from pathlib import Path
 from dataclasses import dataclass
 
-from dzgui.const.constants import (
+from dzgui.const.constants import APP_NAME_LOWER, DEBUG_LOG, SYSTEM_LOG
-    APP_NAME_LOWER,
-    DEBUG_LOG,
-    FLATPAK_ROOT_PATH,
-    SYSTEM_LOG,
-)
-from dzgui.init.proc import is_sandboxed
 
 
 @dataclass
@@ -22,7 +16,7 @@ class Xdg:
     version: Path
     system: Path
     debug: Path
-    db: Path
+    ips: Path
     filters: Path
     shortcut: Path
 
@@ -51,7 +45,7 @@ def is_writeable(path_str: str) -> bool:
     return True
 
 
-def get_xdg_paths() -> dict[str, Path]:
+def get_xdg_paths() -> dict:
     home = Path.home()
     xdg_paths = {
         "XDG_CONFIG_HOME": home / ".config",
@@ -59,12 +53,10 @@ def get_xdg_paths() -> dict[str, Path]:
         "XDG_DATA_HOME": home / ".local" / "share",
         "XDG_CACHE_HOME": home / ".cache",
     }
+
     resolved_paths = {}
     for path in xdg_paths:
         real_path = os.environ.get(path)
-        if real_path is not None and is_sandboxed():
-            search_string = FLATPAK_ROOT_PATH + "/"
-            real_path = real_path.replace(search_string, "")
         if real_path is not None and is_writeable(real_path):
             new_path = Path(real_path)
         else:
@@ -73,7 +65,7 @@ def get_xdg_paths() -> dict[str, Path]:
     return resolved_paths
 
 
-def parse_filepaths(xdg: dict[str, Path]) -> Xdg:
+def parse_filepaths(xdg: dict) -> Xdg:
     config = xdg["XDG_CONFIG_HOME"]
     state = xdg["XDG_STATE_HOME"]
     share = xdg["XDG_DATA_HOME"]
@@ -88,7 +80,7 @@ def parse_filepaths(xdg: dict[str, Path]) -> Xdg:
     resolution = state / "dzg.res.json"
     history = state / "dzg.history"
     versions = state / "dzg.versions"
-    db = state / "ips.db"
+    ips = state / "ips.csv"
     filters = state / "dzg.filters.json"
 
     shortcut = share / APP_NAME_LOWER
@@ -102,7 +94,7 @@ def parse_filepaths(xdg: dict[str, Path]) -> Xdg:
         versions,
         system,
         debug,
-        db,
+        ips,
         filters,
         shortcut,
     )

dzgui/const/constants.py

@@ -15,7 +15,6 @@ DAYZ_BINARY = "DayZ_x64.exe"
 DAYZ_LAUNCHER = "DayZLauncher.exe"
 
 LIBRARYFOLDERS_PATH = "steamapps/libraryfolders.vdf"
-DOWNLOADS_PATH = "steamapps/downloading"
 WORKSHOP_PATH = "steamapps/workshop/content/" + str(APPID_DAYZ)
 
 STEAM_CMD = "steam"
@@ -37,8 +36,34 @@ HEX_GREEN = "#32CD32"
 HEX_RED = "#FF0000"
 HEX_ORANGE = "#FFAC1C"
 
+# FIXME: normalize icon names
+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_mono"
+VIEW_CONCEAL = "view-conceal-symbolic"
+VIEW_REVEAL = "view-reveal-symbolic"
+WARNING = "dialog-warning-symbolic"
+WEB_BROWSER = "web-browser-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
@@ -51,14 +76,12 @@ DEBUG_LOG = f"{APP_NAME}_DEBUG.LOG"
 SYSTEM_LOG = f"{APP_NAME}_SYSTEM.LOG"
 CHANGELOG_PATH = "data/CHANGELOG.md"
 IMAGES_PATH = "data/images"
-ICONS_PATH = "data/images/gtk"
 
 HERO_PATH = "data/images/_hero.png"
 CSS_PATH = "data/app.css"
 VDF_PATH = "steamapps/libraryfolders.vdf"
 DEFAULT_STEAM_PATH = ".local/share/Steam"
-FLATPAK_ROOT_PATH = ".var/app/com.valvesoftware.Steam"
+FLATPAK_STEAM_PATH = ".var/app/com.valvesoftware.Steam/data/Steam"
-FLATPAK_STEAM_PATH = FLATPAK_ROOT_PATH + "/data/Steam"
 UBUNTU_STEAM_PATH = ".steam/steam"
 DEBIAN_STEAM_PATH = ".steam/debian-installation"
 
@@ -67,7 +90,6 @@ LOG_FILTERS = ("CRITICAL", "WARNING", "INFO", "DEBUG")
 TMP_PATH = "/tmp"
 TMP_TARBALL = "/tmp/dzgui.tar.gz"
 TMP_EXE = "/tmp/dzgui/dzgui"
-LOCK_FILE = "/tmp/dzgui.flock"
 
 DAYZ_COMMUNITY_ROOT = "Missions"
 

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"
-STEAM_SUB = "https://api.steampowered.com/IPublishedFileService/Subscribe/v1"
+SUB_ENDPOINT = "https://api.steampowered.com/IPublishedFileService/Subscribe/v1"
-STEAM_UNSUB = "https://api.steampowered.com/IPublishedFileService/Unsubscribe/v1"
+UNSUB_ENDPOINT = "https://api.steampowered.com/IPublishedFileService/Unsubscribe/v1"
-STEAM_APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
+APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
 
 GITHUB = "https://github.com/aclist"
 GITHUB_RELEASES = "https://api.github.com/repos/aclist/dztui/releases/latest"
@@ -18,7 +18,6 @@ COORDS_API = "http://ip-api.com/json"
 # steam URIs
 WORKSHOP = "steam://url/CommunityFilePage/"
 OPEN_URL = "steam://openurl/"
-VALIDATE = "steam://validate/"
 
 # user facing
 GITHUB_PAGES = "https://aclist.github.io/dzgui/index"

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,124 @@ class FilterMode(Enum):
     TOGGLE_ON = 3
 
 
-@dataclass(slots=True, frozen=True)
+class EnumWithAttrs(Enum):
-class ModButtonMeta:
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
-    label: str
+        value = len(cls.__members__) + 1
-    tooltip: str
+        obj = object.__new__(cls)
+        obj._value_ = value
+        return obj
+
+    def __init__(self, d: dict):
+        self.dict = d
 
 
-@dataclass(slots=True, frozen=True)
+class Preferences(EnumWithAttrs):
-class ButtonTypeMeta:
+    STEAM = {
-    label: str
+        "key": "steam_api",
-    tooltip: str
+    }
-    opens: NotebookPage | None
+    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 NotebookPage(EnumWithAttrs):
-class ConfigKey:
+    OFFLINE = {"crumbs": strings.crumbs.offline, "statusbar": True}
-    key: str
+    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 RowType(EnumWithAttrs):
-class NotebookMeta:
+    # TODO: strings
-    crumbs: str
+    CHANGELOG = {
-    has_statusbar: bool
+        "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)
+# TODO: rename to ContextMenuItem
-class RowMeta:
+class ContextMenu(EnumWithAttrs):
-    label: str
+    ADD_NOTE = {"label": strings.add_note}
-    tooltip: str
+    ADD_SERVER = {"label": strings.add}
-
+    CONNECT = {"label": strings.connect}
-
+    COPY_LOG_CLIPBOARD = {"label": strings.copy_log}
-@dataclass(slots=True, frozen=True)
+    COPY_SERVER_IP = {"label": strings.copy_ip}
-class ContextMenuMeta:
+    COPY_SERVER_NAME = {"label": strings.copy_name}
-    label: str
+    UNSUB_MOD = {"label": strings.unsub_mod}
-
+    OPEN_WORKSHOP = {"label": strings.open_workshop}
-
+    REFRESH_PLAYERS = {"label": strings.refresh_players}
-class ContextMenuItem(Enum):
+    REMOVE_HISTORY = {"label": strings.remove_history}
-    ADD_NOTE = ContextMenuMeta(strings.add_note)
+    REMOVE_SERVER = {"label": strings.remove}
-    ADD_SERVER = ContextMenuMeta(strings.add)
+    SET_FAV = {"label": strings.add_fav}
-    CONNECT = ContextMenuMeta(strings.connect)
+    SHOW_DETAILS = {"label": strings.show_details}
-    COPY_LOG_CLIPBOARD = ContextMenuMeta(strings.copy_log)
+    SHOW_MODS = {"label": strings.show_mods}
-    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
 
 
 class ContextMenuGroup(Enum):
@@ -110,193 +171,109 @@ class ContextMenuGroup(Enum):
     Groupings of context menu items
     """
 
-    SERVER_MOD = (ContextMenuItem.OPEN_WORKSHOP,)
+    SERVER_MOD = (ContextMenu.OPEN_WORKSHOP,)
-    MOD = (
+    MOD = (ContextMenu.OPEN_WORKSHOP, ContextMenu.UNSUB_MOD)
-        ContextMenuItem.OPEN_WORKSHOP,
-        ContextMenuItem.UNSUB_MOD,
-        ContextMenuItem.VALIDATE_MOD,
-    )
     MOD_OFFLINE = (None,)
-    LOG = (ContextMenuItem.COPY_LOG_CLIPBOARD,)
+    LOG = (ContextMenu.COPY_LOG_CLIPBOARD,)
     SERVER_BROWSER = (
-        ContextMenuItem.CONNECT,
+        ContextMenu.CONNECT,
-        ContextMenuItem.ADD_SERVER,
+        ContextMenu.ADD_SERVER,
-        ContextMenuItem.SET_FAV,
+        ContextMenu.SET_FAV,
-        ContextMenuItem.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
+        ContextMenu.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
+        ContextMenu.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
+        ContextMenu.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
+        ContextMenu.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.REFRESH_PLAYERS,
     )
     SCAN_LAN = (
-        ContextMenuItem.CONNECT,
+        ContextMenu.CONNECT,
-        ContextMenuItem.SET_FAV,
+        ContextMenu.SET_FAV,
-        ContextMenuItem.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
+        ContextMenu.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
+        ContextMenu.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
+        ContextMenu.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
+        ContextMenu.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.REFRESH_PLAYERS,
     )
     SAVED = (
-        ContextMenuItem.CONNECT,
+        ContextMenu.CONNECT,
-        ContextMenuItem.SET_FAV,
+        ContextMenu.SET_FAV,
-        ContextMenuItem.REMOVE_SERVER,
+        ContextMenu.REMOVE_SERVER,
-        ContextMenuItem.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
+        ContextMenu.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
+        ContextMenu.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
+        ContextMenu.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
+        ContextMenu.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.REFRESH_PLAYERS,
     )
     RECENT = (
-        ContextMenuItem.CONNECT,
+        ContextMenu.CONNECT,
-        ContextMenuItem.ADD_SERVER,
+        ContextMenu.ADD_SERVER,
-        ContextMenuItem.SET_FAV,
+        ContextMenu.SET_FAV,
-        ContextMenuItem.REMOVE_HISTORY,
+        ContextMenu.REMOVE_HISTORY,
-        ContextMenuItem.COPY_SERVER_NAME,
+        ContextMenu.COPY_SERVER_NAME,
-        ContextMenuItem.COPY_SERVER_IP,
+        ContextMenu.COPY_SERVER_IP,
-        ContextMenuItem.ADD_NOTE,
+        ContextMenu.ADD_NOTE,
-        ContextMenuItem.SHOW_MODS,
+        ContextMenu.SHOW_MODS,
-        ContextMenuItem.SHOW_DETAILS,
+        ContextMenu.SHOW_DETAILS,
-        ContextMenuItem.REFRESH_PLAYERS,
+        ContextMenu.REFRESH_PLAYERS,
     )
 
 
-class Preferences(Enum):
+class ModButton(EnumWithAttrs):
-    STEAM = ConfigKey("steam_api")
+    SELECT_ALL = {
-    CLIENT = ConfigKey("client")
+        "label": strings.mod_panel.select_all,
-    WINDOW = ConfigKey("fullscreen")
+        "tooltip": strings.mod_panel.select_all_tooltip,
-    DIST = ConfigKey("use_miles")
+    }
-    NAME = ConfigKey("name")
+    UNSELECT_ALL = {
-    DEFAULT = ConfigKey("default_steam_path")
+        "label": strings.mod_panel.unselect_all,
-    FAV_LBL = ConfigKey("fav_label")
+        "tooltip": strings.mod_panel.unselect_all_tooltip,
-    FAV_SRV = ConfigKey("fav_server")
+    }
-    IP_LIST = ConfigKey("ip_list")
+    HIGHLIGHT_STALE = {
-    START_TAB = ConfigKey("start_tab")
+        "label": strings.mod_panel.highlight_stale,
-
+        "tooltip": strings.mod_panel.highlight_stale_tooltip,
-    @property
+    }
-    def key(self) -> str:
+    UNHIGHLIGHT_STALE = {
-        return self.value.key
+        "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,
+    }
 
 
-class NotebookPage(Enum):
+class ButtonType(EnumWithAttrs):
-    OFFLINE = NotebookMeta(strings.crumbs.offline, True)
+    SERVERS = {
-    CHANGELOG = NotebookMeta(strings.crumbs.changelog, True)
+        "label": strings.buttons.servers_label,
-    DEVELOPERS = NotebookMeta(strings.crumbs.developers, False)
+        "tooltip": strings.buttons.servers_tooltip,
-    HELP = NotebookMeta(strings.crumbs._help, True)
+        "opens": NotebookPage.SERVERS,
-    KEYS = NotebookMeta(strings.crumbs.keys, True)
+    }
-    LOG = NotebookMeta(strings.crumbs.log, True)
+    MODS = {
-    MODS = NotebookMeta(strings.crumbs.mods, True)
+        "label": strings.buttons.mods_label,
-    OPTIONS = NotebookMeta(strings.crumbs.options, False)
+        "tooltip": strings.buttons.mods_tooltip,
-    SERVERS = NotebookMeta(strings.crumbs.servers, True)
+        "opens": NotebookPage.MODS,
-    THANKS = NotebookMeta(strings.crumbs.thanks, True)
+    }
-    CONNECTION = NotebookMeta(strings.crumbs.connect, True)
+    OPTIONS = {
-
+        "label": strings.buttons.options_label,
-    @property
+        "tooltip": strings.buttons.options_tooltip,
-    def crumbs(self) -> str:
+        "opens": NotebookPage.OPTIONS,
-        return self.value.crumbs
+    }
-
+    HELP = {
-    @property
+        "label": strings.buttons.help_label,
-    def has_statusbar(self) -> bool:
+        "tooltip": strings.buttons.help_tooltip,
-        return self.value.has_statusbar
+        "opens": NotebookPage.HELP,
-
+    }
-
+    EXIT = {
-class RowType(Enum):
+        "label": strings.buttons.exit_label,
-    CHANGELOG = RowMeta(rows.changelog_label, rows.changelog_status)
+        "tooltip": strings.buttons.exit_tooltip,
-    SHOW_LOG = RowMeta(rows.log_label, rows.log_status)
+        "opens": None,
-    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
 
 
 HELP_MENU_ROWS = (

dzgui/const/icons.py

@@ -1,20 +0,0 @@
-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
+from gi.repository.Gtk import ListStore  # noqa E402
-from gi.repository import GObject
+from gi.repository import Gdk, GObject  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.const.enum import NotebookPage, ServerTab
@@ -111,10 +111,6 @@ class Emitter(GObject.GObject):
     def check_toggled(self, label: str, state: bool) -> None:
         pass
 
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=())
-    def servers_timed_out(self) -> None:
-        pass
-
     @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
     def servers_loaded(self, tag: "ServerTab") -> None:
         pass

dzgui/controllers/mc.py

@@ -7,12 +7,11 @@ import dzgui.util._json as JSON  # noqa
 
 
 from dzgui.const.enum import (
-    ButtonType,
-    ContextMenuItem,
     FilterMode,
-    NotebookPage,
     Preferences,
-    ServerTab,
+    NotebookPage,
+    ButtonType,
+    ContextMenu,
 )
 
 from dzgui.config.userprefs import UserPrefs
@@ -32,12 +31,13 @@ from dzgui.views.dialogs.generic import ExceptionDialog
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, GObject
+from gi.repository import Gtk, Gdk, GLib, GObject  # noqa E402
 
 logger = logging.getLogger(APP_NAME)
 
 if TYPE_CHECKING:
     from dzgui.api.servers import Record
+    from dzgui.const.enum import ServerTab
     from dzgui.managers.connection import Prerequisites
     from dzgui.managers.filter import FilterManager
     from dzgui.util.dist import Haversine
@@ -77,7 +77,7 @@ class AppNavigation:
 
 class Controller(GObject.GObject):
     def __init__(self) -> None:
-        self.dist_cache: dict[str, "Haversine" | None] = {}
+        self.dist_cache: dict[str, "Haversine"] = {}
         self.mediator = AppNavigation()
 
         self.prefs: UserPrefs
@@ -102,16 +102,6 @@ class Controller(GObject.GObject):
         except AttributeError:
             logger.critical(f"{attr} is not a valid AppNavigation attribute.")
 
-    def validate_mods(
-        self, treeview: Union["ModTreeView", "OfflineModTreeView", None] = None
-    ) -> None:
-        if treeview is None:
-            view = self.mediator.modtreeview
-        else:
-            view = treeview
-        mod_man = view.get_mod_man()
-        mod_man.validate_mods()
-
     def get_prefs(self) -> UserPrefs:
         return self.prefs
 
@@ -196,9 +186,7 @@ class Controller(GObject.GObject):
     def show_developers_page(self) -> None:
         self.open_page(NotebookPage.DEVELOPERS)
 
-    def open_page(self, page: NotebookPage | None) -> None:
+    def open_page(self, page: NotebookPage) -> None:
-        if page is None:
-            return
         self.mediator.grid.notebook.set_page_by_enum(page)
 
     def open_page_by_button(self, button: "ContextualButton") -> None:
@@ -264,7 +252,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 +264,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 +298,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)
@@ -357,21 +345,22 @@ class Controller(GObject.GObject):
             filter_man.set_filter(filt, state)
         self.mediator.filters.set_filters(filters)
 
-    def get_dist_cache(self) -> dict[str, Union["Haversine", None]]:
+    def get_dist_cache(self) -> dict[str, "Haversine"]:
         return self.dist_cache
 
-    def set_dist_cache(self, addr: str, haversine: Union["Haversine", None]) -> None:
+    def set_dist_cache(self, addr: str, haversine: "Haversine") -> None:
         self.dist_cache[addr] = haversine
 
     def get_map_store(self) -> Gtk.ListStore:
         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()
@@ -509,9 +498,6 @@ class Controller(GObject.GObject):
 
     def set_active_keyword(self, keyword: str) -> None:
         self.get_filter_man().set_active_keyword(keyword)
-        ServerModelManager(self, self.get_active_treeview()).refilter(
-            FilterMode.TOGGLE_ON
-        )
 
     def get_modtreeview(self) -> "ModTreeView":
         return self.mediator.modtreeview
@@ -537,7 +523,6 @@ class Controller(GObject.GObject):
 
     def set_start_tab(self) -> None:
         ind = self.config_man.get_start_tab()
-        logger.info(f"Setting start tab to index {ind}")
         self.get_servers().notebook.set_current_page(ind)
 
     def get_debug_args(self) -> str:
@@ -552,10 +537,8 @@ class Controller(GObject.GObject):
     def update_status(self) -> None:
         self.mediator.preconnect.mark_finished()
 
-    def get_client_name(self) -> str:
+    def get_steam_client_name(self) -> str:
-        # NOTE: only possible values are "Steam" and "Flatpak"
+        return self.mediator.options.get_client_name()
-        cmd = self.query_config(Preferences.CLIENT)
-        return str(cmd.split()[0].capitalize())
 
     def present_window(self) -> None:
         self.mediator.window.present_with_time(Gdk.CURRENT_TIME)

dzgui/data/CHANGELOG.md

@@ -52,7 +52,6 @@
 - Filter button tooltips
 - Expand/collapse changelog versions
 - Support local light/dark mode changes on system theme
-- Server time calculator
 
 ### Changed
 - Conform to PEP 440 versioning for beta versions
@@ -91,7 +90,6 @@
 - Rare segfaults when changing maps (threading)
 - Moved dialogs out of threads
 - History table not being in lock-step with state file
-- Current keyword filter not being applied when refreshing table
 
 ### Unreleased
 - Load offline mods

dzgui/data/app.css

@@ -24,10 +24,6 @@
 .left-label {
     font-size: 1.3rem;
 }
-.server-subheading {
-    font-size: 1.1rem;
-    font-weight: 700;
-}
 .details-heading {
     font-size: 1.2rem
 }

dzgui/data/images/gtk/steam-tray-symbolic.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M568 320C568 457 456.8 568 319.6 568C205.8 568 110 491.7 80.6 387.6L175.8 426.9C182.2 459 210.7 483.3 244.7 483.3C283.9 483.3 316.6 450.9 314.9 409.8L399.4 349.6C451.5 350.9 495.2 308.7 495.2 256.1C495.2 204.5 453.2 162.6 401.5 162.6C349.8 162.6 307.8 204.6 307.8 256.1L307.8 257.3L248.6 343C233.1 342.1 217.9 346.4 205.1 355.1L72 300.1C82.2 172.4 189.1 72 319.6 72C456.8 72 568 183 568 320zM227.7 448.3L197.2 435.7C202.8 447.3 212.5 456.5 224.4 461.5C251.3 472.7 282.2 459.9 293.4 433.1C298.8 420.1 298.9 405.8 293.5 392.8C288.1 379.8 278 369.6 265 364.2C252.1 358.8 238.3 359 226.1 363.6L257.6 376.6C277.4 384.8 286.8 407.5 278.5 427.3C270.2 447.2 247.5 456.5 227.7 448.3zM401.5 193.8C435.9 193.8 463.8 221.7 463.8 256.1C463.8 290.5 435.9 318.4 401.5 318.4C367.1 318.4 339.2 290.5 339.2 256.1C339.2 221.7 367.1 193.8 401.5 193.8zM401.6 302.8C427.4 302.8 448.4 281.8 448.4 256C448.4 230.2 427.4 209.2 401.6 209.2C375.8 209.2 354.8 230.2 354.8 256C354.8 281.8 375.8 302.8 401.6 302.8z"/></svg>

dzgui/init/coords.py

@@ -10,10 +10,10 @@ if TYPE_CHECKING:
 logger = logging.getLogger(APP_NAME)
 
 
-def get_local_coords(db_path: "Path") -> Coords | None:
+def get_local_coords(path: "Path") -> Coords | None:
     try:
         my_ip = get_local_ip()
-        return get_coords(db_path, my_ip)
+        return get_coords(path, my_ip)
     except Exception as e:
         logger.warn(e)
         return None

dzgui/init/dayz.py

@@ -4,24 +4,17 @@ from pathlib import Path
 
 from dzgui.api.steam import get_app_path
 from dzgui.config.query import lookup
-from dzgui.const.constants import APPID_DAYZ, APP_NAME, APPNAME_DAYZ
+from dzgui.const.constants import APPID_DAYZ, APP_NAME
 from dzgui.const.enum import Preferences
 
-from dzgui.strings.preconnect import resync
-
 
 logger = logging.getLogger(APP_NAME)
 
 
-class VDFSyncError(Exception):
-    pass
-
-
 def is_dayz_installed(config: Path) -> None:
     try:
         path = lookup(config, Preferences.DEFAULT)
         get_app_path(Path(path), APPID_DAYZ)
     except Exception as e:
         logger.critical(e)
-        msg = resync.format(APPNAME_DAYZ)
+        raise e
-        raise VDFSyncError(msg)

dzgui/init/flock.py

@@ -5,9 +5,8 @@ import sys
 from pathlib import Path
 from typing import TextIO
 
-from dzgui.const.constants import LOCK_FILE
-from dzgui.util.strings import cannot_acquire_lock
 from dzgui.views.dialogs.early_alert import EarlyAlertDialog
+from dzgui.util.strings import cannot_acquire_lock
 
 
 def lock_release(lock: TextIO) -> None:
@@ -16,7 +15,7 @@ def lock_release(lock: TextIO) -> None:
 
 
 def lock_acquire() -> TextIO:
-    lockfile = Path(LOCK_FILE)
+    lockfile = Path("/tmp/dzgui.flock")
     lock = open(lockfile, "w")
     try:
         fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)

dzgui/init/prereqs.py

@@ -3,39 +3,23 @@ import shutil
 import subprocess
 
 from dzgui.const.constants import APP_NAME, FLATPAK_APPID, FLATPAK_CMD, STEAM_CMD
-from dzgui.init.proc import is_sandboxed
 
 logger = logging.getLogger(APP_NAME)
 
 
-def has_flatpak_client() -> bool:
-    if is_sandboxed():
-        return True
-    try:
-        res = subprocess.run(
-            [FLATPAK_CMD, "list", "--columns=application"],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        if FLATPAK_APPID in res.stdout:
-            return True
-        else:
-            return False
-    except Exception as e:
-        logger.critical(e)
-        return False
-
-
 def has_steam_client() -> bool:
-    if shutil.which(STEAM_CMD):
-        return True
-    return False
-
-
-def has_any_client() -> bool:
     if shutil.which(STEAM_CMD):
         return True
     if not shutil.which(FLATPAK_CMD):
         return False
-    return has_flatpak_client()
+    try:
+        res = subprocess.run(
+            [FLATPAK_CMD, "list"], capture_output=True, text=True, check=True
+        )
+        if FLATPAK_APPID in res.stdout:
+            return True
+        else:
+            return False
+    except subprocess.CalledProcessError as e:
+        logger.critical(e)
+        return False

dzgui/init/proc.py

@@ -1,8 +1,7 @@
-import logging
-import os
 import psutil
-import shutil
 import subprocess
+import shutil
+import logging
 
 from dzgui.const.constants import (
     APP_NAME,
@@ -11,67 +10,42 @@ from dzgui.const.constants import (
     FLATPAK_CMD,
     FLATPAK_RUN_CMD,
     FLATPAK_SANDBOX,
-    FLATPAK_ROOT_PATH,
-    FLATPAK_STEAM_PATH,
 )
 
 logger = logging.getLogger(APP_NAME)
 
 
 def is_steam_running(cmd: str) -> bool:
-    if cmd in (FLATPAK_RUN_CMD, FLATPAK_SANDBOX):
+    if cmd == STEAM_CMD:
+        if has_cmd(STEAM_CMD) is False:
+            return False
+        return is_running(STEAM_CMD)
+    elif cmd == FLATPAK_RUN_CMD or FLATPAK_SANDBOX:
         return is_flatpak_steam_running()
-    elif cmd == STEAM_CMD:
-        return is_native_steam_running()
     else:
         raise TypeError("Not a valid Steam client selection")
 
 
-def is_sandboxed() -> bool:
+# CHORE: test alternate clients
-    return bool(os.environ.get("FLATPAK_ID"))
+# TODO: has_flatpak_steam
-
-
 def is_flatpak_steam_running() -> bool:
-    if is_sandboxed():
-        return True
     if has_cmd(FLATPAK_CMD) is False:
         return False
-    proc = subprocess.check_output(
+    proc = subprocess.check_output([FLATPAK_CMD, "ps"], text=True)
-        [FLATPAK_CMD, "ps", "--columns=application"], text=True
-    )
     lines = proc.splitlines()
     if FLATPAK_APPID in lines:
         return True
     return False
 
 
-def get_steam_procs() -> list[list[str]]:
+def is_running(proc: str) -> bool:
-    return [
+    for process in psutil.process_iter(["pid", "name"]):
-        p.cmdline()
+        if process.info["name"] == proc:
-        for p in psutil.process_iter(["pid", "name"])
+            return True
-        if STEAM_CMD in p.info["name"]
+    return False
-    ]
-
-
-def is_native_steam_running() -> bool:
-    if has_cmd(STEAM_CMD) is False:
-        return False
-    substrings = [FLATPAK_ROOT_PATH, "steam-runtime-launcher-service"]
-    steam_procs = get_steam_procs()
-    native_steam_procs = [
-        proc
-        for proc in steam_procs
-        if not any(sub in item for item in proc for sub in substrings)
-    ]
-    return bool(native_steam_procs)
 
 
 def has_cmd(cmd: str) -> bool:
     if shutil.which(cmd) is not None:
         return True
     return False
-
-
-def path_to_steam_cmd(path: str) -> str:
-    cmd = FLATPAK_RUN_CMD if FLATPAK_STEAM_PATH in path else STEAM_CMD
-    return cmd

dzgui/main.py

@@ -42,12 +42,6 @@ def main() -> None:
     test_libgi_missing()
 
     # NOTE: only import ligbirepository modules after the above check
-    from dzgui.app_init import build_gui
+    from dzgui.app_init import load_gui
-    from dzgui.init.flock import lock_acquire
 
-    lock = lock_acquire()  # noqa
+    load_gui(version, args.debug)
-
-    app = build_gui(version, args.debug)
-    if app is None:
-        sys.exit(0)
-    app.run(None)

dzgui/managers/config.py

@@ -6,6 +6,9 @@ from typing import Any, TYPE_CHECKING
 
 from dzgui.const.constants import (
     APP_NAME,
+    FLATPAK_RUN_CMD,
+    FLATPAK_SANDBOX,
+    STEAM_CMD,
     WINDOW_DEFAULT_X,
     WINDOW_DEFAULT_Y,
 )
@@ -124,7 +127,16 @@ class ConfigManager:
         return False
 
     def enum_to_key(self, enum: Preferences) -> str:
-        return str(enum.key)
+        return str(enum.dict["key"])
+
+    def get_client_index(self, client: str) -> int:
+        if client == STEAM_CMD:
+            return 0
+        if client == FLATPAK_RUN_CMD:
+            return 1
+        if client == FLATPAK_SANDBOX:
+            return 2
+        return 0
 
     def toggle_config(self, key: Preferences) -> None:
         try:
@@ -162,7 +174,7 @@ class ConfigManager:
             trace = traceback.format_exc()
             dialog = ExceptionDialog(self.controller, trace)
             dialog.show_all()
-            dialog.run()  # type: ignore[no-untyped-call]
+            dialog.run()
 
     def save_res_and_quit(self, tv: "ServerTreeView", window: "OuterWindow") -> None:
         columns = tv.get_columns()

dzgui/managers/connection.py

@@ -14,7 +14,6 @@ from dzgui.api.shortcuts import Shortcuts
 from dzgui.api.steam import (
     connect,
     connect_debug,
-    is_dayz_downloading,
     get_app_allows_downloads,
     get_app_name,
     get_needs_update,
@@ -48,13 +47,18 @@ from dzgui.strings.dialogs import (
     waiting_for_directories,
 )
 from dzgui.strings import kb
-from dzgui.strings.server_mods import checkmark, resync, invalid_mod
+from dzgui.strings.server_mods import checkmark, resync
-from dzgui.util.format import format_exception, format_mib
+from dzgui.util.format import format_mib
 from dzgui.util.strings import dialog, server_timeout
 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
@@ -80,7 +84,6 @@ class Prerequisites:
     available_space: float
     passworded: bool
     dayz_running: bool
-    download_paused: bool
     steam_proc: SteamProcess
     mods: list[list[str]]
     game_mode: bool
@@ -166,7 +169,6 @@ class ConnectionManager:
                     free_mib = format_mib(free)
 
         dayz_running = is_dayz_running()
-        download_paused = is_dayz_downloading(steam_path, self.appid)
 
         running_app = get_running_app()
         if running_app is not None:
@@ -182,8 +184,8 @@ class ConnectionManager:
         else:
             allows_downloads = (True, "")
 
+        client_name = self.controller.get_steam_client_name()
         client = self.controller.query_config(Preferences.CLIENT)
-        client_name = self.controller.get_client_name()
         running = is_steam_running(client)
         steam_proc = SteamProcess(client_name, running)
         self.client = client
@@ -192,8 +194,9 @@ class ConnectionManager:
 
         is_last = self.is_last_server()
 
+        # TODO: strings
         invalid_mods = [
-            (mod[0], mod[1]) for mod in remote_mods if mod[2] == invalid_mod
+            (mod[0], mod[1]) for mod in remote_mods if mod[2] == "Invalid mod"
         ]
 
         prereqs = Prerequisites(
@@ -207,7 +210,6 @@ class ConnectionManager:
             available_space=free_mib,
             passworded=info.password_protected,
             dayz_running=dayz_running,
-            download_paused=download_paused,
             steam_proc=steam_proc,
             mods=remote_mods,
             game_mode=game_mode,
@@ -233,7 +235,7 @@ class ConnectionManager:
     @call_on_thread(dialog.querying)
     def query_details(self, record: Servers.Record) -> None:
         details = Servers.get_details(record)
-        if details is None:
+        if details.success is False:
             self.thread_man.set_cleanup_func(
                 StoredFunc(self._server_timeout), destroy_first=True
             )
@@ -271,7 +273,8 @@ class ConnectionManager:
         for mod in alpha_mods:
             # NOTE: if the mod is neither synched or out of date, it is a malformed mod
             if mod[2] == "":
-                mod[2] = invalid_mod
+                # TODO: strings
+                mod[2] = "Invalid mod"
 
         return alpha_mods, missing_mods
 
@@ -291,22 +294,17 @@ class ConnectionManager:
 
     def _present_modlist_dialog(self, mods: list[list[str]]) -> None:
         dialog = ServerModDialog(self.controller, mods)
-        dialog.run()  # type: ignore[no-untyped-call]
+        dialog.run()
 
     def _present_details_dialog(self, details: Servers.Details) -> None:
         dialog = ServerDetailsDialog(self.controller, details)
-        dialog.run()  # type: ignore[no-untyped-call]
+        dialog.run()
-
-    def _workshop_timeout(self, msg: str) -> None:
-        dialog = ExceptionDialog(self.controller, msg)
-        dialog.show_all()
-        dialog.run()  # type: ignore[no-untyped-call]
 
     def _server_timeout(self) -> None:
         dialog = ExceptionDialog(self.controller, server_timeout)
         dialog.set_details_buffer(kb.DZG_006)
         dialog.show_all()
-        dialog.run()  # type: ignore[no-untyped-call]
+        dialog.run()
 
     def get_debug_args(self) -> str:
         addr = f"{self.record.ip}:{self.record.gameport}"
@@ -353,14 +351,8 @@ class ConnectionManager:
         for title, mod, stamp, size in self.missing_mods:
             if self.controller.is_cancel_pending():
                 return
-            try:
+            subscribe(key, int(mod))
-                subscribe(key, int(mod))
+            time.sleep(API_RATE_LIMIT)
-                time.sleep(API_RATE_LIMIT)
-            except Exception as e:
-                msg = format_exception(e)
-                func = StoredFunc(self._workshop_timeout, msg)
-                self.thread_man.set_cleanup_func(func, destroy_first=True)
-                return
 
         self.thread_man.update_dialog(waiting_for_directories)
         for title, mod, stamp, size in self.missing_mods:

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]
+                    dialog.run()
-                case ContextMenuItem.COPY_SERVER_IP:
+                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,36 @@ 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.UNSUB_MOD:
-                    self.open_mod_page()
-                case ContextMenuItem.UNSUB_MOD:
                     self.controller.unsub_mods(self.treeview)
-                case ContextMenuItem.VALIDATE_MOD:
+                case ContextMenu.OPEN_WORKSHOP:
-                    self.controller.validate_mods(self.treeview)
+                    self.open_mod_page()
-                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/filter.py

@@ -2,7 +2,7 @@ from typing import TYPE_CHECKING
 
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import strings
-from dzgui.strings.filters import all_maps
+from dzgui.util.strings import all_maps
 
 if TYPE_CHECKING:
     from dzgui.model.model_factory import FastInsertListStore
@@ -22,21 +22,20 @@ class FilterManager:
             strings.filter_night: True,
             strings.filter_full: show_full,
             strings.filter_official: True,
-            strings.filter_modded: True,
+            strings.filter_nonascii: False,
             strings.filter_lowpop: True,
             strings.filter_unofficial: True,
-            strings.filter_unmodded: True,
             strings.filter_duplicate: False,
-            strings.filter_nonascii: False,
+            strings.filter_modded: True,
         }
 
         # TODO: strings
         self.tooltips = {
             strings.filter_1pp: "First-person perspective",
-            strings.filter_day: "In-game time between 0600 and 1759",
+            strings.filter_day: "In-game time between 0700 and 1659",
             strings.filter_empty: "Servers with no players",
             strings.filter_3pp: "Third-person perspective",
-            strings.filter_night: "In-game time between 1800 and 0559",
+            strings.filter_night: "In-game time between 1700 and 0659",
             strings.filter_full: "Servers with no open slots",
             strings.filter_official: "Bohemia official servers",
             strings.filter_nonascii: "Server names using non-standard, complex glyphs",
@@ -44,13 +43,13 @@ class FilterManager:
             strings.filter_unofficial: "Third-party servers",
             strings.filter_duplicate: "Duplicates of existing servers (usually spoofed)",
             strings.filter_modded: "Servers with one or more mods",
-            strings.filter_unmodded: "Servers with no mods",
         }
 
         self.active_keyword = ""
         self.active_map = (0, all_maps)
         self.prior_map = all_maps
 
+        self.filters: list
         self.enabled_filters = dict(self.default_filters)
 
     def get_tooltips(self) -> dict[str, str]:
@@ -74,11 +73,11 @@ class FilterManager:
     def set_active_keyword(self, word: str) -> None:
         self.active_keyword = word
 
-    def get_default_filters(self) -> dict[str, bool]:
+    def get_default_filters(self) -> dict:
         """Deep copy of defaults"""
         return dict(self.default_filters)
 
-    def get_filters(self) -> dict[str, bool]:
+    def get_filters(self) -> dict:
         return self.enabled_filters
 
     def set_filter(self, label: str, state: bool) -> None:
@@ -105,11 +104,17 @@ class FilterManager:
 
         self.reinit_map_store()
         maps.sort()
-        clean = [m for m in maps if m != all_maps]
+        for m in maps:
-        for m in clean:
+            # TODO: strings
+            if m == "All maps":
+                continue
             self.append_map([m])
 
-    def get_all_filters(self) -> tuple[str, ...]:
+    # TODO: currently unused
+    def get_unique_maps(self) -> list[str]:
+        return [row[0] for row in self.map_store if row[0] != "All maps"]
+
+    def get_all_filters(self) -> tuple:
         map_name = self.get_active_map_name()
         enabled = self.get_filters()
         kw = self.get_active_keyword()

dzgui/managers/mods.py

@@ -4,7 +4,7 @@ import time
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from dzgui.api.steam import unsubscribe, validate_mod
+from dzgui.api.steam import unsubscribe
 from dzgui.api.mods import (
     get_delimited_mods,
     find_stale_mods,
@@ -30,7 +30,7 @@ import dzgui.api.pefile as PeFile
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -85,7 +85,7 @@ class ModManager:
         total_mods = len(self.store)
         self.emitter.emit("mods_updated", msg, total_mods)
 
-    def get_selected_mods(self) -> list[tuple[str, Gtk.TreeIter]]:
+    def unsub_mods(self) -> None:
         sel = self.treeview.get_selection()
         model, pathlist = sel.get_selected_rows()
         # NOTE: reverse when multiple selection
@@ -96,15 +96,6 @@ class ModManager:
                 continue
             mod, _iter = res
             mods.append((mod, _iter))
-        return mods
-
-    def validate_mods(self) -> None:
-        mods = self.get_selected_mods()
-        self.thread_man.set_job_count(len(mods))
-        self.validate_all_mods(mods)
-
-    def unsub_mods(self) -> None:
-        mods = self.get_selected_mods()
         self.thread_man.set_job_count(len(mods))
         self.unsub_all_mods(mods)
 
@@ -118,21 +109,6 @@ class ModManager:
         mod = model.get_value(tree_iter, 2)
         return mod, tree_iter
 
-    def validate_atomic_mod(self, mod: str) -> None:
-        # NOTE: propagation to dayz exp will happen during
-        # subsequent symlink phase on connect
-        client = self.controller.query_config(Preferences.CLIENT)
-        validate_mod(client, mod)
-
-    @call_on_thread(dialogs.validating_mods)
-    def validate_all_mods(self, mods: list[tuple[str, Gtk.TreeIter]]) -> None:
-        for mod, _iter in mods:
-            self.validate_atomic_mod(mod)
-            self.thread_man.increment_dialog()
-            time.sleep(API_RATE_LIMIT)
-        func = StoredFunc(lambda: None)
-        self.thread_man.set_cleanup_func(func)
-
     @call_on_thread(dialogs.deleting_mods)
     def unsub_all_mods(self, mods: list[tuple[str, Gtk.TreeIter]]) -> None:
         for mod, _iter in mods:
@@ -146,11 +122,7 @@ class ModManager:
     def unsub_atomic_mod(self, mod: str) -> None:
         config_man = self.controller.get_config_man()
         key = config_man.lookup(Preferences.STEAM)
-        try:
+        unsubscribe(key, int(mod))
-            unsubscribe(key, int(mod))
-        except Exception as e:
-            logger.critical(e)
-            return
 
         steam_path = Path(self.path)
         app_path = PeFile.get_nested_app_path(steam_path, APPID_DAYZ)
@@ -221,7 +193,7 @@ class ModManager:
             total_size += mod[3]
         return total_mods, total_size
 
-    def _on_stale_mods_found(self, stale_mods: list[int]) -> None:
+    def _on_stale_mods_found(self, stale_mods: list) -> None:
         """Manipulates attached ListStore in the main event loop"""
         model = self.treeview.get_model()
         if model is None:

dzgui/managers/offline.py

@@ -52,7 +52,7 @@ class OfflineManager:
         is_valid = is_mission(folder)
         self.emitter.emit("custom_mission_loaded", str(folder), is_valid)
 
-    def find_custom_mods(self, callback: Callable[[], None]) -> None:
+    def find_custom_mods(self, callback: Callable) -> None:
         folder = self.open_folderpicker(dialogs.custom_mod_dialog)
         window = self.controller.get_window()
         window.set_sensitive(False)

dzgui/managers/threading.py

@@ -15,15 +15,15 @@ if TYPE_CHECKING:
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import GLib
+from gi.repository import Gtk, GLib  # noqa E402
 
 logger = logging.getLogger(APP_NAME)
 
 
 def call_on_thread(
     dialog_str: str, show_dialog: bool = True, show_cancel: bool = False
-) -> Callable[..., Any]:
+) -> Callable:
-    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
+    def decorator(func: Callable) -> Callable:
         @wraps(func)
         def wrapper(*args: Any, **kwargs: Any) -> None:
             self = args[0]
@@ -42,7 +42,7 @@ def call_on_thread(
 
 
 class StoredFunc:
-    def __init__(self, func: Callable[..., Any], *args: Any, **kwargs: Any) -> None:
+    def __init__(self, func: Callable, *args: Any, **kwargs: Any) -> None:
         sig = inspect.signature(func)
         self.func = func
         self.bindings = sig.bind(*args, **kwargs)

dzgui/managers/update.py

@@ -15,6 +15,11 @@ 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
 
@@ -55,9 +60,9 @@ class UpdateManager:
     def _on_update_success(self) -> None:
         msg = dialogs.update_success
         dialog = QuitDialog(self.controller, msg)
-        dialog.run()  # type: ignore[no-untyped-call]
+        dialog.run()
 
     def _on_update_failure(self, msg: str) -> None:
         dialog = ExceptionDialog(self.controller, msg)
         dialog.show_all()
-        dialog.run()  # type: ignore[no-untyped-call]
+        dialog.run()

dzgui/model/model_factory.py

@@ -7,11 +7,11 @@ from dzgui.util.strings import delimiter
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository.Gtk import ListStore, TreeIter
+from gi.repository.Gtk import ListStore, TreeIter  # noqa E402
-from gi.repository import GObject
+from gi.repository import GObject  # noqa E402
 
 GTYPE_TO_PYTHON = {
-    GObject.type_from_name(GObject.type_name(ptype)): ptype  # type: ignore[no-untyped-call]
+    GObject.type_from_name(GObject.type_name(ptype)): ptype
     for ptype in (int, float, str, bool, object)
 }
 
@@ -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/proxy_model.py

@@ -1,12 +1,10 @@
 import re
 
-from dataclasses import dataclass
 from typing import Any, TYPE_CHECKING, Union
 
 from dzgui.const.enum import FilterMode
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import strings
-from dzgui.strings import filters as str_filters
 
 if TYPE_CHECKING:
     from dzgui.managers.filter import FilterManager
@@ -14,24 +12,8 @@ if TYPE_CHECKING:
     from dzgui.api.servers import Record
     from dzgui.model.servers import NewPlayerCount
 
-DAY_REG = r"([0][6-9]|[1][0-7])"
+DAY_REG = r"([0][7-9]|[1][0-6])"
-NIGHT_REG = r"([0][0-5]|[1][8-9]|[2][0-3])"
+NIGHT_REG = r"([0][0-6]|[1][7-9]|[2][0-3])"
-
-
-@dataclass(slots=True, frozen=True)
-class ServerRow:
-    name: str
-    mapname: str
-    view: str
-    time: str
-    players: int
-    max_players: int
-    queue: int
-    ip: str
-    qport: int
-    ping: str
-    provider: str
-    modded: bool
 
 
 class ProxyModelManager:
@@ -48,7 +30,7 @@ class ProxyModelManager:
 
     def __init__(self, filter_man: "FilterManager") -> None:
         self.filter_cache: dict[
-            tuple[str, ...],
+            tuple[str],
             list[tuple[str, str, str, str, int, int, int, str, int, int, str, bool]],
         ] = {}
 
@@ -69,6 +51,9 @@ class ProxyModelManager:
             return False
         return True
 
+    def append_row(self, row: list) -> None:
+        self.proxy_model.append(row)
+
     def append_row_to_control(
         self, row: tuple[str, str, str, str, int, int, int, str, int, int, str, bool]
     ) -> None:
@@ -82,6 +67,7 @@ class ProxyModelManager:
         self.proxy_model[treeiter][4] = playercount.players
         self.proxy_model[treeiter][6] = playercount.queue
 
+    # TODO: use dataclass for record rows
     def append_row_to_history(
         self,
         history: tuple[str, str, str, str, int, int, int, str, int, int, str, bool],
@@ -189,7 +175,7 @@ class ProxyModelManager:
         rows = self.filtered
         sel_map = self.filter_man.get_active_map_name()
 
-        if sel_map == str_filters.all_maps:
+        if sel_map == strings.all_maps:
             return rows
 
         rows = [row for row in rows if row[1] == sel_map]
@@ -257,11 +243,9 @@ class ProxyModelManager:
                 rows = [row for row in rows if (row[4] / row[5] * 100) > 30]
             case strings.filter_modded:
                 rows = [row for row in rows if not row[11]]
-            case strings.filter_unmodded:
-                rows = [row for row in rows if row[11]]
         return rows
 
-    def filter_toggle_on(self, filters: tuple[str, ...]) -> list:
+    def filter_toggle_on(self, filters: tuple[str]) -> list:
         """Effectively applies all filters"""
         self.set_filtered(self.control_model)
         self.set_filtered(self.filter_map(filters))
@@ -272,9 +256,13 @@ class ProxyModelManager:
             self.set_filtered(self.filter_toggle_off(filters, f))
         return self.filtered
 
-    def set_cache(self, filters: tuple[str, ...], filtered_rows: list[tuple]) -> None:
+    def set_cache(self, filters: tuple[str], filtered_rows: list[tuple]) -> None:
         self.filter_cache[filters] = filtered_rows
 
+    # @deprecated("Currently unused")
+    # def convert_model_to_list(self, model: "FastInsertListStore") -> list:
+    #    return [[el for el in row] for row in model]
+
     def set_filtered(self, rows: list | None) -> None:
         if rows is None:
             self.filtered = []
@@ -310,6 +298,4 @@ class ProxyModelManager:
     def push(self, data: list[Any]) -> None:
         self.wipe_cache()
         self.set_control(data)
-        cur_keyword = self.filter_man.get_active_keyword()
+        self.filter(FilterMode.INITIAL)
-        mode = FilterMode.TOGGLE_ON if len(cur_keyword) > 0 else FilterMode.INITIAL
-        self.filter(mode)

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
+from gi.repository import Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.api.servers import A2SInfo, Record
@@ -92,7 +92,6 @@ class ServerModelManager:
         job = Servers.query_api
         params = Servers.params
         servers = []
-
         with ThreadPoolExecutor() as executor:
             futures = [executor.submit(job, key, APPID_DAYZ, param) for param in params]
             for future in as_completed(futures):
@@ -201,43 +200,19 @@ class ServerModelManager:
 
     @call_on_thread(dialog.querying)
     def add_by_ip(self, addr: str) -> None:
-        self.preserve_on_fail = True
+        res = Servers.query_by_ip(addr)
-        try:
+        self._parse_single_record(res)
-            res = Servers.query_by_ip(addr)
-            self._parse_single_record(res)
-        except Exception as e:
-            logger.warning(e)
-            self.thread_man.set_cleanup_func(
-                StoredFunc(self._cleanup_on_failure), destroy_first=True
-            )
-            return
 
     @call_on_thread(dialog.querying)
     def add_by_record(self, record: Servers.Record) -> None:
-        self.preserve_on_fail = True
         # NOTE: rationale: a raw Record as shown in server browser may resolve to a different IP
-        try:
+        res = Servers.query_by_record(record)
-            res = Servers.query_by_record(record)
+        self._parse_single_record(res)
-            self._parse_single_record(res)
-        except Exception as e:
-            logger.warning(e)
-            self.thread_man.set_cleanup_func(
-                StoredFunc(self._cleanup_on_failure), destroy_first=True
-            )
-            return
 
     @call_on_thread(dialog.querying)
     def remove_by_record(self, record: Servers.Record) -> None:
-        self.preserve_on_fail = True
+        res = Servers.query_by_record(record)
-        try:
+        self._parse_single_record(res, delete=True)
-            res = Servers.query_by_record(record)
-            self._parse_single_record(res, delete=True)
-        except Exception as e:
-            logger.warning(e)
-            self.thread_man.set_cleanup_func(
-                StoredFunc(self._cleanup_on_failure), destroy_first=True
-            )
-            return
 
     def update_history(
         self,
@@ -304,6 +279,7 @@ class ServerModelManager:
         proxy_man.update_playercount(self.playercount)
 
     def _parse_single_record(self, response: "A2SInfo", delete: bool = False) -> None:
+        self.preserve_on_fail = True
         try:
             row = response.as_row()
         except Exception as e:
@@ -414,8 +390,6 @@ class ServerModelManager:
     def _cleanup_on_success(self) -> None:
         proxy = self.proxy_man.get_proxy_model()
         self.tv.set_model(proxy)
-        if self.tv.enum == ServerTab.BROWSER:
-            GLib.idle_add(self.tv.wipe_cache)
         if self.preserve_on_fail is True:
             self.proxy_man.wipe_cache()
 
@@ -432,14 +406,12 @@ class ServerModelManager:
         if show_dialog:
             dialog = ExceptionDialog(self.controller, dialogs.load_error_lan)
             dialog.show_all()
-            dialog.run()  # type: ignore[no-untyped-call]
+            dialog.run()
 
     def _cleanup_on_failure(self, show_dialog: bool = True) -> None:
         # TODO: disable map, keyword, and filter widgets if model is None
         # signal driven (servers_empty, servers_failed_to_load)
 
-        self.emitter.emit("servers_timed_out")
-
         if self.preserve_on_fail is False:
             self.tv.set_model(None)
             filter_man = self.tv.get_filter_man()
@@ -451,14 +423,14 @@ class ServerModelManager:
             dialog = ExceptionDialog(self.controller, server_timeout)
             dialog.set_details_buffer(kb.DZG_006)
             dialog.show_all()
-            dialog.run()  # type: ignore[no-untyped-call]
+            dialog.run()
 
     def _push_data(self, data: list[Any]) -> None:
         self._get_proxy_man().push(data)
         self._sort_unique_maps(data)
         self.thread_man.set_cleanup_func(StoredFunc(self._cleanup_on_success))
 
-    def _sort_unique_maps(self, data: list[Any]) -> None:
+    def _sort_unique_maps(self, data: list) -> None:
         u_maps = set([row[1] for row in data])
         self._set_new_maps(sorted(u_maps))
 

dzgui/strings/buttons.py

@@ -1,16 +1,2 @@
-clipboard_button = "Copy to clipboard"
-clipboard_ip_button = "Copy IP to clipboard"
-
-dock_button_collapse = "Collapse the connection panel"
-dock_button_expand = "Expand the connection panel"
-
 workshop = "Steam Workshop"
 workshop_tooltip = "Open your Workshop subscriptions"
-
-version_notifier = "Copied!"
-version_tooltip = "Click to copy to clipboard"
-
-update_button = "Updates available"
-
-unset_button_label = "Unset"
-unset_button_tooltip = "Unset this server as favorite"

dzgui/strings/calc.py

@@ -1,7 +0,0 @@
-heading_local_time = "Local time"
-heading_server_time = "In-game time"
-heading_target_time = "Target time"
-heading_remainder_time = "Remainder until target"
-heading_adjusted_time = "Adjusted local time"
-calculate = "Calculate"
-disclaimer = "Times shown are approximations.\nServer time may differ based on time of year in game."

dzgui/strings/connect_panel.py

@@ -1,22 +1,20 @@
-from dzgui.const.constants import UDP_PORT
+add_button="Add"
-
+add_con_heading="Add/connect"
-add_button = "Add"
-add_con_heading = "Add/connect"
 add_popover = "This address is already in your Saved Servers"
-add_tooltip = "Add to Saved Servers"
+add_tooltip="Add to Saved Servers"
-connect_button = "Connect"
+connect_button="Connect"
-connect_tooltip = "Connect to this server"
+connect_tooltip="Connect to this server"
-connect_entry_placeholder = f"Enter IP:Query port (e.g., 192.168.1.1:{UDP_PORT})"
+connect_entry_placeholder="Enter IP:Query port (e.g., 192.168.1.1:27016)"
 
-fav_heading = "Favorite server"
+fav_heading="Favorite server"
-favs_empty = "None set. Right click a server and select 'Set favorite' to set."
+favs_empty="None set. Right click a server and select 'Set favorite' to set."
 
-lan_heading = "LAN query port"
+lan_heading="LAN query port"
-lan_default_button = f"Default port ({UDP_PORT})"
+lan_default_button="Default port (27016)"
-lan_custom_button = "Custom port"
+lan_custom_button="Custom port"
-lan_scan_button = "Scan"
+lan_scan_button="Scan"
 lan_abort_tooltip = "Unless you have multiple DayZ servers on your LAN,\nleave this checked to get results faster"
 lan_checkbox = "Stop scanning on first hit"
-lan_entry_placeholder = "Enter the query port (1-65535)"
+lan_entry_placeholder="Enter the query port (1-65535)"
-lan_entry_tooltip = "Specify the port to search for DayZ servers on the local network"
+lan_entry_tooltip="Specify the port to search for DayZ servers on the local network"
-lan_scan_tooltip = "Scan for servers"
+lan_scan_tooltip="Scan for servers"

dzgui/strings/dialogs.py

@@ -9,7 +9,6 @@ update_success = "Updated successfully. Please exit and relaunch."
 load_error_lan = "Failed to find any servers on your network.\nCheck the server query port or your firewall settings."
 fetching_mods = "Fetching mod metadata"
 deleting_mods = "Unsubscribing mods"
-validating_mods = "Validating mods"
 scanning_mods = "Scanning mods"
 parsing_mods = "Parsing mods"
 
@@ -24,10 +23,3 @@ custom_mod_dialog = "Set location to a custom mods folder"
 
 debug_heading = "Debug"
 debug_secondary = "Launch arguments"
-
-toggle_calc = "Toggle calculator"
-
-server_details = "Server details"
-server_message = "Server message"
-
-caught_cancel_signal = "Caught cancel signal, cleaning up"

dzgui/strings/errors.py

@@ -4,4 +4,3 @@ api_validation_error = (
 
 api_popover = "API key validation failed."
 dayz_not_found = "Could not find a valid DayZ installation."
-workshop_endpoint_error = "Steam Workshop service unavailable, try again later."

dzgui/strings/filters.py

@@ -1,4 +0,0 @@
-all_maps = "All maps"
-filters_heading = "Filters"
-keyword_placeholder = "Filter by keyword"
-map_placeholder = "Filter by map"

dzgui/strings/generic.py

@@ -1,2 +1 @@
-tab_changed_label = "*"
 selectable_tree = "Ctrl-click to select multiple; Shift-click to select a range."

dzgui/strings/notes.py

@@ -1,5 +0,0 @@
-dialog_title = "Add a short note/reminder"
-dialog_subtitle = "Limit 30 chars"
-delete_button = "Delete note"
-ok_button = "Update note"
-current_note = "Current note: '{0}'"

dzgui/strings/options.py

@@ -16,13 +16,4 @@ lan_combo = "LAN"
 fullscreen_eventbox = "This option is not available on Steam Deck."
 save_button = "Save"
 
-api_placeholder = "Enter API key"
 api_failed = "API validation failed"
-api_validate = "Validate"
-
-flatpak_label = "Flatpak client"
-flatpak_standard = "Standard"
-flatpak_container = "Containerized (flatpak-spawn --host)"
-flatpak_info = (
-    "Containerized mode is used on certain distributions. May have side effects."
-)

dzgui/strings/preconnect.py

@@ -11,6 +11,8 @@ mods = "Mods"
 total_mods = "Total mods: "
 up_to_date = "All mods are up to date."
 all_updated = "All mods updated."
+"If you recently installed {build} or moved it to a different drive, "
+"restart Steam to allow these changes to synchronize, then try again."
 required_space = " Need to download {0} MiB of mod updates."
 
 placeholder_no_mods = "This server has no mods."
@@ -34,7 +36,6 @@ steam_not_running = "'{0}' is set as the default Steam client, but it is either
 use_desktop_mode = "Use Desktop Mode to download mods on Steam Deck."
 version_mismatch = "Local client version '{0}' does not match remote version '{1}'."
 version_missing = "Remote server is running the build '{0}', but it is not installed."
-no_errors = "No errors."
 
 
 # Warnings
@@ -47,7 +48,3 @@ running_app = (
     "Either stop the game first, or update your global Steam settings or the game's local settings.\n"
     "Otherwise, mods may be queued for download but never update."
 )
-downloads_paused = (
-    "It looks like DayZ may have a pending update on Steam that was paused.\n"
-    "To enqueue mods for download, unpause any pending DayZ update and allow it to complete."
-)

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/strings/server_mods.py

@@ -3,5 +3,4 @@ mod_id = "ID"
 up_to_date = "Up to date"
 modlist = "Modlist"
 checkmark = "✓"
-resync = "⟳"
+resync="⟳"
-invalid_mod = "Invalid mod"

dzgui/strings/uninstall.py

@@ -30,8 +30,7 @@ path_remove_prefix = "The following path will be removed:"
 not_installed = "It looks like DZGUI was not previously set up; nothing to uninstall."
 standalone_uninstall = (
     "It looks like you are running the standalone version of DZGUI.\n"
-    "To finalize the uninstall process, invoke './dzgui self remove',\n"
+    "To finalize the uninstall process, you can remove the 'dzgui' file."
-    "then remove the 'dzgui' file."
 )
 system_uninstall = (
     "It looks like DZGUI was installed via your system package manager or directly from source code.\n"

dzgui/strings/wizard.py

@@ -3,8 +3,6 @@ title_intro = "Welcome"
 blurb_intro = """
 This wizard will help you set up some common config options before launching the application.
 """
-error_sandbox = "Setup cannot be run from inside Flatpak sandbox.\nPlease launch the application directly."
-welcome = "Welcome to {0}!"
 
 ### SteamPathPage
 heading_steam_path = "Steam path"
@@ -19,7 +17,7 @@ desc_flatpak_path = (
 desc_ubuntu_path = "This is the default Steam path on <b>Ubuntu-based systems</b>."
 desc_debian_path = "This is the default Steam path on <b>Debian-based systems</b>."
 no_valid_paths = (
-    "No valid Steam path or Steam command found on system. Please install Steam to continue."
+    "No valid Steam paths found on system. Please install Steam to continue."
 )
 button_scan = "Scan for Steam"
 
@@ -72,8 +70,7 @@ checkbox_steam_shortcut = (
     (
         "This creates a standalone copy of DZGUI and adds it to Steam. "
         "You <b>must restart Steam</b> for the shortcut to appear. This will not replace or update existing shortcuts. "
-        "If you update DZGUI when it is launched via Steam, updates will be applied to the Steam version. "
+        "If you update DZGUI when it is launched via Steam, updates will be applied to the Steam version."
-        "Not available if you selected the Flatpak client as your Steam default."
     ),
 )
 checkbox_start_menu = (
@@ -82,17 +79,6 @@ checkbox_start_menu = (
 )
 checkbox_desktop_shortcut = ("Add a desktop shortcut", "Depends on the option above.")
 
-### Flatpak page
-heading_flatpak = "Flatpak sandbox overrides"
-blurb_flatpak = (
-    "You chose to add a shortcut directly to Flatpak Steam. "
-    "To launch DZGUI from Flatpak's sandbox, you must grant "
-    "permission to read from and write to the following locations."
-)
-tree_column = "Paths"
-overrides_applied = "Overrides applied."
-button_flatpak = "Grant permissions"
-
 ### Completion page
 heading_completion = "Setup complete"
 blurb_completion = "Configuration completed successfully. Click 'Close' to close this dialog and launch DZGUI."

dzgui/util/bash.py

@@ -1,12 +1,5 @@
 import shlex
 
-from dzgui.const.constants import STEAM_CMD
-from dzgui.init.proc import is_sandboxed
-
 
 def concat_bash_args(command: str) -> list[str]:
-    # NOTE: NSGs spawned from sandbox cannot access host application commands,
-    # so fallback to Steam internal URIs
-    if is_sandboxed():
-        return [STEAM_CMD]
     return shlex.split(command)

dzgui/util/clip.py

@@ -1,7 +1,8 @@
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
+gi.require_version("Gdk", "3.0")
+from gi.repository import Gtk, Gdk  # noqa E402
 
 
 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
+from gi.repository import Gtk, Gdk  # noqa E402
 
 
 def add_class(widget: Gtk.Widget, label: str) -> None:

dzgui/util/dist.py

@@ -7,6 +7,11 @@ 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
@@ -54,7 +59,7 @@ class CalcDist:
         self,
         addr: str,
         enum: "ServerTab",
-        result_queue: "Queue[tuple[str, Haversine | None, ServerTab]]",
+        result_queue: "Queue",
         controller: "Controller",
         cache: dict[str, Haversine],
     ) -> None:
@@ -67,7 +72,7 @@ class CalcDist:
         self.ip = self.addr
 
         dist = self.compare(self.ip)
-        self.result_queue.put((self.addr, dist, self.enum))
+        self.result_queue.put([self.addr, dist, self.enum])
 
     def compare(self, remote_ip: str) -> Haversine | None:
         prefs = self.controller.get_prefs()
@@ -75,10 +80,10 @@ class CalcDist:
         if local is None:
             return None
         try:
-            remote = get_coords(prefs.paths.db, remote_ip)
+            remote = get_coords(prefs.paths.ips, remote_ip)
-        except Exception as e:
+        except Exception:
-            logger.critical(e)
             return None
 
+        # TODO: handle failed remote dist
         haversine = Haversine(local.lat, local.lon, remote.lat, remote.lon)
         return haversine

dzgui/util/flatpak.py

@@ -1,39 +0,0 @@
-import logging
-import subprocess
-
-from typing import TYPE_CHECKING
-from dzgui.const.constants import APP_NAME, FLATPAK_APPID, GTK_APP_ID, TMP_PATH
-
-logger = logging.getLogger(APP_NAME)
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-
-def apply_overrides(xdg: dict[str, "Path"]) -> None:
-    try:
-        # NOTE: D-Bus registration required for sandbox
-        args = [
-            "flatpak",
-            "--user",
-            "override",
-            f"--own-name={GTK_APP_ID}",
-            FLATPAK_APPID,
-        ]
-        subprocess.run([*args], capture_output=True)
-
-        paths: list[str] = []
-        paths.extend([str(path) for path in xdg.values()])
-        paths.append(TMP_PATH)
-
-        for path in paths:
-            args = [
-                "flatpak",
-                "--user",
-                "override",
-                f"--filesystem={path}",
-                FLATPAK_APPID,
-            ]
-            subprocess.run([*args], capture_output=True)
-    except Exception as e:
-        logger.critical(e)

dzgui/util/format.py

@@ -1,5 +1,4 @@
 import re
-from typing import Any
 
 from dzgui.util.localize import number
 from dzgui.strings.generic import selectable_tree
@@ -8,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
+from gi.repository import Gtk  # noqa E402
 
 
 def format_pango(text: str) -> str:
@@ -61,7 +60,7 @@ def format_server_mods(mods: int) -> str:
     return f"Found {mods:n} {plural}. {workshop}"
 
 
-def format_player_count(model: Gtk.TreeModel | None, control: list[Any]) -> str:
+def format_player_count(model: Gtk.TreeModel | None, control: list) -> str:
     players = 0
     hits: int
     status: str

dzgui/util/ip.py

@@ -1,16 +1,15 @@
 import a2s
-from ipaddress import ip_address
 import requests
 import shutil
 import subprocess
+from warnings import deprecated
 
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from dzgui.api.servers import Record
-from dzgui.config.ipdb import read_from_table
 from dzgui.const.constants import REQUEST_TIMEOUT
-from dzgui.const.endpoints import IP_ECHO
+from dzgui.const.endpoints import COORDS_API, IP_ECHO
 
 
 if TYPE_CHECKING:
@@ -31,25 +30,58 @@ class ReservedIPError(Exception):
     pass
 
 
-def ip2list(ip: str) -> list[int]:
+def ip2list(ip: str) -> list:
     return [int(digit) for digit in ip.split(".")]
 
 
-def is_usable(ip: str) -> bool:
+# TODO: tests
-    address = ip_address(ip)
+def is_reserved(digits: list) -> bool:
-    if address.is_reserved or address.is_private:
+    reserved = [0, 10, 127]
-        return False
+
-    return True
+    if digits[0] in reserved:
+        return True
+    if digits[0] == 192 and digits[1] == 168:
+        return True
+    return False
 
 
-def get_coords(db_path: "Path", ip: str) -> Coords:
+def get_coords(ips: "Path", ip: str) -> Coords:
-    if not is_usable(ip):
+    split = ip2list(ip)
+
+    if is_reserved(split):
         raise ReservedIPError(f"{ip} is a reserved IP address.")
-    try:
+
-        lat, lon = read_from_table(db_path, ip)
+    prefix = f"^{split[0]}.{split[1]}."
-        return Coords(lat, lon)
+
-    except Exception:
+    if shutil.which("rg") is not None:
-        raise GeolocationError("No matching records found")
+        args = ["/usr/bin/rg", prefix, str(ips)]
+    else:
+        args = ["/usr/bin/grep", "-E", prefix, str(ips)]
+    proc = subprocess.run(args, capture_output=True, text=True)
+
+    if proc.returncode != 0:
+        raise GeolocationError("Failed to split records")
+
+    ip_list = proc.stdout.splitlines()
+
+    for address in ip_list:
+        fields = address.split(",")
+        upper = fields[1]
+
+        upper_digits = ip2list(upper)
+        if ip == upper:
+            return Coords(float(fields[-2]), float(fields[-1]))
+
+        if split[2] > upper_digits[2]:
+            continue
+
+        if split[2] == upper_digits[2]:
+            if split[3] > upper_digits[3]:
+                continue
+
+        if split[2] <= upper_digits[2]:
+            return Coords(float(fields[-2]), float(fields[-1]))
+    raise GeolocationError("No matching records found")
 
 
 def get_local_ip() -> str:
@@ -95,3 +127,10 @@ def is_valid_port(port: str) -> bool:
     if not port.isdigit() or int(port) == 0 or int(port[0]) == 0 or int(port) > 65535:
         return True
     return False
+
+
+@deprecated("use ips.csv")
+def get_local_coords(ip: str) -> str:
+    url = COORDS_API + "/" + ip
+    # local res=$(curl -Ls "$url" | jq -r '"\(.lat)\n\(.lon)"')
+    return url

dzgui/util/keys.py

@@ -1,8 +1,6 @@
 import gi
-
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk
+from gi.repository import Gdk  # noqa E402
-
 
 def is_navkey(key: int) -> bool:
     nav_keys = [
@@ -20,7 +18,6 @@ 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,8 +1,6 @@
 import gi
-
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
-
 
 def set_surrounding_margins(widget: Gtk.Widget, margin: int) -> None:
     """

dzgui/util/save_screenshot.py

@@ -1,80 +0,0 @@
-from pathlib import Path
-from typing import cast, TYPE_CHECKING
-
-import gi
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, GLib
-
-if TYPE_CHECKING:
-    from dzgui.controllers.mc import Controller
-    from dzgui.views.base import OuterWindow
-    from dzgui.views.mixins.context_mixin import ContextMixin
-    from gi.repository import GdkPixbuf
-
-# TODO: randomize/mock PII distance values
-
-
-class IdleScreenshot:
-    def __init__(
-        self, controller: "Controller", window: "OuterWindow", scrot_path: Path
-    ) -> None:
-        self.window = window
-        self.controller = controller
-        self.scrot_path = scrot_path
-
-        clock = window.get_frame_clock()
-        if clock is None:
-            raise TypeError("Widget not realized, FrameClock not initialized")
-        clock.connect("after-paint", self.callback)
-
-    def callback(self, clock: Gdk.FrameClock) -> None:
-        GLib.timeout_add(1000, self.check_idle)
-
-    def check_idle(self) -> bool:
-        tv = self.controller.get_active_treeview()
-        loaded = tv.is_loaded()
-        if loaded is True:
-            self.emit_key_press(tv)
-            GLib.timeout_add(1000, self.save_and_quit)
-            return True
-        return False
-
-    def emit_key_press(self, widget: "ContextMixin") -> None:
-        window = widget.get_parent_window()
-        if window is None:
-            raise TypeError(f"Failed to find a valid parent window for {widget}")
-        event = Gdk.EventKey.new(Gdk.EventType.KEY_PRESS)
-        # NOTE: GTK introspection returns Gdk.Event type
-        event_key = cast(Gdk.EventKey, event)
-        event_key.keyval = Gdk.KEY_l
-        event_key.state = Gdk.ModifierType.CONTROL_MASK
-        event_key.window = window
-        event_key.time = Gdk.CURRENT_TIME
-        event_key.send_event = True
-        # TODO: suppress errors from synthetic key events
-        widget.present_menu(widget, event)
-
-    def save_and_quit(self) -> None:
-        self.save_pixbuf()
-        self.controller.save_res_and_quit()
-
-    def save_pixbuf(self) -> None:
-        pixbuf = self.capture_application()
-        if pixbuf:
-            pixbuf.savev(str(self.scrot_path), "png", [], [])
-
-    def capture_application(self) -> "GdkPixbuf.Pixbuf":
-        # NOTE: composited context menu over X11 window
-        root = Gdk.get_default_root_window()
-
-        xwindow = self.window.get_window()
-        if xwindow is None:
-            raise ValueError("Failed to get a valid X11 window")
-        index, x, y = xwindow.get_origin()
-        width, height = self.window.get_size()
-
-        application = Gdk.pixbuf_get_from_window(root, x, y, width, height)
-        if application is None:
-            raise ValueError("Failed to get a valid GdkPixbuf")
-        return application

dzgui/util/strings.py

@@ -11,6 +11,7 @@ delimiter = "␞"
 # GenericDialog
 main_menu = "Return to main menu"
 exit_app = "Exit"
+server_details = "Server details"
 modlist = "Modlist"
 input_required = "User input required"
 confirm = "Confirmation"
@@ -31,7 +32,6 @@ show_details = "Show server details"
 refresh_players = "Refresh player count"
 open_workshop = "Open in Steam Workshop"
 unsub_mod = "Unsubscribe mod"
-validate_mod = "Validate mod"
 copy_name = "Copy name to clipboard"
 copy_ip = "Copy IP to clipboard"
 copy_log = "Copy record(s) to clipboard"
@@ -59,6 +59,7 @@ browser_cols = [
 ]
 
 # DetailsDialog
+server_message = "Server message"
 workshop = "Enter/double click a row to open in Steam Workshop."
 
 # LanDialog
@@ -118,7 +119,6 @@ servers = {
     "0": "toggle filter 10",
     "Minus": "toggle filter 11",
     "Backslash": "toggle filter 12",
-    "Apostrophe": "toggle filter 13",
 }
 vim = {
     "j": "Move down a row/scroll up",
@@ -158,7 +158,9 @@ filter_duplicate = "Duplicate"
 filter_official = "Official"
 filter_unofficial = "Unofficial"
 filter_modded = "Modded"
-filter_unmodded = "Unmodded"
+
+# maps
+all_maps = "All maps"
 
 # state
 unknown = "Unknown"
@@ -166,12 +168,11 @@ none_provided = "None provided"
 disabled = "Disabled"
 enabled = "Enabled"
 null = "-"
+none = "None"
 unspecified = "not specified"
 
 # DLC
 dlc_frostline = "Frostline"
-dlc_badlands = "Badlands"
-dlc_none = "None"
 
 # platform
 windows = "Windows"
@@ -199,8 +200,6 @@ class ModPanelStrings:
     clear_highlights: str
     select_stale: str
     select_stale_tooltip: str
-    validate: str
-    validate_tooltip: str
 
 
 @dataclass(slots=True, frozen=True)
@@ -250,7 +249,6 @@ class Crumbs:
     developers: str
     default: str
     offline: str
-    connect: str
 
 
 @dataclass(slots=True, frozen=True)
@@ -299,7 +297,7 @@ class Options:
 init = Init(
     is_steam_running="Is Steam running? DZGUI must be run on top of Steam.",
     is_dayz_running="Is DayZ already running? DZGUI cannot launch DayZ if another process is using it.",
-    requires_steam="Your chosen client (Steam/Flatpak Steam) must be installed on the system.",
+    requires_steam="DZGUI requires that Steam or Flatpak Steam be installed on the system.",
 )
 
 mod_panel = ModPanelStrings(
@@ -321,8 +319,6 @@ mod_panel = ModPanelStrings(
     clear_highlights="Clears highlights and reverts the table to a default state",
     select_stale="Select stale",
     select_stale_tooltip="Only selects highlighted stale mods",
-    validate="Validate selected",
-    validate_tooltip="Validates selected mods and updates them if necessary",
 )
 
 
@@ -438,7 +434,6 @@ crumbs = Crumbs(
     developers="Options > Developers",
     default="Servers > ",
     offline="Mods > Play offline",
-    connect="Connect",
 )
 
 no_mods = "No local mods found."

dzgui/util/symlink.py

@@ -2,12 +2,7 @@ import logging
 from pathlib import Path
 
 from dzgui.api.mods import get_local_mod_path, get_local_mod_ids, _hash
-from dzgui.const.constants import (
+from dzgui.const.constants import APPID_DAYZ, APPID_DAYZ_EXP, APP_NAME, DAYZ_COMMUNITY_ROOT
-    APPID_DAYZ,
-    APPID_DAYZ_EXP,
-    APP_NAME,
-    DAYZ_COMMUNITY_ROOT,
-)
 from dzgui.const.enum import Preferences
 from dzgui.config.query import lookup
 
@@ -25,7 +20,6 @@ def expunge_link(file: Path) -> None:
     if str(file.stem)[:2] == "@C":
         file.unlink()
 
-
 def rebuild_symlinks(config: Path) -> None:
     # TODO: pass direct path as argument
     path = lookup(config, Preferences.DEFAULT)
@@ -69,9 +63,10 @@ def symlink_mission(steam_path: Path, target: str) -> str:
     stem = path.name
     parent = path.parent
     source = dayz_path.joinpath(DAYZ_COMMUNITY_ROOT)
-    if source.exists():
+    try:
-        source.unlink()
+        source.symlink_to(parent)
-    source.symlink_to(parent)
+    except Exception:
+        return ""
     return f"{DAYZ_COMMUNITY_ROOT}/{stem}"
 
 

dzgui/views/base.py

@@ -1,17 +1,19 @@
 import logging
 import signal
+import warnings
 
-from typing import Any, Literal, Self, TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal, Self
 
 from dzgui.const.constants import (
     APP_NAME,
     APP_NAME_LOWER,
     GTK_APP_ID,
+    STEAM_ICON,
 )
 from dzgui.const.enum import NotebookPage
 from dzgui.controllers.emitter import Emitter
 from dzgui.controllers.mc import Controller
-from dzgui.util import css
+from dzgui.util import css, strings
 from dzgui.util.keys import is_ctrl_mask
 from dzgui.views.components.connect_panel import ConnectPanel
 from dzgui.views.components.crumbs import Breadcrumbs
@@ -38,16 +40,20 @@ import gi
 
 gi.require_version("Gtk", "3.0")
 gi.require_version("GLibUnix", "2.0")
-from gi.repository import Gtk, GLib, GLibUnix, Gdk  # type: ignore
+from gi.repository import Gtk, GLib, GLibUnix, Gdk  # type: ignore # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.config.userprefs import UserPrefs
 
 logger = logging.getLogger(APP_NAME)
 
+# TODO: drop
+# https://bugzilla.gnome.org/show_bug.cgi?id=708676
+warnings.filterwarnings("ignore", ".*g_value_get_int", Warning)
+
 
 class OuterWindow(Gtk.ApplicationWindow):
-    def __init__(self, app: "App") -> None:
+    def __init__(self, app: Gtk.Application) -> None:
         super().__init__(
             application=app, title=APP_NAME, border_width=10, icon_name=APP_NAME_LOWER
         )
@@ -78,15 +84,6 @@ class OuterWindow(Gtk.ApplicationWindow):
         MainController.loaded = True
         MainController.populate_model(MainController.get_active_treeview())
 
-        try:
-            from dzgui.util.save_screenshot import IdleScreenshot
-
-            scrot = app.get_automation_param("screenshot_path")
-            self.fullscreen()
-            IdleScreenshot(MainController, self, scrot)
-        except KeyError:
-            pass
-
     def _on_delete_event(self, window: "OuterWindow", event: Gdk.EventKey) -> None:
         self.halt_proc_and_quit()
 
@@ -300,14 +297,6 @@ class App(ColorAwareApp, Gtk.Application):  # type: ignore
         self._setup_signals()
         self.connect("activate", self._on_activate)
 
-        self.automation_params: dict[str, Any] = {}
-
-    def get_automation_param(self, key: str) -> Any:
-        return self.automation_params[key]
-
-    def set_automation_param(self, key: str, value: Any) -> None:
-        self.automation_params[key] = value
-
     def _on_activate(self, app: Self) -> None:
         self.win = OuterWindow(app)
 
@@ -350,3 +339,13 @@ class App(ColorAwareApp, Gtk.Application):  # type: ignore
 
 
 MainController = Controller()
+
+try:
+    theme = Gtk.IconTheme.get_default()
+    icons = theme.list_icons(None)
+    if STEAM_ICON not in icons:
+        logger.warn(strings.steam_icon_missing)
+        warnings.warn(strings.steam_icon_missing, stacklevel=2)
+except Exception as e:
+    logger.warning(e)
+    warnings.warn(strings.gtk_theme_missing, stacklevel=2)

dzgui/views/components/box.py

@@ -24,7 +24,6 @@ class VBox(GenericBox):
     def __init__(self, spacing: int = 0) -> None:
         super().__init__(orientation=Gtk.Orientation.VERTICAL, spacing=spacing)
 
-
 class ShortHBox(HBox):
     def __init__(self, widget: Gtk.Widget) -> None:
         super().__init__(spacing=5)

dzgui/views/components/buttonbox.py

@@ -1,13 +1,13 @@
 import logging
 from typing import TYPE_CHECKING
 
-from dzgui.const.constants import APP_NAME
+from dzgui.const.constants import APP_NAME, NO_EXPAND, NO_FILL, NO_PADDING
 from dzgui.const.enum import ButtonType
 
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk, Gdk  # noqa E402
 
 logger = logging.getLogger(APP_NAME)
 
@@ -19,11 +19,7 @@ if TYPE_CHECKING:
 
 class ContextualButton(Gtk.Button):
     def __init__(
-        self,
+        self, label: str, opens: "NotebookPage", tooltip: str, context: ButtonType
-        label: str,
-        opens: "NotebookPage | None",
-        tooltip: str,
-        context: ButtonType,
     ) -> None:
         super().__init__(
             label=label,
@@ -55,9 +51,9 @@ class ButtonBox(Gtk.Box):
 
         for side_button in ButtonType:
             button = ContextualButton(
-                label=side_button.label,
+                label=side_button.dict["label"],
-                opens=side_button.opens,
+                opens=side_button.dict["opens"],
-                tooltip=side_button.tooltip,
+                tooltip=side_button.dict["tooltip"],
                 context=side_button,
             )
 
@@ -67,7 +63,7 @@ class ButtonBox(Gtk.Box):
 
             self.buttons.append(button)
             button.connect("clicked", self._on_selection_button_clicked)
-            self.pack_start(button, expand=False, fill=False, padding=0)
+            self.pack_start(button, NO_EXPAND, NO_FILL, NO_PADDING)
 
     def _focus_first_button(self, emitter: "Emitter") -> None:
         self.buttons[0].grab_focus()

dzgui/views/components/buttons.py

@@ -1,25 +1,28 @@
 from typing import Callable, Literal, Self, TYPE_CHECKING, Union
 
 from dzgui.util.clip import copy_clipboard
+from dzgui.util.format import pluralize
 from dzgui.strings import buttons
 from dzgui.util.strings import (
+    alert_button_tooltip,
     atomic_buttons,
 )
-from dzgui.const.icons import (
+from dzgui.const.constants import (
-    ICON_CLIPBOARD,
+    CLIPBOARD,
-    ICON_CLOSE,
+    CLOSE,
-    ICON_INPUT_KEYBOARD,
+    INPUT_KEYBOARD,
-    ICON_LIST_ADD,
+    LIST_ADD,
-    ICON_REFRESH,
+    REFRESH_ICON,
-    ICON_STEAM,
+    STEAM_ICON,
-    ICON_WEB_BROWSER,
+    WARNING,
+    WEB_BROWSER,
 )
 from dzgui.strings import connect_panel
 
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib
+from gi.repository import Gtk, Gdk, GLib  # noqa E402
 
 if TYPE_CHECKING:
     from gi.repository import GLib
@@ -61,8 +64,7 @@ class IconButton(Gtk.Button):
         self.icon = Icon(icon, margin_start=margin_start, margin_end=margin_end)
         self.set_image(self.icon)
         self.set_image_position(position)
-        self.set_focus_on_click(False)  # type: ignore[no-untyped-call]
+        self.set_focus_on_click(False)
-        self.set_always_show_image(True)
 
     def swap_icon(self, icon: str) -> None:
         start = self.icon.get_margin_start()
@@ -98,13 +100,15 @@ class LargeIconTextButton(IconButton):
 
 
 class ClipboardButton(IconTextButton):
-    def __init__(self, func: Callable[[], str]) -> None:
+    def __init__(self, controller: Union["Controller", None], func: Callable) -> None:
-        super().__init__(ICON_CLIPBOARD, atomic_buttons.copy)
+        super().__init__(CLIPBOARD, atomic_buttons.copy)
+        self.controller = controller
         self.connect("clicked", self._on_button_clicked, func)
 
-        self.set_tooltip_text(buttons.clipboard_button)
+        # TODO: strings
+        self.set_tooltip_text("Copy to clipboard")
 
-    def _on_button_clicked(self, button: Self, func: Callable[[], str]) -> None:
+    def _on_button_clicked(self, button: Self, func: Callable) -> None:
         def revert() -> Literal[False]:
             self.revert_icon()
             return False
@@ -115,30 +119,33 @@ class ClipboardButton(IconTextButton):
         GLib.timeout_add(600, revert)
 
 
+# TODO: determine when controller would be passed to this button or drop
 class CopyIpButton(ClipboardButton):
-    def __init__(self, func: Callable[[], str]) -> None:
+    def __init__(self, controller: Union["Controller", None], func: Callable) -> None:
-        super().__init__(func)
+        super().__init__(controller, func)
 
-        self.set_tooltip_text(buttons.clipboard_ip_button)
+        # TODO: strings
+        self.set_tooltip_text("Copy IP to clipboard")
 
 
 class CloseButton(IconTextButton):
     def __init__(self, label: str) -> None:
-        super().__init__(icon=ICON_CLOSE, label=label)
+        super().__init__(icon=CLOSE, label=label)
 
-        self.set_tooltip_text(buttons.unset_button_tooltip)
+        # TODO: strings
+        self.set_tooltip_text("Unset this server as favorite")
 
 
 class WebButton(IconTextButton):
     def __init__(self, label: str) -> None:
-        super().__init__(icon=ICON_WEB_BROWSER, label=label)
+        super().__init__(icon=WEB_BROWSER, label=label)
         pass
 
 
 class RefreshButton(IconTextButton):
     def __init__(self, controller: "Controller") -> None:
         super().__init__(
-            icon=ICON_REFRESH,
+            icon=REFRESH_ICON,
             label=atomic_buttons.refresh,
         )
 
@@ -155,24 +162,18 @@ class RefreshButton(IconTextButton):
         self.set_tooltip_text(atomic_buttons.refresh_tooltip)
 
         self.connect("clicked", self._on_refresh_clicked)
-        emitter.connect("servers_loaded", self._on_load)
+        emitter.connect("servers_loaded", self.start_decrement)
-        emitter.connect("servers_timed_out", self._on_timeout)
-
-    def _on_timeout(self, emitter: "Emitter") -> None:
-        self.is_clicked = True
-        self.start_decrement()
-
-    def _on_load(self, emitter: "Emitter", tab: "ServerTab") -> None:
-        self.start_decrement()
 
     def _on_refresh_clicked(self, button: Self) -> None:
         """Spawned in a thread"""
+        if self.controller.get_active_treeview().is_loaded() is False:
+            return
         self.is_clicked = True
         self.controller.refresh_tree()
         # TODO: get server tab enum
         # if LAN tab, reload existing entries in place
 
-    def start_decrement(self) -> None:
+    def start_decrement(self, emitter: "Emitter", tab: "ServerTab") -> None:
         if self.is_clicked is False:
             return
         if self.loading:
@@ -203,7 +204,7 @@ class RefreshButton(IconTextButton):
 
 class KeysButton(IconTextButton):
     def __init__(self, controller: "Controller") -> None:
-        super().__init__(icon=ICON_INPUT_KEYBOARD, label=atomic_buttons.keys)
+        super().__init__(icon=INPUT_KEYBOARD, label=atomic_buttons.keys)
 
         self.controller = controller
         self.set_margin_top(10)
@@ -220,7 +221,7 @@ class KeysButton(IconTextButton):
 
 class SteamConnectButton(LargeIconTextButton):
     def __init__(self) -> None:
-        super().__init__(icon=ICON_STEAM, label=connect_panel.connect_button)
+        super().__init__(icon=STEAM_ICON, label=connect_panel.connect_button)
         self.set_tooltip_text(connect_panel.connect_tooltip)
 
 
@@ -240,10 +241,33 @@ class SteamWorkshopButton(SteamTextButton):
 
 class AddButton(IconTextButton):
     def __init__(self) -> None:
-        super().__init__(icon=ICON_LIST_ADD, label=connect_panel.add_button)
+        super().__init__(icon=LIST_ADD, label=connect_panel.add_button)
         self.set_tooltip_text(connect_panel.add_tooltip)
 
 
+class LoggerAlertsButton(IconTextButton):
+    def __init__(self, warnings: int, errors: int) -> None:
+        warnings_text = ""
+        errors_text = ""
+        separator = ""
+        if warnings > 0:
+            warnings_plural = pluralize("warnings", warnings)
+            warnings_text = f"{warnings} {warnings_plural}"
+        if errors > 0:
+            errors_plural = pluralize("errors", errors)
+            errors_text = f" {errors} {errors_plural}"
+        if warnings + errors > 1:
+            separator = ","
+        concat = warnings_text + separator + errors_text
+        super().__init__(
+            icon=WARNING,
+            label=f"Loaded with{concat}",
+        )
+        self.set_halign(Gtk.Align.END)
+        self.set_hexpand(True)
+        self.set_tooltip_text(alert_button_tooltip)
+
+
 class SpinnerButton(Gtk.Button):
     def __init__(self, label: str) -> None:
         super().__init__()

dzgui/views/components/connect_panel.py

@@ -1,14 +1,8 @@
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.icons import ICON_CARET_DOWN, ICON_CARET_UP
+from dzgui.const.constants import CARET_DOWN, CARET_UP, UDP_PORT
-from dzgui.const.constants import UDP_PORT
 from dzgui.model.servers import ServerModelManager
 from dzgui.strings import connect_panel
-from dzgui.strings.buttons import (
-    dock_button_collapse,
-    dock_button_expand,
-    unset_button_label,
-)
 from dzgui.util.keys import is_ctrl_mask
 from dzgui.views.components.buttons import (
     AddButton,
@@ -24,7 +18,7 @@ from dzgui.views.components.labels import BoldLabel
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk, Gdk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -36,24 +30,27 @@ ROWS = 1
 
 class DockButton(IconButton):
     def __init__(self, child: Gtk.Widget) -> None:
-        super().__init__(ICON_CARET_DOWN)
+        super().__init__(CARET_DOWN)
 
         self.expanded = True
         self.child = child
         self.connect("clicked", self._on_click)
 
+        self.collapse_text = "Collapse the connection panel"
+        self.expand_text = "Expand the connection panel"
+
         self.set_margin_top(10)
-        self.set_tooltip_text(dock_button_collapse)
+        self.set_tooltip_text(self.collapse_text)
 
     def collapse(self) -> None:
-        self.set_image(Icon(ICON_CARET_UP))
+        self.set_image(Icon(CARET_UP))
         self.child.hide()
-        self.set_tooltip_text(dock_button_expand)
+        self.set_tooltip_text(self.expand_text)
 
     def expand(self) -> None:
-        self.set_image(Icon(ICON_CARET_DOWN))
+        self.set_image(Icon(CARET_DOWN))
         self.child.show()
-        self.set_tooltip_text(dock_button_collapse)
+        self.set_tooltip_text(self.collapse_text)
 
     def _on_click(self, button: Self) -> None:
         if self.expanded:
@@ -84,6 +81,7 @@ class LanPanel(Gtk.Frame):
         self.scan = Gtk.Button(label=connect_panel.lan_scan_button)
         self.scan.connect("clicked", self._on_scan_clicked)
 
+        # TODO: strings
         self.early_abort = Gtk.CheckButton(label=connect_panel.lan_checkbox)
         self.early_abort.set_active(True)
         self.early_abort.set_tooltip_text(connect_panel.lan_abort_tooltip)
@@ -189,9 +187,10 @@ class FavPanel(Gtk.Frame):
 
         self.fav_button = SteamConnectButton()
         self.fav_button.connect("clicked", self._on_connect_clicked)
-        self.copy_button = CopyIpButton(self.get_fav_ip)
+        self.copy_button = CopyIpButton(self.controller, self.get_fav_ip)
 
-        self.unset_button = CloseButton(unset_button_label)
+        # TODO: strings
+        self.unset_button = CloseButton("Unset")
         self.unset_button.connect("clicked", self._on_unset_clicked)
 
         if favorite is None:

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
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 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

@@ -1,16 +1,15 @@
 from typing import Any, Callable, TYPE_CHECKING
 
 from dzgui.api.servers import validate_ip
-from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
+from dzgui.const.constants import VIEW_CONCEAL, VIEW_REVEAL
 from dzgui.util.css import add_class, remove_class
 from dzgui.strings import connect_panel
-from dzgui.strings.options import api_placeholder, api_validate
 from dzgui.strings.errors import api_popover
 
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GObject
+from gi.repository import Gtk, Gdk, GObject  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -39,7 +38,7 @@ class ValidatedEntry(Gtk.Entry):
     def __init__(
         self,
         controller: "Controller",
-        func: Callable[[str], bool],
+        func: Callable,
         placeholder_text: str = "",
         tooltip_text: str = "",
     ) -> None:
@@ -47,6 +46,7 @@ class ValidatedEntry(Gtk.Entry):
             hexpand=True, placeholder_text=placeholder_text, tooltip_text=tooltip_text
         )
 
+        self.func: Callable
         self.set_validation_func(func)
         self.controller = controller
 
@@ -72,7 +72,7 @@ class ValidatedEntry(Gtk.Entry):
         self.emit("string_validated", False)
         remove_class(self, self.classname)
 
-    def set_validation_func(self, func: Callable[[str], bool]) -> None:
+    def set_validation_func(self, func: Callable) -> None:
         self.func = func
 
     def insert_icon(self) -> None:
@@ -141,19 +141,21 @@ class APIEntry(Gtk.Box):
     def __init__(self) -> None:
         super().__init__(orientation=Gtk.Orientation.HORIZONTAL, spacing=10)
 
-        self.func: Callable[[str], None] | None = None
+        self.func: Callable | None = None
 
+        # TODO: strings
         self.entry = Gtk.Entry(
-            width_chars=60, hexpand=True, placeholder_text=api_placeholder
+            width_chars=60, hexpand=True, placeholder_text="Enter API key"
         )
-        self.entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, ICON_VIEW_REVEAL)
+        self.entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, VIEW_REVEAL)
         self.entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
         self.entry.set_visibility(False)
         self.entry.connect("changed", self._on_text_changed)
         self.entry.connect("icon-release", self._on_icon_release)
         self.entry.connect("activate", self._on_field_activated)
 
-        self.submit = Gtk.Button(label=api_validate)
+        # TODO: strings
+        self.submit = Gtk.Button(label="Validate")
         self.submit.set_sensitive(False)
         self.submit.connect("clicked", self._on_submit)
 
@@ -204,9 +206,9 @@ class APIEntry(Gtk.Box):
     ) -> None:
         visible = widget.get_visibility()
         if visible:
-            icon, state = ICON_VIEW_REVEAL, False
+            icon, state = VIEW_REVEAL, False
         else:
-            icon, state = ICON_VIEW_CONCEAL, True
+            icon, state = VIEW_CONCEAL, True
         widget.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon)
         widget.set_visibility(state)
 
@@ -220,7 +222,7 @@ class APIEntry(Gtk.Box):
         res = self.func(text)
         return res
 
-    def set_validation_func(self, func: Callable[[str], None] | None) -> None:
+    def set_validation_func(self, func: Callable | None) -> None:
         self.func = func
 
     def disable_button(self) -> None:

dzgui/views/components/eventbox.py

@@ -1,12 +1,12 @@
 from typing import TYPE_CHECKING
 
 from dzgui.const.enum import NotebookPage
-from dzgui.const.icons import ICON_HELP_BUBBLE
+from dzgui.const.constants import HELP_BUBBLE
 
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk, Gdk  # noqa E402
 
 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(
-            ICON_HELP_BUBBLE, Gtk.IconSize.LARGE_TOOLBAR
+            HELP_BUBBLE, Gtk.IconSize.LARGE_TOOLBAR
         )
         self.icon.set_opacity(0.8)
         box = Gtk.Box()

dzgui/views/components/filter_panel.py

@@ -3,22 +3,23 @@ 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.const.enum import FilterMode
+from dzgui.model.servers import ServerModelManager
 from dzgui.util.format import format_exception
-from dzgui.strings.filters import (
+from dzgui.util.strings import all_maps
-    all_maps,
-    filters_heading,
-    keyword_placeholder,
-    map_placeholder,
-)
 from dzgui.views.components.maps_combo import MapsCombo
 from dzgui.views.components.labels import BoldLabel
 
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, Pango, GLib
+from gi.repository import Gtk, Gdk, Pango, GLib  # noqa E402
 
 logger = logging.getLogger(APP_NAME)
 
@@ -31,7 +32,7 @@ class ButtonGrid(Gtk.Grid):
     def __init__(
         self,
         controller: "Controller",
-        defaults: dict[str, bool],
+        defaults: dict[str, str],
         tooltips: dict[str, str],
     ) -> None:
         super().__init__(
@@ -43,10 +44,7 @@ class ButtonGrid(Gtk.Grid):
         self.checks: list[Gtk.CheckButton] = []
 
         flowbox = Gtk.FlowBox(
-            halign=Gtk.Align.CENTER,
+            halign=Gtk.Align.CENTER, min_children_per_line=3, max_children_per_line=3, selection_mode=Gtk.SelectionMode.NONE
-            min_children_per_line=3,
-            max_children_per_line=3,
-            selection_mode=Gtk.SelectionMode.NONE,
         )
 
         for check in defaults.keys():
@@ -97,13 +95,14 @@ class ButtonGrid(Gtk.Grid):
         logger.info(f"User toggled button '{label}' to {state}")
         self.emitter.emit("check_toggled", label, state)
 
-    def get_checkboxes(self) -> list[Gtk.CheckButton]:
+    def get_checkboxes(self) -> list:
         return self.checks
 
 
 class KeywordEntry(Gtk.Entry):
     def __init__(self, controller: "Controller") -> None:
-        super().__init__(placeholder_text=keyword_placeholder)
+        # TODO :strings
+        super().__init__(placeholder_text="Filter by keyword")
 
         self.keyword = ""
         self.controller = controller
@@ -112,7 +111,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, ICON_SEARCH)
+        self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, SEARCH_ICON)
         self.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
 
         self.emitter.connect("load_maps", self._on_maps_loaded)
@@ -149,6 +148,10 @@ class KeywordEntry(Gtk.Entry):
         self.controller.set_active_keyword(keyword)
         logger.info(f"User filtered by keyword '{keyword}'")
 
+        ServerModelManager(
+            self.controller, self.controller.get_active_treeview()
+        ).refilter(FilterMode.TOGGLE_ON)
+
 
 class FilterPanel(Gtk.Box):
     def __init__(self, controller: "Controller") -> None:
@@ -177,7 +180,8 @@ class FilterPanel(Gtk.Box):
         self.keyword_entry = KeywordEntry(self.controller)
         self.button_grid = ButtonGrid(self.controller, defaults, tooltips)
 
-        self.filters_label = BoldLabel(filters_heading)
+        # TODO: strings
+        self.filters_label = BoldLabel("Filters")
 
         self.emitter.connect(
             "request_keyword_focus", lambda _: self.keyword_entry.grab_focus()
@@ -197,12 +201,13 @@ class FilterPanel(Gtk.Box):
 
         self.maps_entry: Gtk.Entry = self.maps_combo.get_child()  # type: ignore
         self.maps_entry.set_completion(completion)
-        self.maps_entry.set_placeholder_text(map_placeholder)
+        # TODO: strings
+        self.maps_entry.set_placeholder_text("Filter by map")
         self.maps_entry.connect("changed", self._on_map_completion, True)
         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=True)
+        self.maps_combo.pack_start(renderer_text, EXPAND)
         self.maps_combo.connect("changed", self._on_map_changed)
         self.maps_combo.connect("key-press-event", self._on_combo_keypress)
 
@@ -212,7 +217,7 @@ class FilterPanel(Gtk.Box):
             self.maps_combo,
             self.button_grid,
         ):
-            self.pack_start(el, expand=False, fill=False, padding=0)
+            self.pack_start(el, NO_EXPAND, NO_FILL, NO_PADDING)
 
     def _on_maps_activated(self, entry: Gtk.Entry) -> None:
         text = entry.get_text()
@@ -306,7 +311,6 @@ class FilterPanel(Gtk.Box):
             Gdk.KEY_0: 9,
             Gdk.KEY_minus: 10,
             Gdk.KEY_backslash: 11,
-            Gdk.KEY_apostrophe: 12,
         }
         if keyval not in mappings:
             return False
@@ -315,8 +319,6 @@ class FilterPanel(Gtk.Box):
         return True
 
     def toggle_check(self, digit: int) -> None:
-        if not self.button_grid.is_sensitive():
-            return
         checks = self.button_grid.get_checkboxes()
         check = checks[digit]
         state = check.get_active()

dzgui/views/components/icon.py

@@ -1,7 +1,7 @@
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
 
 
 class Icon(Gtk.Image):
@@ -9,6 +9,3 @@ class Icon(Gtk.Image):
         super().__init__(
             icon_name=name, icon_size=Gtk.IconSize.BUTTON, margin_start=l_margin
         )
-
-    def set_icon_name(self, name: str) -> None:
-        super().set_from_icon_name(name, Gtk.IconSize.BUTTON)

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
+from gi.repository import Gtk  # noqa E402
 
 
 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
+from gi.repository import Gtk, GLib  # noqa E402
 
 
 class MapsCombo(Gtk.EntryCompletion):

dzgui/views/components/misc.py

@@ -1,80 +1,49 @@
-from typing import Self
+from dzgui.const.constants import ERROR, FLATPAK_RUN_CMD, FLATPAK_SANDBOX, STEAM_CMD
-from warnings import deprecated
-
-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
 from dzgui.views.components.buttons import Icon
 
+
 import gi
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk  # noqa
 
 
-@deprecated("Client choice is determined at setup time")
 class ClientCombo(Gtk.ComboBox):
     def __init__(self) -> None:
         super().__init__()
 
-        has_steam = has_steam_client()
+        self.client_store = Gtk.ListStore(str, str)
-        has_flatpak = has_flatpak_client()
+        clients = (
-        self.client_store = Gtk.ListStore(str, str, bool)
-        self.clients = (
             (
                 options.steam_combo,
                 STEAM_CMD,
-                has_steam,
             ),
             (
                 options.flatpak_combo,
                 FLATPAK_RUN_CMD,
-                has_flatpak,
             ),
             (
                 options.flatpak_container_combo,
                 FLATPAK_SANDBOX,
-                has_flatpak,
             ),
         )
-        for client in self.clients:
+        for client in clients:
             self.client_store.append(client)
-
         self.set_model(self.client_store)
         renderer_text = Gtk.CellRendererText()
         self.pack_start(renderer_text, True)
         self.add_attribute(renderer_text, "text", 0)
         self.set_active(0)
 
-        self.set_cell_data_func(self.get_cells()[0], self.data_func)
-
-    def data_func(
-        self,
-        combo: Self,
-        cell: Gtk.CellRendererText,
-        model: Gtk.ListStore,
-        _iter: Gtk.TreeIter,
-    ) -> None:
-        sens = model[_iter][2]
-        cell.set_property("sensitive", sens)
-
-    def get_client_human_readable(self, cmd: str) -> str:
-        for client in self.clients:
-            human, command, sens = client
-            if command == cmd:
-                return human
-        raise TypeError("Not a valid Steam client selection")
-
-
 class ErrorPopover(Gtk.Popover):
     def __init__(self, relative_to: Gtk.Widget, position: Gtk.PositionType) -> None:
         super().__init__(relative_to=relative_to, position=position)
 
         self.hbox = HBox()
         self.label = Gtk.Label(label="", margin_start=10, margin_end=10)
-        error_icon = Icon(ICON_ERROR, margin_start=10)
+        error_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,13 +1,14 @@
 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
+from gi.repository import Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -19,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_label(enum.dict["label"])
-        self.set_tooltip_text(enum.tooltip)
+        self.set_tooltip_text(enum.dict["tooltip"])
 
 
 class ModPanelButton(EnumeratedModButton):
@@ -49,12 +50,11 @@ class ModSelectionPanel(Gtk.Box):
             ModButton.SELECT_ALL,
             ModButton.UNSELECT_ALL,
             ModButton.UNSUB_SELECTED,
-            ModButton.VALIDATE,
         )
         for button in buttons:
             b = EnumeratedModButton(button)
             b.connect("clicked", self._on_button_clicked)
-            self.main_panel.pack_start(b, expand=False, fill=True, padding=0)
+            self.main_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING)
 
         self.stale_panel = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
         self.highlight_stale_button = ModPanelButton(ModButton.HIGHLIGHT_STALE)
@@ -66,11 +66,11 @@ class ModSelectionPanel(Gtk.Box):
             self.unhighlight_stale_button,
             self.select_stale_button,
         ):
-            self.stale_panel.pack_start(b, expand=False, fill=True, padding=0)
+            self.stale_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING)
             b.connect("clicked", self._on_button_clicked)
 
         for el in header, self.main_panel, self.stale_panel:
-            self.pack_start(el, expand=False, fill=True, padding=0)
+            self.pack_start(el, NO_EXPAND, FILL, NO_PADDING)
 
         self.connect("map", self._reinit_button)
 
@@ -114,5 +114,3 @@ class ModSelectionPanel(Gtk.Box):
                 self.swap_sensitive(False)
             case ModButton.SELECT_STALE:
                 self.controller.select_colorized()
-            case ModButton.VALIDATE:
-                self.controller.validate_mods()

dzgui/views/components/right_panel.py

@@ -6,10 +6,13 @@ 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
-from dzgui.strings.buttons import update_button, version_notifier, version_tooltip
 from dzgui.util.clip import copy_clipboard
 from dzgui.util.file import is_writeable
 from dzgui.views.components.buttonbox import ButtonBox
@@ -20,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
+from gi.repository import Gtk, Gdk, GLib  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -62,19 +65,20 @@ class RightPanel(Gtk.Box):
             vexpand=True,
             halign=Gtk.Align.END,
             valign=Gtk.Align.END,
-            tooltip_text=version_tooltip,
+            # TODO: strings
+            tooltip_text="Click to copy to clipboard",
         )
         eb = Gtk.EventBox(halign=Gtk.Align.END, valign=Gtk.Align.END)
         eb.add(self.version_label)
         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, expand=False, fill=True, padding=0)
+            self.pack_start(el, NO_EXPAND, FILL, NO_PADDING)
 
-        self.pack_start(self.sel_panel, expand=False, fill=False, padding=0)
+        self.pack_start(self.sel_panel, NO_EXPAND, NO_FILL, NO_PADDING)
 
         self.update_button = IconTextButton(
-            "dialog-information-symbolic", label=update_button
+            "dialog-information-symbolic", label="Updates available"
         )
 
         self.gutter_box = Gtk.Box(
@@ -92,7 +96,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, expand=False, fill=True, padding=0)
+        self.pack_start(self.gutter_box, NO_EXPAND, FILL, NO_PADDING)
 
     def _on_update_button_clicked(
         self, button: Gtk.Button, exe_path: str, url: str
@@ -127,6 +131,7 @@ class RightPanel(Gtk.Box):
             return
         self.copying = True
         version = self.version_label.get_text()
-        self.version_label.set_text(version_notifier)
+        # TODO: strings
+        self.version_label.set_text("Copied!")
         copy_clipboard(version)
         GLib.timeout_add_seconds(1, revert)

dzgui/views/components/statusbar.py

@@ -2,11 +2,12 @@ from typing import Self, Union, TYPE_CHECKING
 
 from dzgui.const.enum import NotebookPage, ServerTab
 from dzgui.util.strings import esc_to_return, question_to_return
+from dzgui.views.components.buttons import LoggerAlertsButton
 
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.const.enum import ServerTab
@@ -46,6 +47,9 @@ class Statusbar(Gtk.Grid):
         self.emitter.connect("servers_loaded", self._on_servers_loaded)
         self.emitter.connect("mods_updated", self._on_mods_updated)
 
+    def _on_alerts_clicked(self, button: LoggerAlertsButton) -> None:
+        self.controller.populate_log()
+
     def _on_mods_updated(self, emitter: "Emitter", msg: str, mods: int) -> None:
         self.set_by_context(NotebookPage.MODS, msg)
 
@@ -56,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, "")
@@ -148,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,9 +2,8 @@ from typing import Literal
 from dzgui.util import css
 
 import gi
-
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib
+from gi.repository import Gtk, GLib  # noqa E402
 
 
 class Toast(Gtk.EventBox):

dzgui/views/dialogs/boot.py

@@ -14,6 +14,7 @@ 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
@@ -101,10 +102,10 @@ class BootDialog(ColorAwareApp, Gtk.Dialog):  # type: ignore
             margin_top=30,
             margin_bottom=30,
         )
-        self.error_label = Gtk.Label(margin_start=15, margin_end=15)
+        self.error_label = Gtk.Label()
 
         # TODO: abstract class
-        self.copy_button = ClipboardButton(self.error_label.get_text)
+        self.copy_button = ClipboardButton(None, lambda: self.error_label.get_text())
         self.button_hbox = Gtk.Box(
             orientation=Gtk.Orientation.HORIZONTAL, halign=Gtk.Align.CENTER, spacing=10
         )
@@ -117,8 +118,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=True, fill=True, padding=0)
+        self.content.pack_start(self.scrollable_tree, EXPAND, FILL, 0)
-        self.content.pack_start(self.error_box, expand=True, fill=True, padding=0)
+        self.content.pack_start(self.error_box, EXPAND, FILL, 0)
         self.show_all()
 
         self.error_box.hide()
@@ -131,9 +132,9 @@ class BootDialog(ColorAwareApp, Gtk.Dialog):  # type: ignore
                 preboot.signatures,
                 False,
             ),
-            (StoredFunc(get_ipdb, self.xdg.db), preboot.geo, False),
+            (StoredFunc(get_ipdb, self.xdg.ips), preboot.geo, False),
             # TODO: handle IP DB failure and use coords fallback
-            (StoredFunc(get_local_coords, self.xdg.db), preboot.coords, True),
+            (StoredFunc(get_local_coords, self.xdg.ips), preboot.coords, True),
             (StoredFunc(check_updates, self.version), preboot.updates, True),
         ]
         self.results: list[Any] = []

dzgui/views/dialogs/calc.py

@@ -1,457 +0,0 @@
-import gi
-from dataclasses import dataclass
-from datetime import datetime, time, timedelta
-from typing import Literal
-
-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
-
-DAY_START_TIME = time(hour=6, minute=0, second=0)
-DAY_END_TIME = time(hour=18, minute=0, second=0)
-NIGHT_START_TIME = time(hour=18, minute=0, second=0)
-NIGHT_END_TIME = time(hour=6, minute=0, second=0)
-EXTENDED_TIME_FORMAT = "%H:%M:%S"
-
-
-@dataclass(slots=True, frozen=True)
-class Time:
-    time: str
-    day_accel: float
-    night_accel: float
-
-
-class Emitter(GObject.GObject):
-    def __init__(self) -> None:
-        super().__init__()
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object, object))
-    def local_time_incremented(self, time_now: datetime, elapsed: timedelta) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def server_time_incremented(self, server_time: datetime) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=())
-    def calculate_button_clicked(self) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def target_time_changed(self, time: timedelta) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def target_time_reset(self, time: timedelta) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def remaining_time_changed(self, time: datetime) -> None:
-        pass
-
-    @GObject.Signal(flags=GObject.SignalFlags.RUN_LAST, arg_types=(object,))
-    def adjusted_local_time_changed(self, time: datetime) -> None:
-        pass
-
-
-class LocalClock:
-    def __init__(self, emitter: Emitter) -> None:
-        self.emitter = emitter
-        self.start_time = datetime.now()
-        # NOTE: highest theoretical accel interval is 24 * 64
-        GLib.timeout_add(500, self.check_time)
-
-    def get_time(self) -> str:
-        return datetime.now().time().strftime(EXTENDED_TIME_FORMAT)
-
-    def get_elapsed_time(self) -> timedelta:
-        return datetime.now() - self.start_time
-
-    def check_time(self) -> Literal[True]:
-        time_now = datetime.now()
-        elapsed = datetime.now() - self.start_time
-        self.emitter.emit("local_time_incremented", time_now, elapsed)
-        return True
-
-
-class ServerClock:
-    def __init__(
-        self, server_time: Time, emitter: Emitter, local_clock: LocalClock
-    ) -> None:
-
-        self.local_clock = local_clock
-        self.emitter = emitter
-
-        hour, minute = self.split_time(server_time)
-        self.day_accel = server_time.day_accel
-        self.night_accel = server_time.night_accel
-
-        self.start_time = datetime.combine(datetime.today(), time(hour, minute))
-        self.cur_time = datetime.combine(datetime.today(), time(hour, minute))
-
-        self._last_elapsed = self.local_clock.get_elapsed_time()
-        self.emitter.connect("local_time_incremented", self._on_local_time_incremented)
-
-    @staticmethod
-    def split_time(server_time: Time) -> tuple[int, int]:
-        split = server_time.time.split(":")
-        return int(split[0]), int(split[1])
-
-    def is_day(self) -> bool:
-        if DAY_START_TIME <= self.cur_time.time() <= DAY_END_TIME:
-            return True
-        return False
-
-    def _on_local_time_incremented(
-        self,
-        emitter: Emitter,
-        time: datetime,
-        elapsed: timedelta,
-    ) -> Literal[True]:
-        delta = elapsed - self._last_elapsed
-        self._last_elapsed = elapsed
-        factor = self.get_accel_factor(self.cur_time)
-        self.cur_time += delta * factor
-        self.emitter.emit("server_time_incremented", self.cur_time)
-        return True
-
-    def get_accel_factor(self, dt: datetime) -> float:
-        return (
-            self.day_accel
-            if DAY_START_TIME <= dt.time() < DAY_END_TIME
-            else (self.night_accel * self.day_accel)
-        )
-
-    def get_values(self) -> tuple[int, int]:
-        return self.cur_time.hour, self.cur_time.minute
-
-    def get_datetime(self) -> datetime:
-        return self.cur_time
-
-    def get_time(self) -> time:
-        return self.cur_time.time()
-
-    def calc_delta(self, end_time: datetime) -> timedelta:
-        total = 0.0
-        current_time = self.cur_time
-
-        if current_time > end_time:
-            end_time += timedelta(days=1)
-
-        while current_time < end_time:
-            factor = self.get_accel_factor(current_time)
-            day_start = datetime.combine(current_time.date(), DAY_START_TIME)
-            day_end = datetime.combine(current_time.date(), DAY_END_TIME)
-
-            if current_time.time() < DAY_START_TIME:
-                edge = day_start
-            elif current_time.time() < DAY_END_TIME:
-                edge = day_end
-            else:
-                edge = datetime.combine(
-                    current_time.date() + timedelta(days=1), DAY_START_TIME
-                )
-
-            chunk_end = min(end_time, edge)
-            total += (chunk_end - current_time).total_seconds() / factor
-            current_time = chunk_end
-        return timedelta(seconds=total)
-
-
-class RemainderClock:
-    def __init__(self, emitter: Emitter) -> None:
-        self.emitter = emitter
-        self.emitter.connect("target_time_changed", self._on_target_time_changed)
-        self.emitter.connect("target_time_reset", self._on_target_time_reset)
-        self.emitter.connect("local_time_incremented", self._on_local_time_incremented)
-        self.reset_time(True)
-
-        self.previous = timedelta(0)
-
-    def reset_time(self, zero_out: bool = False) -> None:
-        now = datetime.now()
-        second, ms = (0, 0) if zero_out else (now.second, now.microsecond)
-        self.time = datetime.combine(
-            now, time(hour=0, minute=0, second=second, microsecond=ms)
-        )
-
-    def _on_local_time_incremented(
-        self, emitter: Emitter, time: datetime, elapsed: timedelta
-    ) -> None:
-        if self.time == datetime.min.time():
-            return
-
-        delta = elapsed - self.previous
-        # NOTE: clamp to midnight
-        self.time = max(
-            self.time - delta, self.time.replace(hour=0, minute=0, second=0)
-        )
-        self.previous = elapsed
-        self.emitter.emit("remaining_time_changed", self.time)
-
-    def _on_target_time_reset(self, emitter: Emitter, time: timedelta) -> None:
-        self.reset_time(True)
-        self.emitter.emit("remaining_time_changed", self.time)
-        # NOTE: restore adjusted time to current time
-        self.emitter.emit("adjusted_local_time_changed", datetime.now())
-
-    def _on_target_time_changed(self, emitter: Emitter, time: timedelta) -> None:
-        self.reset_time(True)
-        self.time += time
-        self.emitter.emit("remaining_time_changed", self.time)
-
-    def get_time(self) -> str:
-        return self.time.strftime(EXTENDED_TIME_FORMAT)
-
-
-class AdjustedClock:
-    def __init__(self, emitter: Emitter) -> None:
-        self.emitter = emitter
-        self.emitter.connect("target_time_changed", self._on_target_time_changed)
-        self.start_time = datetime.now()
-
-    def _on_target_time_changed(self, emitter: Emitter, time: timedelta) -> None:
-        self.start_time = datetime.now()
-        adjusted = self.start_time + time
-        self.emitter.emit("adjusted_local_time_changed", adjusted)
-
-    def get_time(self) -> str:
-        return self.start_time.strftime(EXTENDED_TIME_FORMAT)
-
-
-class VerticalSpinBox(Gtk.SpinButton):
-    def __init__(self, value: int, upper: int) -> None:
-        super().__init__(
-            adjustment=Gtk.Adjustment(
-                value=value,
-                lower=0,
-                upper=upper,
-                step_increment=1,
-                page_increment=1,
-                page_size=0,
-            ),
-            orientation=Gtk.Orientation.VERTICAL,
-        )
-
-
-class HourSpinBox(VerticalSpinBox):
-    def __init__(self, hour: int) -> None:
-        super().__init__(value=hour, upper=23)
-
-
-class MinuteSpinBox(VerticalSpinBox):
-    def __init__(self, minute: int) -> None:
-        super().__init__(value=minute, upper=59)
-
-        self.get_adjustment().set_page_increment(10)
-
-
-class TimePicker(Gtk.Box):
-    def __init__(self, hour: int, minute: int) -> None:
-        super().__init__(
-            orientation=Gtk.Orientation.HORIZONTAL,
-            halign=Gtk.Align.CENTER,
-            valign=Gtk.Align.CENTER,
-        )
-        self.hour_spin = HourSpinBox(hour)
-        self.minute_spin = MinuteSpinBox(minute)
-        self.add(self.hour_spin)
-        self.add(self.minute_spin)
-
-        self.hour_spin.connect("output", self._on_output)
-        self.minute_spin.connect("output", self._on_output)
-
-    def _on_output(self, spin_button: VerticalSpinBox) -> Literal[True]:
-        val = spin_button.get_value()
-        spin_button.set_text(f"{int(val):02d}")
-        # NOTE: indicates that rendering completed
-        return True
-
-    def get_values(self) -> tuple[int, int]:
-        hour = self.get_hour()
-        minute = self.get_minute()
-        return hour, minute
-
-    def get_hour(self) -> int:
-        return int(self.hour_spin.get_adjustment().get_value())
-
-    def get_minute(self) -> int:
-        return int(self.minute_spin.get_adjustment().get_value())
-
-    def get_time(self) -> datetime:
-        """
-        NOTE: interpolating seconds/microseconds from the current time
-        may prevent abrupt visual changes when setting a new TimePicker time
-        while a clock tick is updating the local remainder label.
-        However, this can introduce false negatives when running tests due to microsecond drift.
-        Ideally, tests should be decoupled from this logic.
-        """
-        d = datetime.now()
-        return datetime.combine(
-            d,
-            time(
-                hour=self.get_hour(),
-                minute=self.get_minute(),
-                second=0,
-                microsecond=0,
-            ),
-        )
-
-    def set_time(self, hour: int, minute: int) -> None:
-        self.hour_spin.get_adjustment().set_value(hour)
-        self.minute_spin.get_adjustment().set_value(minute)
-
-
-class AdjustedTimeFrame(Gtk.Frame):
-    def __init__(self, emitter: Emitter) -> None:
-        super().__init__(margin_start=50, margin_end=50)
-
-        self.emitter = emitter
-        self.emitter.connect(
-            "adjusted_local_time_changed", self._on_adjusted_time_changed
-        )
-        self.emitter.connect("remaining_time_changed", self._on_remainder_changed)
-
-        self.remainder_clock = RemainderClock(emitter)
-        self.remainder_heading = BoldLabel(calc.heading_remainder_time)
-        self.remaining_time = Gtk.Label(label=self.remainder_clock.get_time())
-
-        self.adjusted_clock = AdjustedClock(emitter)
-        self.adjusted_heading = BoldLabel(calc.heading_adjusted_time)
-        self.adjusted_local_time = Gtk.Label(label=self.adjusted_clock.get_time())
-
-        flowbox = Gtk.FlowBox(
-            row_spacing=20,
-            column_spacing=50,
-            min_children_per_line=2,
-            max_children_per_line=2,
-            margin=15,
-            halign=Gtk.Align.CENTER,
-            selection_mode=Gtk.SelectionMode.NONE,
-        )
-        flowbox.add(self.remainder_heading)
-        flowbox.add(self.adjusted_heading)
-        flowbox.add(self.remaining_time)
-        flowbox.add(self.adjusted_local_time)
-
-        recalc = Gtk.Button(
-            label=calc.calculate, halign=Gtk.Align.CENTER, margin_bottom=20
-        )
-        recalc.connect("clicked", self._on_recalc_clicked)
-
-        vbox = VBox()
-        vbox.extend([flowbox, recalc])
-        self.add(vbox)
-
-    def _on_remainder_changed(self, emitter: Emitter, time: datetime) -> None:
-        strtime = str(time.strftime(EXTENDED_TIME_FORMAT))
-        self.remaining_time.set_text(strtime)
-
-    def _on_adjusted_time_changed(self, emitter: Emitter, time: datetime) -> None:
-        strtime = str(time.strftime(EXTENDED_TIME_FORMAT))
-        self.adjusted_local_time.set_text(strtime)
-
-    def _on_recalc_clicked(self, button: Gtk.Button) -> None:
-        self.emitter.emit("calculate_button_clicked")
-
-
-class TimePickerFrame(Gtk.Frame):
-    def __init__(self, emitter: Emitter, stime: Time) -> None:
-        super().__init__(margin_start=50, margin_end=50)
-
-        self.emitter = emitter
-        self.emitter.connect("local_time_incremented", self._on_local_clock_increment)
-        self.emitter.connect("server_time_incremented", self._on_server_clock_increment)
-        self.emitter.connect(
-            "calculate_button_clicked", self._on_calculate_button_clicked
-        )
-
-        self.local_clock = LocalClock(self.emitter)
-        local_clock_time = self.local_clock.get_time()
-
-        self.server_time = ServerClock(stime, self.emitter, self.local_clock)
-        hour, minute = self.server_time.get_values()
-        self.picker = TimePicker(hour, minute)
-
-        self.local_timelabel = Gtk.Label(label=local_clock_time)
-        self.server_timelabel = Gtk.Label(label=stime.time, halign=Gtk.Align.CENTER)
-
-        h0 = BoldLabel(calc.heading_local_time)
-        h1 = BoldLabel(calc.heading_server_time)
-        h2 = BoldLabel(calc.heading_target_time)
-
-        self.icon_indicator = Icon(ICON_DAY)
-        self.update_server_icon()
-
-        server_time_box = HBox(10)
-        server_time_box.set_halign(Gtk.Align.CENTER)
-        server_time_box.extend([self.server_timelabel, self.icon_indicator])
-
-        flowbox = Gtk.FlowBox(
-            row_spacing=10,
-            column_spacing=50,
-            min_children_per_line=3,
-            max_children_per_line=3,
-            margin=15,
-            halign=Gtk.Align.CENTER,
-            selection_mode=Gtk.SelectionMode.NONE,
-        )
-        flowbox.add(h0)
-        flowbox.add(h1)
-        flowbox.add(h2)
-        flowbox.add(self.local_timelabel)
-        flowbox.add(server_time_box)
-        flowbox.add(self.picker)
-
-        self.add(flowbox)
-
-    def update_server_icon(self) -> None:
-        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:
-        t = time_now.time().strftime("%H:%M")
-        self.server_timelabel.set_text(t)
-        self.update_server_icon()
-
-    def _on_local_clock_increment(
-        self, emitter: Emitter, time_now: datetime, elapsed: timedelta
-    ) -> None:
-        t = time_now.time().strftime(EXTENDED_TIME_FORMAT)
-        self.local_timelabel.set_text(t)
-
-    def _on_calculate_button_clicked(self, button: Gtk.Button) -> None:
-        if (self.picker.get_values()) == (self.server_time.get_values()):
-            total_time = timedelta(seconds=0)
-            self.emitter.emit("target_time_reset", total_time)
-        else:
-            picker_time = self.picker.get_time()
-            total_time = self.server_time.calc_delta(picker_time)
-            self.emitter.emit("target_time_changed", total_time)
-
-
-class ServerTimeCalculator(Gtk.ScrolledWindow):
-    def __init__(self, stime: Time) -> None:
-        super().__init__(propagate_natural_width=True)
-
-        self.emitter = Emitter()
-        outerbox = Gtk.Box(
-            halign=Gtk.Align.CENTER,
-            valign=Gtk.Align.START,
-            spacing=20,
-            orientation=Gtk.Orientation.VERTICAL,
-        )
-        time_picker_frame = TimePickerFrame(self.emitter, stime)
-        adjusted_time_frame = AdjustedTimeFrame(self.emitter)
-        disclaimer = Gtk.Label(
-            label=calc.disclaimer,
-            justify=Gtk.Justification.CENTER,
-        )
-        for el in time_picker_frame, adjusted_time_frame, disclaimer:
-            outerbox.add(el)
-        self.add(outerbox)

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
+from gi.repository import Gtk  # noqa E402
 
 
 class AbortDialog(ColorAwareApp, Gtk.MessageDialog):  # type: ignore
@@ -46,7 +46,7 @@ class AbortDialog(ColorAwareApp, Gtk.MessageDialog):  # type: ignore
 
         self.connect("response", self._on_response)
 
-        self.run()  # type: ignore[no-untyped-call]
+        self.run()
         self.destroy()
 
     def _on_response(self, dialog: Self, response: Gtk.ResponseType) -> None:

dzgui/views/dialogs/filepicker.py

@@ -2,10 +2,10 @@ from pathlib import Path
 
 from dzgui.util.strings import picker
 
-import gi
+import gi  # noqa E402
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
 
 
 class FilePicker(Gtk.FileChooserDialog):
@@ -16,14 +16,14 @@ class FilePicker(Gtk.FileChooserDialog):
             transient_for=parent,
             resizable=True,
         )
-        self.add_buttons("_Cancel", Gtk.ResponseType.CANCEL)  # type: ignore[no-untyped-call]
+        self.add_buttons("_Cancel", Gtk.ResponseType.CANCEL)
-        self.add_buttons("_Save", Gtk.ResponseType.OK)  # type: ignore[no-untyped-call]
+        self.add_buttons("_Save", Gtk.ResponseType.OK)
         self.set_default_response(Gtk.ResponseType.OK)
 
         self.set_current_name(picker.placeholder)
 
     def pick_file(self) -> Path | None:
-        res = self.run()  # type: ignore[no-untyped-call]
+        res = self.run()
         if res in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
             self.destroy()
             return None
@@ -43,12 +43,12 @@ class FolderPicker(Gtk.FileChooserDialog):
             parent=parent,
             resizable=True,
         )
-        self.add_buttons("_Cancel", Gtk.ResponseType.CANCEL)  # type: ignore[no-untyped-call]
+        self.add_buttons("_Cancel", Gtk.ResponseType.CANCEL)
-        self.add_buttons("_OK", Gtk.ResponseType.OK)  # type: ignore[no-untyped-call]
+        self.add_buttons("_OK", Gtk.ResponseType.OK)
         self.set_default_response(Gtk.ResponseType.OK)
 
     def pick_folder(self) -> Path | None:
-        res = self.run()  # type: ignore[no-untyped-call]
+        res = self.run()
         if res in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
             self.destroy()
             return None

dzgui/views/dialogs/generic.py

@@ -1,5 +1,6 @@
 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
@@ -7,7 +8,7 @@ from dzgui.views.components.buttons import ClipboardButton
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -45,7 +46,7 @@ class GenericDialog(Gtk.MessageDialog):
 
     def pack(self, widget: Gtk.Widget) -> None:
         content = self.get_content_area()
-        content.pack_start(widget, expand=True, fill=True, padding=0)
+        content.pack_start(widget, EXPAND, FILL, NO_PADDING)
 
 
 class ConfirmationDialog(GenericDialog):
@@ -120,13 +121,13 @@ class WaitDialog(GenericDialog):
         spinner_box.add(spinner)
 
         if self.jobs > 1:
-            content.pack_start(self.prog, expand=False, fill=False, padding=0)
+            content.pack_start(self.prog, NO_EXPAND, NO_FILL, 0)
         else:
-            content.pack_start(spinner_box, expand=False, fill=False, padding=0)
+            content.pack_start(spinner_box, NO_EXPAND, NO_FILL, 0)
             spinner.start()
 
         if show_cancel is True:
-            content.pack_start(self.cancel, expand=False, fill=False, padding=0)
+            content.pack_start(self.cancel, NO_EXPAND, NO_FILL, 0)
 
     def update_text(self, msg: str) -> None:
         self.format_secondary_text(msg)
@@ -139,7 +140,8 @@ class WaitDialog(GenericDialog):
         self.cur_job += 1
 
     def _on_cancel_clicked(self, button: Gtk.Button) -> None:
-        GLib.idle_add(self.update_text, dialogs.caught_cancel_signal)
+        # TODO: strings
+        GLib.idle_add(self.update_text, "Caught cancel signal, cleaning up")
         self.controller.set_cancel_event()
 
     def show_cancel(self, state: bool) -> None:
@@ -185,7 +187,7 @@ class TextBufferDialog(GenericDialog):
             secondary=secondary,
         )
         self.text = text
-        copy_button = ClipboardButton(self.get_text)
+        copy_button = ClipboardButton(controller, self.get_text)
         self.add_action_widget(copy_button, Gtk.ResponseType.NONE)
         self.add_button("OK", Gtk.ResponseType.OK)
         self.connect("response", self._on_response)
@@ -270,7 +272,7 @@ class ExceptionDialog(TextBufferDialog):
             bottom_margin=10,
         )
         textview.set_buffer(Gtk.TextBuffer(text=trace))
-        box.pack_start(textview, expand=True, fill=True, padding=0)
+        box.pack_start(textview, EXPAND, FILL, 0)
 
         self.error_details = Gtk.ScrolledWindow(
             overlay_scrolling=False,
@@ -294,7 +296,7 @@ class ExceptionDialog(TextBufferDialog):
         )
 
         details_textview.set_buffer(self.details_buffer)
-        details_box.pack_start(details_textview, expand=True, fill=True, padding=10)
+        details_box.pack_start(details_textview, EXPAND, FILL, 10)
         self.error_details.add(details_box)
 
         self.error_notebook = Gtk.Notebook(show_tabs=False, margin_bottom=15)
@@ -307,14 +309,6 @@ class ExceptionDialog(TextBufferDialog):
         content.set_spacing(0)
         content.add(scrollable)
 
-        self.connect("map", self._on_map)
-
-    def _on_map(self, dialog: Self) -> None:
-        button = self.get_widget_for_response(Gtk.ResponseType.OK)
-        if button is None:
-            return
-        button.grab_focus()
-
     def _on_page_changed(
         self, notebook: Gtk.Notebook, child: Gtk.Box | Gtk.ScrolledWindow, index: int
     ) -> None:

dzgui/views/dialogs/link_dialog.py

@@ -1,6 +1,7 @@
 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
@@ -8,7 +9,7 @@ from dzgui.views.components.buttons import SteamTextButton
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 
 if TYPE_CHECKING:
@@ -41,7 +42,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, expand=False, fill=False, padding=0)
+            self.dialogBox.pack_end(button, NO_EXPAND, NO_FILL, 0)
 
         self.show_all()
         self.connect("response", self._on_dialog_response)

dzgui/views/dialogs/note.py

@@ -1,13 +1,12 @@
 from typing import Self, TYPE_CHECKING
 
-from dzgui.strings import notes
 from dzgui.views.components.entry import ValidatedEntry
 from dzgui.views.dialogs.generic import GenericDialog
 
-import gi
+import gi  # noqa E402
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gdk, Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -15,20 +14,23 @@ if TYPE_CHECKING:
 
 class NoteDialog(GenericDialog):
     def __init__(self, controller: "Controller"):
+        # TODO: add to strings
+        title = "Add a short note/reminder."
+        secondary = "Limit 30 chars"
         super().__init__(
             controller=controller,
-            text=notes.dialog_title,
+            text=title,
             buttons=Gtk.ButtonsType.NONE,
             mtype=Gtk.MessageType.INFO,
-            secondary=notes.dialog_subtitle,
+            secondary=secondary,
         )
 
         self.controller = controller
 
-        delete_button = Gtk.Button(label=notes.delete_button)
+        delete_button = Gtk.Button(label="Delete note")
         delete_button.set_sensitive(False)
         self.add_action_widget(delete_button, Gtk.ResponseType.CANCEL)
-        self.ok = self.add_button(notes.ok_button, Gtk.ResponseType.OK)
+        self.ok = self.add_button("Update note", Gtk.ResponseType.OK)
         self.ok.grab_default()
 
         self.entry = ValidatedEntry(controller, self.validate)
@@ -40,7 +42,7 @@ class NoteDialog(GenericDialog):
         self.entry.set_text(note)
         if len(note) > 0:
             delete_button.set_sensitive(True)
-            self.format_secondary_text(notes.current_note.format(note))
+            self.format_secondary_text(f"Current note: '{note}'")
         elif len(note) == 0:
             self.ok.set_sensitive(False)
 
@@ -53,6 +55,9 @@ class NoteDialog(GenericDialog):
         self.entry.connect("changed", self._on_text_changed)
 
     def _on_text_changed(self, entry: Gtk.Entry) -> None:
+        """
+        Called in conjunction with signal callback in the parent class
+        """
         if len(entry.get_text()) == 0:
             self.ok.set_sensitive(False)
 
@@ -66,11 +71,14 @@ class NoteDialog(GenericDialog):
 
     def _on_response(self, dialog: Self, response: Gtk.ResponseType) -> None:
         match response:
+            case Gtk.ResponseType.DELETE_EVENT:
+                self.destroy()
             case Gtk.ResponseType.OK:
                 note = self.entry.get_text()
                 self.controller.add_note(note)
+                self.destroy()
             case Gtk.ResponseType.CANCEL:
                 self.controller.delete_note()
-            case _:
+                self.destroy()
-                pass
+            case Gtk.ResponseType.CANCEL | Gtk.ResponseType.CLOSE:
-        self.destroy()
+                self.destroy()

dzgui/views/dialogs/servers.py

@@ -1,21 +1,20 @@
-import gi
 import html
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.icons import ICON_CALCULATOR
+from dzgui.const.constants import EXPAND, FILL
 from dzgui.const.enum import ContextMenuGroup
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import css
+from dzgui.util import strings
 from dzgui.util.format import format_hyperlinks, format_server_mods
-from dzgui.strings import server_mods, dialogs
+from dzgui.strings import server_mods
-from dzgui.views.components.buttons import IconTextButton
-from dzgui.views.components.box import VBox
-from dzgui.views.dialogs.calc import Time, ServerTimeCalculator
 from dzgui.views.dialogs.generic import GenericDialog
 from dzgui.views.trees.tree_base import TreeView
 
+import gi
+
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, Pango  # noqa
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa
 
 if TYPE_CHECKING:
     from dzgui.api.servers import Details
@@ -47,19 +46,12 @@ class ServerDialog(GenericDialog):
         self.connect("response", self._on_response)
         self.view.connect("key-press-event", self._on_keypress)
 
-        self.scrollable_tree = Gtk.ScrolledWindow(vexpand=True)
+        self.scrollable_tree = Gtk.ScrolledWindow()
         self.scrollable_tree.add(self.view)
-        self.scrollable_tree.set_size_request(700, 500)
+        self.scrollable_tree.set_size_request(700, 400)
-
-        self.stack = Gtk.Stack()
-        self.content_box = VBox(10)
-        self.content_box.set_valign(Gtk.Align.FILL)
-        self.content_box.add(self.scrollable_tree)
-
-        self.stack.add_named(self.content_box, "METADATA")
 
         self.content = self.get_content_area()
-        self.content.pack_start(self.stack, expand=True, fill=True, padding=0)
+        self.content.pack_start(self.scrollable_tree, EXPAND, FILL, 0)
 
     def _on_keypress(self, view: Gtk.TreeView, event: Gdk.EventKey) -> bool:
         # NOTE: ESC normally unfocuses treeview instead of destroying dialog
@@ -74,7 +66,9 @@ class ServerDialog(GenericDialog):
 
 class ServerDetailsDialog(ServerDialog):
     def __init__(self, controller: "Controller", details: "Details"):
-        super().__init__(controller, dialogs.server_details, details.name, menu=None)
+        # TODO: server name should also be packed in details struct
+        name = controller.get_server_name()
+        super().__init__(controller, strings.server_details, name, menu=None)
 
         self.store = Gtk.ListStore(str, str, Pango.Weight)
         self.view.connect("row-activated", self._on_row_activated)
@@ -91,9 +85,14 @@ class ServerDetailsDialog(ServerDialog):
             column.set_sort_column_id(i)
             column.set_expand(True)
 
-        scrollable_message = Gtk.ScrolledWindow(vexpand=True)
+        # NOTE: constrain tree area to logical height of metadata
-        desc = Gtk.Label(label=dialogs.server_message, valign=Gtk.Align.START)
+        # leaving room for server message
-        css.add_class(desc, "server-subheading")
+        self.scrollable_tree.set_size_request(700, 150)
+
+        # TODO: make "Server message" text boldface
+        scrollable_message = Gtk.ScrolledWindow()
+        desc = Gtk.Label(label=strings.server_message, valign=Gtk.Align.START)
+        css.add_class(desc, "details-heading")
         box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER)
         self.description = Gtk.Label(justify=Gtk.Justification.CENTER, wrap=True)
         sep = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
@@ -101,7 +100,11 @@ class ServerDetailsDialog(ServerDialog):
         for el in desc, sep, self.description:
             box.add(el)
         scrollable_message.add(box)
-        self.content_box.add(scrollable_message)
+
+        self.pack(scrollable_message)
+
+        if details.data is None:
+            return
 
         for row in details.data:
             self.store.append(row + [Pango.Weight.BOLD])
@@ -110,32 +113,8 @@ class ServerDetailsDialog(ServerDialog):
         text = format_hyperlinks(text)
         self.description.set_markup(html.escape(text))
 
-        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)
-        self.content.pack_start(calc_button, False, False, 0)
-        self.content.reorder_child(calc_button, 2)
-
-        self.scrollable_tree.set_size_request(700, 250)
-        self.calc = ServerTimeCalculator(
-            Time(details.gametime, details.day_accel, details.night_accel)
-        )
-        self.stack.add_named(self.calc, "CALCULATOR")
-
-        self.connect("map", self._on_map)
         self.show_all()
 
-    def _on_map(self, dialog: Self) -> None:
-        if widget := self.get_widget_for_response(Gtk.ResponseType.OK):
-            widget.grab_focus()
-
-    def _on_calc_pressed(self, button: Gtk.Button) -> None:
-        if self.stack.get_visible_child_name() == "METADATA":
-            self.stack.set_visible_child_name("CALCULATOR")
-        else:
-            self.stack.set_visible_child_name("METADATA")
-
     def _on_row_activated(
         self,
         treeview: Gtk.TreeView,

dzgui/views/dialogs/uninstall.py

@@ -18,11 +18,11 @@ from dzgui.views.mixins.colorscheme import ColorAwareApp
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Pango
+from gi.repository import Gtk, GLib, Pango  # noqa E402
 
 
 class Assistant(Gtk.Assistant):
-    def __init__(self, is_deck: bool, paths: dict[str, Path]):
+    def __init__(self, is_deck: bool, paths: dict[str, str]):
         super().__init__()
         if is_deck:
             # NOTE: deemed to be "safe" dimensions that exclude taskbar size
@@ -63,7 +63,7 @@ class Assistant(Gtk.Assistant):
 
 
 class Window(Gtk.Window):
-    def __init__(self, is_deck: bool, paths: dict[str, Path]) -> None:
+    def __init__(self, is_deck: bool, paths: dict[str, str]) -> None:
         super().__init__(title=APP_NAME, icon_name=APP_NAME)
         self.assistant = Assistant(is_deck, paths)
 
@@ -121,7 +121,7 @@ class CheckboxWithPath(CheckboxWithLabel):
 
 
 class UninstallPage(ScrolledWizardPage):
-    def __init__(self, paths: dict[str, Path], pyapp: str | None):
+    def __init__(self, paths: dict[str, str], pyapp: str | None):
         super().__init__(heading=uninstall.pg1_heading, description=uninstall.pg1_blurb)
 
         self.pyapp = pyapp
@@ -219,7 +219,7 @@ class UninstallPage(ScrolledWizardPage):
 
 
 class UninstallWizard(ColorAwareApp, Gtk.Application):  # type: ignore
-    def __init__(self, is_deck: bool, paths: dict[str, Path]) -> None:
+    def __init__(self, is_deck: bool, paths: dict[str, str]) -> None:
         super().__init__()
         config = Path(paths["XDG_CONFIG_HOME"])
         if not config.is_dir() or not config.joinpath("config.json").is_file():

dzgui/views/dialogs/wizard.py

@@ -12,30 +12,26 @@ from dzgui.const.constants import (
     APP_NAME,
     APP_NAME_LOWER,
     HERO_PATH,
-    FLATPAK_ROOT_PATH,
     LEGACY_CONFIG_PATH,
-    TMP_PATH,
 )
 from dzgui.const.boilerplate import config_boilerplate
 from dzgui.const.endpoints import STEAM_API_SETUP
 from dzgui.config import freedesktop
-from dzgui.init.proc import is_sandboxed, path_to_steam_cmd
 from dzgui.init.migrate import migrate_legacy_conf
 from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager
 from dzgui.strings import wizard
 from dzgui.util._json import write_json
-from dzgui.util.flatpak import apply_overrides
 from dzgui.util.open_links import open_link_by_url
 from dzgui.util.css import add_class, load_css
 from dzgui.views.components.buttons import WebButton
 from dzgui.views.components.entry import APIEntry
+from dzgui.views.components.misc import ClientCombo
 from dzgui.views.mixins.colorscheme import ColorAwareApp
-from dzgui.views.trees.tree_simple import SimpleTree
 
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, GObject, GdkPixbuf
+from gi.repository import Gdk, Gtk, GLib, GObject, GdkPixbuf  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.config.xdg import Xdg
@@ -48,8 +44,7 @@ class PageNum(Enum):
     STEAM_API = 4
     USER_PREFS = 5
     SHORTCUTS = 6
-    FLATPAK = 7
+    FINAL = 7
-    FINAL = 8
 
 
 class OptionalPageMixin:
@@ -148,7 +143,7 @@ class NotificationFrame(Gtk.Frame):
             margin_start=50,
             margin_end=50,
         )
-        wrapped = textwrap.fill(label, width=60)
+        wrapped = textwrap.fill(label, width=80)
         self.label = Gtk.Label(
             label=wrapped,
             justify=Gtk.Justification.CENTER,
@@ -162,18 +157,13 @@ class NotificationFrame(Gtk.Frame):
             add_class(self, "error-frame")
 
     def set_text(self, text: str) -> None:
-        wrapped = textwrap.fill(text, width=60)
+        wrapped = textwrap.fill(text, width=80)
         self.label.set_markup(wrapped)
 
 
 class APIValidationPage(EnumeratedWizardPage):
     def __init__(
-        self,
+        self, enum: PageNum, heading: str, description: str, link: str, func: Callable
-        enum: PageNum,
-        heading: str,
-        description: str,
-        link: str,
-        func: Callable[[str], None],
     ) -> None:
         super().__init__(
             enum=enum,
@@ -252,23 +242,12 @@ class IntroductionPage(EnumeratedWizardPage):
     def __init__(self) -> None:
         super().__init__(
             enum=PageNum.INTRO,
-            heading=wizard.welcome.format(APP_NAME),
+            heading=f"Welcome to {APP_NAME}!",
             description=wizard.blurb_intro,
         )
         self.page_type = Gtk.AssistantPageType.INTRO
         self.set_title(wizard.title_intro)
 
-        self.error_box = NotificationFrame(wizard.error_sandbox, error=True)
-        self.add_start(self.error_box)
-
-        self.connect("map", self._on_map)
-
-    def _on_map(self, page: "EnumeratedWizardPage") -> None:
-        self.error_box.hide()
-        if is_sandboxed():
-            self.error_box.show()
-            EMITTER.emit("step_pending")
-
 
 class Heading(Gtk.Label):
     def __init__(self, label: str):
@@ -405,17 +384,26 @@ class PreferencesPage(EnumeratedWizardPage):
         self.dist_box.add(self.radio_km)
         self.dist_box.add(self.radio_miles)
 
+        client_label = Gtk.Label(label=wizard.label_client, halign=Gtk.Align.START)
+        self.client_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=10)
+        self.client_combo = ClientCombo()
+        self.client_box.add(client_label)
+        self.client_box.add(self.client_combo)
+
         outer_box = Gtk.Box(
             orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER, spacing=10
         )
-        for el in self.name_box, self.dist_box:
+        for el in self.name_box, self.client_box, self.dist_box:
             outer_box.add(el)
         self.add_start(outer_box)
 
-    def get_prefs(self) -> tuple[str, bool]:
+    def get_prefs(self) -> tuple[str, bool, str]:
         name = self.name_entry.get_text().strip()
         use_miles = self.radio_miles.get_active()
-        return name, use_miles
+        model = self.client_combo.get_model()
+        ind = self.client_combo.get_active()
+        client = model[ind][1]
+        return name, use_miles, client
 
     def _on_entry_changed(self, entry: Gtk.Entry) -> None:
         text = entry.get_text()
@@ -425,44 +413,6 @@ class PreferencesPage(EnumeratedWizardPage):
         EMITTER.emit("step_complete")
 
 
-class FlatpakOverridePage(EnumeratedWizardPage):
-    def __init__(self, xdg_paths: dict[str, Path]) -> None:
-        super().__init__(
-            enum=PageNum.FLATPAK,
-            heading=wizard.heading_flatpak,
-            description=wizard.blurb_flatpak,
-        )
-        self.xdg_paths = xdg_paths
-        self.page_type = Gtk.AssistantPageType.INTRO
-
-        store = Gtk.ListStore(str)
-        for path in xdg_paths.values():
-            store.append((str(path),))
-        store.append((TMP_PATH,))
-
-        tree = SimpleTree(store, wizard.tree_column)
-        tree.set_halign(Gtk.Align.CENTER)
-
-        self.authorize_button = Gtk.Button(
-            label=wizard.button_flatpak, halign=Gtk.Align.CENTER
-        )
-        self.authorize_button.connect("clicked", self._on_authorize)
-
-        self.notice = NotificationFrame(wizard.overrides_applied)
-        self.connect("map", self._on_map)
-
-        for el in tree, self.authorize_button, self.notice:
-            self.add_start(el)
-
-    def _on_map(self, page: "EnumeratedWizardPage") -> None:
-        self.notice.hide()
-
-    def _on_authorize(self, button: Gtk.Button) -> None:
-        apply_overrides(self.xdg_paths)
-        self.notice.show()
-        EMITTER.emit("step_complete")
-
-
 class CompletionPage(EnumeratedWizardPage):
     def __init__(self) -> None:
         super().__init__(
@@ -476,7 +426,7 @@ class CompletionPage(EnumeratedWizardPage):
 
 
 class Assistant(Gtk.Assistant):
-    def __init__(self, is_deck: bool, XDG: "Xdg", xdg_paths: dict[str, Path]):
+    def __init__(self, is_deck: bool, XDG: "Xdg"):
         super().__init__()
         if is_deck:
             # NOTE: deemed to be "safe" dimensions that exclude taskbar size
@@ -495,7 +445,6 @@ class Assistant(Gtk.Assistant):
         self.page_api = SteamValidationPage()
         self.page_prefs = PreferencesPage()
         self.page_shortcuts = ShortcutCreationPage(XDG.shortcut)
-        self.page_flatpak = FlatpakOverridePage(xdg_paths)
         self.page_completion = CompletionPage()
 
         self.set_forward_page_func(self._advance_page)
@@ -515,7 +464,6 @@ class Assistant(Gtk.Assistant):
             self.page_api,
             self.page_prefs,
             self.page_shortcuts,
-            self.page_flatpak,
             self.page_completion,
         ):
             # NOTE: skip config migration page if no legacy config file
@@ -536,10 +484,7 @@ class Assistant(Gtk.Assistant):
     def write_config(self, config: dict[str, Any]) -> None:
         write_json(config, self.config_path)
 
-    def get_completion_page(self) -> int:
+    def get_final_page(self) -> int:
-        return self.pages[self.page_completion]
-
-    def get_shortcut_page(self) -> int:
         return self.pages[self.page_shortcuts]
 
     def _advance_page(self, index: int) -> int:
@@ -551,40 +496,30 @@ class Assistant(Gtk.Assistant):
                 if page.is_migrated():
                     sp = page.migrated_conf["default_steam_path"]
                     self.page_shortcuts.set_steam_path(sp)
-                    self.config_values = self.page_migration.migrated_conf
+                    self.write_config(self.page_migration.migrated_conf)
-                    return self.get_shortcut_page()
+                    self.setup_complete = True
+                    return self.get_final_page()
             case SteamPathPage():
-                path = page.get_path_from_radio()
+                self.config_values["default_steam_path"] = page.get_path_from_radio()
-                self.config_values["default_steam_path"] = path
-                self.config_values["client"] = path_to_steam_cmd(path)
             case SteamValidationPage():
                 self.config_values["steam_api"] = page.get_api_key()
             case PreferencesPage():
                 # NOTE: collects config values before advancing to last page
-                name, use_miles = self.page_prefs.get_prefs()
+                name, use_miles, client = self.page_prefs.get_prefs()
                 self.config_values["name"] = name
                 self.config_values["use_miles"] = use_miles
+                self.config_values["client"] = client
+                self.write_config(self.config_values)
                 self.page_shortcuts.set_steam_path(
                     self.config_values["default_steam_path"]
                 )
+                self.setup_complete = True
             case ShortcutCreationPage():
                 page.create_shortcuts()
-                if not self.needs_flatpak_override():
-                    return self.get_completion_page()
-            case FlatpakOverridePage():
-                pass
             case _:
                 raise AttributeError("Trying to advance a non-canonical page")
         return index + 1
 
-    def needs_flatpak_override(self) -> bool:
-        if (
-            self.page_shortcuts.is_steam_checkbox_active()
-            and FLATPAK_ROOT_PATH in self.config_values["default_steam_path"]
-        ):
-            return True
-        return False
-
     def is_setup_complete(self) -> bool:
         return self.setup_complete
 
@@ -630,10 +565,6 @@ class Assistant(Gtk.Assistant):
         if not isinstance(page, IntroductionPage):
             EMITTER.emit("step_pending")
 
-        if page == self.page_completion:
-            self.write_config(self.config_values)
-            self.setup_complete = True
-
 
 class CheckboxWithLabel(Gtk.Box):
     def __init__(self, text: str, blurb_text: str) -> None:
@@ -710,9 +641,6 @@ class ShortcutCreationPage(OptionalPageMixin, EnumeratedWizardPage):  # type: ig
     def set_steam_path(self, path: Path) -> None:
         self.steam_path = path
 
-    def is_steam_checkbox_active(self) -> bool:
-        return self.steam_checkbox.get_active()
-
     def create_shortcuts(self) -> None:
         # NOTE: best-effort, permissive even on failure (page is already marked as complete)
         if self.steam_checkbox.get_active():
@@ -781,10 +709,10 @@ class SteamPathPage(EnumeratedWizardPage):
 
 
 class SetupWizard(ColorAwareApp, Gtk.Application):  # type: ignore
-    def __init__(self, is_deck: bool, XDG: "Xdg", xdg_paths: dict[str, Path]) -> None:
+    def __init__(self, is_deck: bool, XDG: "Xdg") -> None:
         super().__init__()
         GLib.set_prgname(APP_NAME)
-        self.win = Window(is_deck, XDG, xdg_paths)
+        self.win = Window(is_deck, XDG)
         Gtk.main()
 
     def is_setup_complete(self) -> int:
@@ -792,9 +720,9 @@ class SetupWizard(ColorAwareApp, Gtk.Application):  # type: ignore
 
 
 class Window(Gtk.Window):
-    def __init__(self, is_deck: bool, XDG: "Xdg", xdg_paths: dict[str, Path]) -> None:
+    def __init__(self, is_deck: bool, XDG: "Xdg") -> None:
         super().__init__(title=APP_NAME, icon_name=APP_NAME)
-        self.assistant = Assistant(is_deck, XDG, xdg_paths)
+        self.assistant = Assistant(is_deck, XDG)
 
 
 class Emitter(GObject.GObject):

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,17 @@ from dzgui.views.trees.tree_base import TreeView
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 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.EventButton | Gdk.EventKey,
+    ) -> bool:
 
         if self.menu is None:
             return False
@@ -24,7 +28,7 @@ class ContextMixin(TreeView):
 
         match event.type:
             case Gdk.EventType.BUTTON_PRESS:
-                if event.button != Gdk.BUTTON_SECONDARY:  # type: ignore[comparison-overlap]
+                if event.button != 3:
                     return False
                 self._process_button_event(event)  # type: ignore
             case Gdk.EventType.KEY_PRESS:
@@ -58,17 +62,17 @@ class ContextMixin(TreeView):
         self.context_menu.select_first(False)
         return True
 
-    def _process_dynamic_row(self, row: ContextMenuItem) -> Gtk.MenuItem:
+    def _process_dynamic_row(self, row: ContextMenu) -> Gtk.MenuItem:
-        if row == ContextMenuItem.ADD_SERVER and self.is_in_favs():  # type: ignore
+        if row == ContextMenu.ADD_SERVER and self.is_in_favs():  # type: ignore
-            row = ContextMenuItem.REMOVE_SERVER
+            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 +96,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, Gdk
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 
 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
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 
 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
+from gi.repository import Gtk  # noqa E402
 
 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
+import gi  # noqa E402
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
 
 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
+from gi.repository import Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller