Compare commits

...
Author SHA1 Message Date
aclist 3e6bd95285 change: require explicit Steam launch command
Mirror to Codeberg / mirror-to-codeberg (push) Canceled after 0s
2026-10-26 15:47:45 +09:00
aclist f4be9a31e9 change: check actual client preference
Mirror to Codeberg / mirror-to-codeberg (push) Canceled after 0s
2026-10-25 15:56:06 +09:00
4 changed files with 18 additions and 6 deletions

No files matched your search

+4 -1
View File
@@ -26,8 +26,9 @@ from dzgui.const.constants import (
FLATPAK_CMD,
FLATPAK_STEAM_PATH,
LIBRARYFOLDERS_PATH,
UBUNTU_STEAM_PATH,
REQUEST_TIMEOUT,
STEAM_CMD,
UBUNTU_STEAM_PATH,
VDF_PATH,
)
from dzgui.const.endpoints import (
@@ -86,6 +87,8 @@ 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_cmd(FLATPAK_CMD) is False:
continue
if path is not FLATPAK_PATH and has_cmd(STEAM_CMD) is False:
continue
if path.joinpath(VDF_PATH).is_file():
paths.append((path, human[path]))
return paths
+12 -3
View File
@@ -7,7 +7,12 @@ from typing import TYPE_CHECKING
from warnings import deprecated
from dzgui.const.constants import APP_NAME, STEAM_ICON, STEAM_ICONS_PATH
from dzgui.const.constants import (
APP_NAME,
FLATPAK_ROOT_PATH,
STEAM_ICON,
STEAM_ICONS_PATH,
)
from dzgui.const.enum import Preferences
from dzgui.config.query import lookup
from dzgui.config.userprefs import UserPrefs
@@ -18,7 +23,7 @@ from dzgui.init.migrate import (
migrate_cols_file,
)
from dzgui.init.flock import lock_acquire
from dzgui.init.prereqs import has_any_client
from dzgui.init.prereqs import has_flatpak_client, has_steam_client
from dzgui.strings import boot
from dzgui.util.deck import is_steam_deck, is_game_mode
@@ -161,7 +166,11 @@ def load_gui(version: str, is_debug: bool) -> None:
# TODO: sudo escalation dialog
# count = get_map_count()
# TODO: move into module
if has_any_client() is False:
if FLATPAK_ROOT_PATH in lookup(XDG.config, Preferences.DEFAULT):
has_client = has_flatpak_client()
else:
has_client = has_steam_client()
if has_client is False:
EarlyAlertDialog(init.requires_steam)
bootwin = BootWindow(XDG, version)
+1 -1
View File
@@ -19,7 +19,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 paths found on system. Please install Steam to continue."
"No valid Steam path or Steam command found on system. Please install Steam to continue."
)
button_scan = "Scan for Steam"
+1 -1
View File
@@ -297,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="DZGUI requires that Steam or Flatpak Steam be installed on the system.",
requires_steam="Your chosen client (Steam/Flatpak Steam) must be installed on the system.",
)
mod_panel = ModPanelStrings(