mirror of
https://github.com/aclist/dztui.git
synced 2026-11-10 20:10:38 +01:00
Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6b5c7bbb4 | ||
|
|
f0a07cbbba | ||
|
|
30fa762780 | ||
|
|
807a530550 | ||
|
|
f092cfdf4a | ||
|
|
d5c597ab03 | ||
|
|
06c85fdfd8 | ||
|
|
15d4b71350 | ||
|
|
16d3df618a | ||
|
|
22dd8fc67f | ||
|
|
49298d9943 | ||
|
|
a42c9d4389 | ||
|
|
cc708c64b2 | ||
|
|
03fa707305 | ||
|
|
2479cbd41b |
No files matched your search
+124
@@ -0,0 +1,124 @@
|
|||||||
|
# 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.
|
||||||
@@ -37,6 +37,8 @@ Users wishing to review the licenses to these components can inspect the `LICENS
|
|||||||
|
|
||||||
Steam and the Steam logo are trademarks and/or registered trademarks of Valve Corporation in the U.S. and/or other countries.
|
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
|
## Disclaimer
|
||||||
|
|
||||||
DZGUI is beta-quality software and is provided as-is.
|
DZGUI is beta-quality software and is provided as-is.
|
||||||
+6
-6
@@ -31,10 +31,10 @@ from dzgui.const.constants import (
|
|||||||
VDF_PATH,
|
VDF_PATH,
|
||||||
)
|
)
|
||||||
from dzgui.const.endpoints import (
|
from dzgui.const.endpoints import (
|
||||||
APP_DETAILS,
|
STEAM_APP_DETAILS,
|
||||||
SUB_ENDPOINT,
|
|
||||||
STEAM_PUBLISHED_FILES,
|
STEAM_PUBLISHED_FILES,
|
||||||
UNSUB_ENDPOINT,
|
STEAM_SUB,
|
||||||
|
STEAM_UNSUB,
|
||||||
)
|
)
|
||||||
from dzgui.strings import wizard
|
from dzgui.strings import wizard
|
||||||
from dzgui.strings.errors import api_validation_error, workshop_endpoint_error
|
from dzgui.strings.errors import api_validation_error, workshop_endpoint_error
|
||||||
@@ -310,11 +310,11 @@ def update_workshop(key: str, mod: int, endpoint: str) -> None:
|
|||||||
|
|
||||||
|
|
||||||
def subscribe(key: str, mod: int) -> None:
|
def subscribe(key: str, mod: int) -> None:
|
||||||
update_workshop(key, mod, SUB_ENDPOINT)
|
update_workshop(key, mod, STEAM_SUB)
|
||||||
|
|
||||||
|
|
||||||
def unsubscribe(key: str, mod: int) -> None:
|
def unsubscribe(key: str, mod: int) -> None:
|
||||||
update_workshop(key, mod, UNSUB_ENDPOINT)
|
update_workshop(key, mod, STEAM_UNSUB)
|
||||||
|
|
||||||
|
|
||||||
def validate_mod(client: str, mod: str) -> None:
|
def validate_mod(client: str, mod: str) -> None:
|
||||||
@@ -512,7 +512,7 @@ def get_app_path(folders_path: Path, appid: int) -> Path:
|
|||||||
|
|
||||||
def get_app_name(appid: int) -> str | None:
|
def get_app_name(appid: int) -> str | None:
|
||||||
payload = {"appids": [appid]}
|
payload = {"appids": [appid]}
|
||||||
res = requests.get(APP_DETAILS, params=payload)
|
res = requests.get(STEAM_APP_DETAILS, params=payload)
|
||||||
if res.status_code != 200:
|
if res.status_code != 200:
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -39,13 +39,6 @@ HEX_ORANGE = "#FFAC1C"
|
|||||||
|
|
||||||
SEPARATOR = "SEPARATOR"
|
SEPARATOR = "SEPARATOR"
|
||||||
|
|
||||||
# TODO: drop
|
|
||||||
NO_PADDING = 0
|
|
||||||
NO_EXPAND = False
|
|
||||||
NO_FILL = False
|
|
||||||
EXPAND = True
|
|
||||||
FILL = True
|
|
||||||
|
|
||||||
SCROLL_INCREMENT = 50
|
SCROLL_INCREMENT = 50
|
||||||
WINDOW_DEFAULT_X = 1400
|
WINDOW_DEFAULT_X = 1400
|
||||||
WINDOW_DEFAULT_Y = 800
|
WINDOW_DEFAULT_Y = 800
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ STEAM_PUBLISHED_FILES = (
|
|||||||
"https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1"
|
"https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1"
|
||||||
)
|
)
|
||||||
STEAM_SERVERS = "https://api.steampowered.com/IGameServersService/GetServerList/v1"
|
STEAM_SERVERS = "https://api.steampowered.com/IGameServersService/GetServerList/v1"
|
||||||
SUB_ENDPOINT = "https://api.steampowered.com/IPublishedFileService/Subscribe/v1"
|
STEAM_SUB = "https://api.steampowered.com/IPublishedFileService/Subscribe/v1"
|
||||||
UNSUB_ENDPOINT = "https://api.steampowered.com/IPublishedFileService/Unsubscribe/v1"
|
STEAM_UNSUB = "https://api.steampowered.com/IPublishedFileService/Unsubscribe/v1"
|
||||||
APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
|
STEAM_APP_DETAILS = "https://store.steampowered.com/api/appdetails?"
|
||||||
|
|
||||||
GITHUB = "https://github.com/aclist"
|
GITHUB = "https://github.com/aclist"
|
||||||
GITHUB_RELEASES = "https://api.github.com/repos/aclist/dztui/releases/latest"
|
GITHUB_RELEASES = "https://api.github.com/repos/aclist/dztui/releases/latest"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import logging
|
import logging
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.constants import APP_NAME, NO_EXPAND, NO_FILL, NO_PADDING
|
from dzgui.const.constants import APP_NAME
|
||||||
from dzgui.const.enum import ButtonType
|
from dzgui.const.enum import ButtonType
|
||||||
|
|
||||||
import gi
|
import gi
|
||||||
@@ -63,7 +63,7 @@ class ButtonBox(Gtk.Box):
|
|||||||
|
|
||||||
self.buttons.append(button)
|
self.buttons.append(button)
|
||||||
button.connect("clicked", self._on_selection_button_clicked)
|
button.connect("clicked", self._on_selection_button_clicked)
|
||||||
self.pack_start(button, NO_EXPAND, NO_FILL, NO_PADDING)
|
self.pack_start(button, expand=False, fill=False, padding=0)
|
||||||
|
|
||||||
def _focus_first_button(self, emitter: "Emitter") -> None:
|
def _focus_first_button(self, emitter: "Emitter") -> None:
|
||||||
self.buttons[0].grab_focus()
|
self.buttons[0].grab_focus()
|
||||||
|
|||||||
@@ -3,10 +3,6 @@ from typing import Literal, TYPE_CHECKING
|
|||||||
|
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
APP_NAME,
|
APP_NAME,
|
||||||
EXPAND,
|
|
||||||
NO_EXPAND,
|
|
||||||
NO_FILL,
|
|
||||||
NO_PADDING,
|
|
||||||
)
|
)
|
||||||
from dzgui.const.icons import ICON_SEARCH
|
from dzgui.const.icons import ICON_SEARCH
|
||||||
from dzgui.util.format import format_exception
|
from dzgui.util.format import format_exception
|
||||||
@@ -42,7 +38,10 @@ class ButtonGrid(Gtk.Grid):
|
|||||||
self.checks: list[Gtk.CheckButton] = []
|
self.checks: list[Gtk.CheckButton] = []
|
||||||
|
|
||||||
flowbox = Gtk.FlowBox(
|
flowbox = Gtk.FlowBox(
|
||||||
halign=Gtk.Align.CENTER, min_children_per_line=3, max_children_per_line=3, selection_mode=Gtk.SelectionMode.NONE
|
halign=Gtk.Align.CENTER,
|
||||||
|
min_children_per_line=3,
|
||||||
|
max_children_per_line=3,
|
||||||
|
selection_mode=Gtk.SelectionMode.NONE,
|
||||||
)
|
)
|
||||||
|
|
||||||
for check in defaults.keys():
|
for check in defaults.keys():
|
||||||
@@ -201,7 +200,7 @@ class FilterPanel(Gtk.Box):
|
|||||||
self.maps_entry.connect("key-press-event", self._on_map_entry_keypress)
|
self.maps_entry.connect("key-press-event", self._on_map_entry_keypress)
|
||||||
self.maps_entry.connect("activate", self._on_maps_activated)
|
self.maps_entry.connect("activate", self._on_maps_activated)
|
||||||
|
|
||||||
self.maps_combo.pack_start(renderer_text, EXPAND)
|
self.maps_combo.pack_start(renderer_text, expand=True)
|
||||||
self.maps_combo.connect("changed", self._on_map_changed)
|
self.maps_combo.connect("changed", self._on_map_changed)
|
||||||
self.maps_combo.connect("key-press-event", self._on_combo_keypress)
|
self.maps_combo.connect("key-press-event", self._on_combo_keypress)
|
||||||
|
|
||||||
@@ -211,7 +210,7 @@ class FilterPanel(Gtk.Box):
|
|||||||
self.maps_combo,
|
self.maps_combo,
|
||||||
self.button_grid,
|
self.button_grid,
|
||||||
):
|
):
|
||||||
self.pack_start(el, NO_EXPAND, NO_FILL, NO_PADDING)
|
self.pack_start(el, expand=False, fill=False, padding=0)
|
||||||
|
|
||||||
def _on_maps_activated(self, entry: Gtk.Entry) -> None:
|
def _on_maps_activated(self, entry: Gtk.Entry) -> None:
|
||||||
text = entry.get_text()
|
text = entry.get_text()
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
from typing import Self, TYPE_CHECKING
|
from typing import Self, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.enum import ModButton
|
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.util.strings import mod_panel
|
||||||
from dzgui.views.components.labels import BoldLabel
|
from dzgui.views.components.labels import BoldLabel
|
||||||
|
|
||||||
@@ -55,7 +54,7 @@ class ModSelectionPanel(Gtk.Box):
|
|||||||
for button in buttons:
|
for button in buttons:
|
||||||
b = EnumeratedModButton(button)
|
b = EnumeratedModButton(button)
|
||||||
b.connect("clicked", self._on_button_clicked)
|
b.connect("clicked", self._on_button_clicked)
|
||||||
self.main_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING)
|
self.main_panel.pack_start(b, expand=False, fill=True, padding=0)
|
||||||
|
|
||||||
self.stale_panel = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
|
self.stale_panel = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
|
||||||
self.highlight_stale_button = ModPanelButton(ModButton.HIGHLIGHT_STALE)
|
self.highlight_stale_button = ModPanelButton(ModButton.HIGHLIGHT_STALE)
|
||||||
@@ -67,11 +66,11 @@ class ModSelectionPanel(Gtk.Box):
|
|||||||
self.unhighlight_stale_button,
|
self.unhighlight_stale_button,
|
||||||
self.select_stale_button,
|
self.select_stale_button,
|
||||||
):
|
):
|
||||||
self.stale_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING)
|
self.stale_panel.pack_start(b, expand=False, fill=True, padding=0)
|
||||||
b.connect("clicked", self._on_button_clicked)
|
b.connect("clicked", self._on_button_clicked)
|
||||||
|
|
||||||
for el in header, self.main_panel, self.stale_panel:
|
for el in header, self.main_panel, self.stale_panel:
|
||||||
self.pack_start(el, NO_EXPAND, FILL, NO_PADDING)
|
self.pack_start(el, expand=False, fill=True, padding=0)
|
||||||
|
|
||||||
self.connect("map", self._reinit_button)
|
self.connect("map", self._reinit_button)
|
||||||
|
|
||||||
|
|||||||
@@ -6,10 +6,6 @@ from typing import Literal, TYPE_CHECKING
|
|||||||
|
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
APP_NAME,
|
APP_NAME,
|
||||||
NO_EXPAND,
|
|
||||||
NO_FILL,
|
|
||||||
FILL,
|
|
||||||
NO_PADDING,
|
|
||||||
)
|
)
|
||||||
from dzgui.const.enum import ServerTab
|
from dzgui.const.enum import ServerTab
|
||||||
from dzgui.managers.update import UpdateManager
|
from dzgui.managers.update import UpdateManager
|
||||||
@@ -73,9 +69,9 @@ class RightPanel(Gtk.Box):
|
|||||||
eb.connect("button-press-event", self._on_version_clicked)
|
eb.connect("button-press-event", self._on_version_clicked)
|
||||||
|
|
||||||
for el in self.button_vbox, self.keys, self.filters_vbox, self.refresh_button:
|
for el in self.button_vbox, self.keys, self.filters_vbox, self.refresh_button:
|
||||||
self.pack_start(el, NO_EXPAND, FILL, NO_PADDING)
|
self.pack_start(el, expand=False, fill=True, padding=0)
|
||||||
|
|
||||||
self.pack_start(self.sel_panel, NO_EXPAND, NO_FILL, NO_PADDING)
|
self.pack_start(self.sel_panel, expand=False, fill=False, padding=0)
|
||||||
|
|
||||||
self.update_button = IconTextButton(
|
self.update_button = IconTextButton(
|
||||||
"dialog-information-symbolic", label="Updates available"
|
"dialog-information-symbolic", label="Updates available"
|
||||||
@@ -96,7 +92,7 @@ class RightPanel(Gtk.Box):
|
|||||||
"clicked", self._on_update_button_clicked, exe_path, update
|
"clicked", self._on_update_button_clicked, exe_path, update
|
||||||
)
|
)
|
||||||
self.gutter_box.add(eb)
|
self.gutter_box.add(eb)
|
||||||
self.pack_start(self.gutter_box, NO_EXPAND, FILL, NO_PADDING)
|
self.pack_start(self.gutter_box, expand=False, fill=True, padding=0)
|
||||||
|
|
||||||
def _on_update_button_clicked(
|
def _on_update_button_clicked(
|
||||||
self, button: Gtk.Button, exe_path: str, url: str
|
self, button: Gtk.Button, exe_path: str, url: str
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ from dzgui.const.constants import HEX_GREEN, HEX_RED
|
|||||||
from dzgui.init.coords import get_local_coords
|
from dzgui.init.coords import get_local_coords
|
||||||
from dzgui.init.dayz import is_dayz_installed
|
from dzgui.init.dayz import is_dayz_installed
|
||||||
from dzgui.init.update import check_updates
|
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.managers.threading import call_on_thread, StoredFunc, ThreadingManager
|
||||||
from dzgui.strings import preboot, dialogs
|
from dzgui.strings import preboot, dialogs
|
||||||
from dzgui.util.format import format_exception
|
from dzgui.util.format import format_exception
|
||||||
@@ -118,8 +117,8 @@ class BootDialog(ColorAwareApp, Gtk.Dialog): # type: ignore
|
|||||||
self.error_box.add(self.button_hbox)
|
self.error_box.add(self.button_hbox)
|
||||||
|
|
||||||
self.content = self.get_content_area()
|
self.content = self.get_content_area()
|
||||||
self.content.pack_start(self.scrollable_tree, EXPAND, FILL, 0)
|
self.content.pack_start(self.scrollable_tree, expand=True, fill=True, padding=0)
|
||||||
self.content.pack_start(self.error_box, EXPAND, FILL, 0)
|
self.content.pack_start(self.error_box, expand=True, fill=True, padding=0)
|
||||||
self.show_all()
|
self.show_all()
|
||||||
|
|
||||||
self.error_box.hide()
|
self.error_box.hide()
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from typing import Literal, Self, TYPE_CHECKING
|
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.strings import dialogs
|
||||||
from dzgui.util import strings
|
from dzgui.util import strings
|
||||||
from dzgui.views.components.buttons import ClipboardButton
|
from dzgui.views.components.buttons import ClipboardButton
|
||||||
@@ -46,7 +45,7 @@ class GenericDialog(Gtk.MessageDialog):
|
|||||||
|
|
||||||
def pack(self, widget: Gtk.Widget) -> None:
|
def pack(self, widget: Gtk.Widget) -> None:
|
||||||
content = self.get_content_area()
|
content = self.get_content_area()
|
||||||
content.pack_start(widget, EXPAND, FILL, NO_PADDING)
|
content.pack_start(widget, expand=True, fill=True, padding=0)
|
||||||
|
|
||||||
|
|
||||||
class ConfirmationDialog(GenericDialog):
|
class ConfirmationDialog(GenericDialog):
|
||||||
@@ -121,13 +120,13 @@ class WaitDialog(GenericDialog):
|
|||||||
spinner_box.add(spinner)
|
spinner_box.add(spinner)
|
||||||
|
|
||||||
if self.jobs > 1:
|
if self.jobs > 1:
|
||||||
content.pack_start(self.prog, NO_EXPAND, NO_FILL, 0)
|
content.pack_start(self.prog, expand=False, fill=False, padding=0)
|
||||||
else:
|
else:
|
||||||
content.pack_start(spinner_box, NO_EXPAND, NO_FILL, 0)
|
content.pack_start(spinner_box, expand=False, fill=False, padding=0)
|
||||||
spinner.start()
|
spinner.start()
|
||||||
|
|
||||||
if show_cancel is True:
|
if show_cancel is True:
|
||||||
content.pack_start(self.cancel, NO_EXPAND, NO_FILL, 0)
|
content.pack_start(self.cancel, expand=False, fill=False, padding=0)
|
||||||
|
|
||||||
def update_text(self, msg: str) -> None:
|
def update_text(self, msg: str) -> None:
|
||||||
self.format_secondary_text(msg)
|
self.format_secondary_text(msg)
|
||||||
@@ -272,7 +271,7 @@ class ExceptionDialog(TextBufferDialog):
|
|||||||
bottom_margin=10,
|
bottom_margin=10,
|
||||||
)
|
)
|
||||||
textview.set_buffer(Gtk.TextBuffer(text=trace))
|
textview.set_buffer(Gtk.TextBuffer(text=trace))
|
||||||
box.pack_start(textview, EXPAND, FILL, 0)
|
box.pack_start(textview, expand=True, fill=True, padding=0)
|
||||||
|
|
||||||
self.error_details = Gtk.ScrolledWindow(
|
self.error_details = Gtk.ScrolledWindow(
|
||||||
overlay_scrolling=False,
|
overlay_scrolling=False,
|
||||||
@@ -296,7 +295,7 @@ class ExceptionDialog(TextBufferDialog):
|
|||||||
)
|
)
|
||||||
|
|
||||||
details_textview.set_buffer(self.details_buffer)
|
details_textview.set_buffer(self.details_buffer)
|
||||||
details_box.pack_start(details_textview, EXPAND, FILL, 10)
|
details_box.pack_start(details_textview, expand=True, fill=True, padding=10)
|
||||||
self.error_details.add(details_box)
|
self.error_details.add(details_box)
|
||||||
|
|
||||||
self.error_notebook = Gtk.Notebook(show_tabs=False, margin_bottom=15)
|
self.error_notebook = Gtk.Notebook(show_tabs=False, margin_bottom=15)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import textwrap
|
import textwrap
|
||||||
from typing import Self, TYPE_CHECKING
|
from typing import Self, TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.constants import NO_EXPAND, NO_FILL
|
|
||||||
from dzgui.util.strings import notice
|
from dzgui.util.strings import notice
|
||||||
from dzgui.views.dialogs.generic import GenericDialog
|
from dzgui.views.dialogs.generic import GenericDialog
|
||||||
from dzgui.views.components.buttons import SteamTextButton
|
from dzgui.views.components.buttons import SteamTextButton
|
||||||
@@ -42,7 +41,7 @@ class WorkshopLinkDialog(GenericDialog):
|
|||||||
button.set_margin_start(60)
|
button.set_margin_start(60)
|
||||||
button.set_margin_end(60)
|
button.set_margin_end(60)
|
||||||
button.connect("clicked", self._on_button_clicked, uid)
|
button.connect("clicked", self._on_button_clicked, uid)
|
||||||
self.dialogBox.pack_end(button, NO_EXPAND, NO_FILL, 0)
|
self.dialogBox.pack_end(button, expand=False, fill=False, padding=0)
|
||||||
|
|
||||||
self.show_all()
|
self.show_all()
|
||||||
self.connect("response", self._on_dialog_response)
|
self.connect("response", self._on_dialog_response)
|
||||||
|
|||||||
@@ -13,9 +13,6 @@ from dzgui.const.constants import (
|
|||||||
FLATPAK_RUN_CMD,
|
FLATPAK_RUN_CMD,
|
||||||
FLATPAK_SANDBOX,
|
FLATPAK_SANDBOX,
|
||||||
FLATPAK_STEAM_PATH,
|
FLATPAK_STEAM_PATH,
|
||||||
NO_EXPAND,
|
|
||||||
NO_FILL,
|
|
||||||
NO_PADDING,
|
|
||||||
)
|
)
|
||||||
from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
|
from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
|
||||||
from dzgui.const.endpoints import STEAM_API_SETUP
|
from dzgui.const.endpoints import STEAM_API_SETUP
|
||||||
@@ -233,8 +230,8 @@ class ToggleField(Gtk.Box):
|
|||||||
self.radio1 = Gtk.RadioButton.new_with_label(None, first_option)
|
self.radio1 = Gtk.RadioButton.new_with_label(None, first_option)
|
||||||
self.radio2 = Gtk.RadioButton.new_from_widget(self.radio1)
|
self.radio2 = Gtk.RadioButton.new_from_widget(self.radio1)
|
||||||
self.radio2.set_label(second_option)
|
self.radio2.set_label(second_option)
|
||||||
self.pack_start(self.radio1, NO_EXPAND, NO_FILL, NO_PADDING)
|
self.pack_start(self.radio1, expand=False, fill=False, padding=0)
|
||||||
self.pack_start(self.radio2, NO_EXPAND, NO_FILL, NO_PADDING)
|
self.pack_start(self.radio2, expand=False, fill=False, padding=0)
|
||||||
|
|
||||||
def set_suboption_active(self, state: bool) -> None:
|
def set_suboption_active(self, state: bool) -> None:
|
||||||
# NOTE: defer connection of signal until after state is set
|
# NOTE: defer connection of signal until after state is set
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from pathlib import Path
|
from shared import get_git_root
|
||||||
|
|
||||||
BOILERPLATE = """
|
BOILERPLATE = """
|
||||||
This file includes the combined licenses to the following components:
|
This file includes the combined licenses to the following components:
|
||||||
@@ -40,7 +40,7 @@ class CombinedLicense:
|
|||||||
|
|
||||||
def concat_license() -> str:
|
def concat_license() -> str:
|
||||||
combined = CombinedLicense()
|
combined = CombinedLicense()
|
||||||
root = Path(__file__).resolve().parents[1]
|
root = get_git_root()
|
||||||
licenses = root.joinpath("docs/licenses")
|
licenses = root.joinpath("docs/licenses")
|
||||||
|
|
||||||
main_license = root.joinpath(LICENSE_FILE)
|
main_license = root.joinpath(LICENSE_FILE)
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
par = Path(__file__).parent.parent
|
from shared import get_git_root
|
||||||
clog = par / "CHANGELOG.md"
|
|
||||||
target = par / "dzgui/data/CHANGELOG.md"
|
root = get_git_root()
|
||||||
|
clog = root.joinpath("CHANGELOG.md")
|
||||||
|
target = root.joinpath("dzgui/data/CHANGELOG.md")
|
||||||
|
|
||||||
shutil.copy(clog, target)
|
shutil.copy(clog, target)
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import tomllib
|
import tomllib
|
||||||
from pathlib import Path
|
from shared import get_git_root
|
||||||
|
|
||||||
root = Path(__file__).resolve().parents[1]
|
|
||||||
|
|
||||||
|
|
||||||
def get_entrypoint() -> None:
|
def get_entrypoint() -> None:
|
||||||
|
root = get_git_root()
|
||||||
p = root.joinpath("pyproject.toml")
|
p = root.joinpath("pyproject.toml")
|
||||||
with open(p, "rb") as f:
|
with open(p, "rb") as f:
|
||||||
t = tomllib.load(f)
|
t = tomllib.load(f)
|
||||||
|
|||||||
+3
-2
@@ -3,14 +3,15 @@ import requests
|
|||||||
import subprocess
|
import subprocess
|
||||||
import tarfile
|
import tarfile
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
from urllib.parse import unquote
|
from urllib.parse import unquote
|
||||||
|
|
||||||
|
from shared import get_git_root
|
||||||
|
|
||||||
BUILD = "3.13.9"
|
BUILD = "3.13.9"
|
||||||
DATE = "20251014"
|
DATE = "20251014"
|
||||||
CPYTHON_BUILD = f"cpython-{BUILD}"
|
CPYTHON_BUILD = f"cpython-{BUILD}"
|
||||||
|
|
||||||
root = Path(__file__).resolve().parents[1]
|
root = get_git_root()
|
||||||
build_dir = root.joinpath("build")
|
build_dir = root.joinpath("build")
|
||||||
cpython_dir = build_dir.joinpath(CPYTHON_BUILD)
|
cpython_dir = build_dir.joinpath(CPYTHON_BUILD)
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -9,6 +9,7 @@ from pathlib import Path
|
|||||||
from concat_licenses import concat_license
|
from concat_licenses import concat_license
|
||||||
from parse_toml import get_entrypoint
|
from parse_toml import get_entrypoint
|
||||||
from prebuild import get_pyapp, rebuild_cpython
|
from prebuild import get_pyapp, rebuild_cpython
|
||||||
|
from shared import get_git_root
|
||||||
|
|
||||||
|
|
||||||
def update_uname(info: tarfile.TarInfo) -> tarfile.TarInfo:
|
def update_uname(info: tarfile.TarInfo) -> tarfile.TarInfo:
|
||||||
@@ -17,7 +18,7 @@ def update_uname(info: tarfile.TarInfo) -> tarfile.TarInfo:
|
|||||||
return info
|
return info
|
||||||
|
|
||||||
|
|
||||||
root = Path(__file__).resolve().parents[1]
|
root = get_git_root()
|
||||||
dist_dir = root.joinpath("dist")
|
dist_dir = root.joinpath("dist")
|
||||||
build_dir = root.joinpath("build")
|
build_dir = root.joinpath("build")
|
||||||
|
|
||||||
|
|||||||
+1
-10
@@ -1,16 +1,7 @@
|
|||||||
import subprocess
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from dzgui.app_init import build_gui
|
from dzgui.app_init import build_gui
|
||||||
|
from shared import get_git_root
|
||||||
|
|
||||||
def get_git_root() -> Path:
|
|
||||||
proc = subprocess.run(
|
|
||||||
["git", "rev-parse", "--show-toplevel"], capture_output=True, text=True
|
|
||||||
)
|
|
||||||
if proc.returncode != 0:
|
|
||||||
raise OSError("Failed to parse git root")
|
|
||||||
return Path(proc.stdout.rstrip())
|
|
||||||
|
|
||||||
|
|
||||||
def get_image_path() -> Path:
|
def get_image_path() -> Path:
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def get_git_root() -> Path:
|
||||||
|
proc = subprocess.run(
|
||||||
|
["git", "rev-parse", "--show-toplevel"], capture_output=True, text=True
|
||||||
|
)
|
||||||
|
if proc.returncode != 0:
|
||||||
|
raise OSError("Failed to parse git root")
|
||||||
|
return Path(proc.stdout.rstrip())
|
||||||
Reference in new issue
Block a user