Merge c15b77d470 into 5014402e39

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

dzgui/const/constants.py

@@ -36,7 +36,7 @@ HEX_GREEN = "#32CD32"
 HEX_RED = "#FF0000"
 HEX_ORANGE = "#FFAC1C"
 
-# TODO: normalize icon names
+# FIXME: normalize icon names
 CALCULATOR = "accessories-calculator-symbolic"
 CARET_DOWN = "go-down-symbolic"
 CARET_UP = "go-up-symbolic"

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

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

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

@@ -102,7 +102,7 @@ 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(None, lambda: self.error_label.get_text())

dzgui/views/pages/preconnect.py

@@ -176,7 +176,8 @@ class PreConnectionAssistant(Gtk.Box):
 
         self.error_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.error_tree = MaskedTree(ERROR)
-        self.error_placeholder = Placeholder(preconnect.no_errors)
+        # TODO: strings
+        self.error_placeholder = Placeholder("No errors.")
         self.error_box.add(self.error_tree)
         self.error_box.add(self.error_placeholder)
         self.error_frame = HeadingFrame.new_with_widget_and_label(

dzgui/views/trees/tree_servers.py

@@ -252,6 +252,7 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
                 case Gdk.KEY_c:
                     self.controller.menu_action(ContextMenu.COPY_SERVER_IP, self)
                 case Gdk.KEY_r:
+                    # TODO: unimplemented, needs threading
                     self.controller.menu_action(ContextMenu.REFRESH_PLAYERS, self)
         else:
             match event.keyval:

pyproject.toml

@@ -4,7 +4,7 @@ description = "DayZ server browser and mod manager for Linux"
 authors = [
     {name = "aclist"}
 ]
-version = "7.0.0b25"
+version = "7.0.0b23"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
 readme = "README.md"