mirror of
https://github.com/aclist/dztui.git
synced 2026-11-10 12:00:38 +01:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e5fadf928 | ||
|
|
fa2f86b03e | ||
|
|
c8fe6ec056 | ||
|
|
6901e5456e |
No files matched your search
-119
@@ -1,119 +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.
|
|
||||||
|
|
||||||
# TODO: remarks on DZGUI 6 stable vs testing branch logic and "over the air" updates vs standalone builds
|
|
||||||
# TODO: note archived branch names
|
|
||||||
|
|
||||||
### 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.
|
|
||||||
@@ -24,14 +24,6 @@ from typing import Any
|
|||||||
logger = logging.getLogger(APP_NAME)
|
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]:
|
def get_local_mod_ids(steam_path: Path) -> list[int]:
|
||||||
workshop_path = get_local_mod_path(steam_path)
|
workshop_path = get_local_mod_path(steam_path)
|
||||||
mods = get_local_mods(workshop_path)
|
mods = get_local_mods(workshop_path)
|
||||||
|
|||||||
@@ -158,9 +158,6 @@ def build_gui(version: str, is_debug: bool) -> App | None:
|
|||||||
f.truncate(0)
|
f.truncate(0)
|
||||||
|
|
||||||
if _is_steam_deck is False:
|
if _is_steam_deck is False:
|
||||||
# TODO: sudo escalation dialog
|
|
||||||
# count = get_map_count()
|
|
||||||
# TODO: move into module
|
|
||||||
if FLATPAK_ROOT_PATH in lookup(XDG.config, Preferences.DEFAULT):
|
if FLATPAK_ROOT_PATH in lookup(XDG.config, Preferences.DEFAULT):
|
||||||
has_client = has_flatpak_client()
|
has_client = has_flatpak_client()
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ from dzgui.strings.dialogs import (
|
|||||||
waiting_for_directories,
|
waiting_for_directories,
|
||||||
)
|
)
|
||||||
from dzgui.strings import kb
|
from dzgui.strings import kb
|
||||||
from dzgui.strings.server_mods import checkmark, resync
|
from dzgui.strings.server_mods import checkmark, resync, invalid_mod
|
||||||
from dzgui.util.format import format_exception, format_mib
|
from dzgui.util.format import format_exception, format_mib
|
||||||
from dzgui.util.strings import dialog, server_timeout
|
from dzgui.util.strings import dialog, server_timeout
|
||||||
from dzgui.util.symlink import rebuild_symlinks
|
from dzgui.util.symlink import rebuild_symlinks
|
||||||
@@ -197,9 +197,8 @@ class ConnectionManager:
|
|||||||
|
|
||||||
is_last = self.is_last_server()
|
is_last = self.is_last_server()
|
||||||
|
|
||||||
# TODO: strings
|
|
||||||
invalid_mods = [
|
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(
|
prereqs = Prerequisites(
|
||||||
@@ -277,8 +276,7 @@ class ConnectionManager:
|
|||||||
for mod in alpha_mods:
|
for mod in alpha_mods:
|
||||||
# NOTE: if the mod is neither synched or out of date, it is a malformed mod
|
# NOTE: if the mod is neither synched or out of date, it is a malformed mod
|
||||||
if mod[2] == "":
|
if mod[2] == "":
|
||||||
# TODO: strings
|
mod[2] = invalid_mod
|
||||||
mod[2] = "Invalid mod"
|
|
||||||
|
|
||||||
return alpha_mods, missing_mods
|
return alpha_mods, missing_mods
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ from typing import TYPE_CHECKING
|
|||||||
|
|
||||||
from dzgui.model.model_factory import ModelFactory
|
from dzgui.model.model_factory import ModelFactory
|
||||||
from dzgui.util import strings
|
from dzgui.util import strings
|
||||||
from dzgui.util.strings import all_maps
|
from dzgui.strings.filters import all_maps
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.model.model_factory import FastInsertListStore
|
from dzgui.model.model_factory import FastInsertListStore
|
||||||
@@ -106,16 +106,10 @@ class FilterManager:
|
|||||||
|
|
||||||
self.reinit_map_store()
|
self.reinit_map_store()
|
||||||
maps.sort()
|
maps.sort()
|
||||||
for m in maps:
|
clean = [m for m in maps if m != all_maps]
|
||||||
# TODO: strings
|
for m in clean:
|
||||||
if m == "All maps":
|
|
||||||
continue
|
|
||||||
self.append_map([m])
|
self.append_map([m])
|
||||||
|
|
||||||
# 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:
|
def get_all_filters(self) -> tuple:
|
||||||
map_name = self.get_active_map_name()
|
map_name = self.get_active_map_name()
|
||||||
enabled = self.get_filters()
|
enabled = self.get_filters()
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ from typing import Any, TYPE_CHECKING, Union
|
|||||||
from dzgui.const.enum import FilterMode
|
from dzgui.const.enum import FilterMode
|
||||||
from dzgui.model.model_factory import ModelFactory
|
from dzgui.model.model_factory import ModelFactory
|
||||||
from dzgui.util import strings
|
from dzgui.util import strings
|
||||||
|
from dzgui.strings import filters as str_filters
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.managers.filter import FilterManager
|
from dzgui.managers.filter import FilterManager
|
||||||
@@ -175,7 +176,7 @@ class ProxyModelManager:
|
|||||||
rows = self.filtered
|
rows = self.filtered
|
||||||
sel_map = self.filter_man.get_active_map_name()
|
sel_map = self.filter_man.get_active_map_name()
|
||||||
|
|
||||||
if sel_map == strings.all_maps:
|
if sel_map == str_filters.all_maps:
|
||||||
return rows
|
return rows
|
||||||
|
|
||||||
rows = [row for row in rows if row[1] == sel_map]
|
rows = [row for row in rows if row[1] == sel_map]
|
||||||
|
|||||||
@@ -1,2 +1,16 @@
|
|||||||
|
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 = "Steam Workshop"
|
||||||
workshop_tooltip = "Open your Workshop subscriptions"
|
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"
|
||||||
@@ -29,3 +29,5 @@ toggle_calc = "Toggle calculator"
|
|||||||
|
|
||||||
server_details = "Server details"
|
server_details = "Server details"
|
||||||
server_message = "Server message"
|
server_message = "Server message"
|
||||||
|
|
||||||
|
caught_cancel_signal = "Caught cancel signal, cleaning up"
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
all_maps = "All maps"
|
||||||
|
filters_heading = "Filters"
|
||||||
|
keyword_placeholder = "Filter by keyword"
|
||||||
|
map_placeholder = "Filter by map"
|
||||||
@@ -1 +1,2 @@
|
|||||||
|
tab_changed_label = "*"
|
||||||
selectable_tree = "Ctrl-click to select multiple; Shift-click to select a range."
|
selectable_tree = "Ctrl-click to select multiple; Shift-click to select a range."
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
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}'"
|
||||||
@@ -16,7 +16,9 @@ lan_combo = "LAN"
|
|||||||
fullscreen_eventbox = "This option is not available on Steam Deck."
|
fullscreen_eventbox = "This option is not available on Steam Deck."
|
||||||
save_button = "Save"
|
save_button = "Save"
|
||||||
|
|
||||||
|
api_placeholder = "Enter API key"
|
||||||
api_failed = "API validation failed"
|
api_failed = "API validation failed"
|
||||||
|
api_validate = "Validate"
|
||||||
|
|
||||||
flatpak_label = "Flatpak client"
|
flatpak_label = "Flatpak client"
|
||||||
flatpak_standard = "Standard"
|
flatpak_standard = "Standard"
|
||||||
|
|||||||
@@ -3,4 +3,5 @@ mod_id = "ID"
|
|||||||
up_to_date = "Up to date"
|
up_to_date = "Up to date"
|
||||||
modlist = "Modlist"
|
modlist = "Modlist"
|
||||||
checkmark = "✓"
|
checkmark = "✓"
|
||||||
resync="⟳"
|
resync = "⟳"
|
||||||
|
invalid_mod = "Invalid mod"
|
||||||
@@ -159,9 +159,6 @@ filter_unofficial = "Unofficial"
|
|||||||
filter_modded = "Modded"
|
filter_modded = "Modded"
|
||||||
filter_unmodded = "Unmodded"
|
filter_unmodded = "Unmodded"
|
||||||
|
|
||||||
# maps
|
|
||||||
all_maps = "All maps"
|
|
||||||
|
|
||||||
# state
|
# state
|
||||||
unknown = "Unknown"
|
unknown = "Unknown"
|
||||||
none_provided = "None provided"
|
none_provided = "None provided"
|
||||||
|
|||||||
@@ -106,8 +106,7 @@ class ClipboardButton(IconTextButton):
|
|||||||
self.controller = controller
|
self.controller = controller
|
||||||
self.connect("clicked", self._on_button_clicked, func)
|
self.connect("clicked", self._on_button_clicked, func)
|
||||||
|
|
||||||
# TODO: strings
|
self.set_tooltip_text(buttons.clipboard_button)
|
||||||
self.set_tooltip_text("Copy to clipboard")
|
|
||||||
|
|
||||||
def _on_button_clicked(self, button: Self, func: Callable) -> None:
|
def _on_button_clicked(self, button: Self, func: Callable) -> None:
|
||||||
def revert() -> Literal[False]:
|
def revert() -> Literal[False]:
|
||||||
@@ -125,16 +124,14 @@ class CopyIpButton(ClipboardButton):
|
|||||||
def __init__(self, controller: Union["Controller", None], func: Callable) -> None:
|
def __init__(self, controller: Union["Controller", None], func: Callable) -> None:
|
||||||
super().__init__(controller, func)
|
super().__init__(controller, func)
|
||||||
|
|
||||||
# TODO: strings
|
self.set_tooltip_text(buttons.clipboard_ip_button)
|
||||||
self.set_tooltip_text("Copy IP to clipboard")
|
|
||||||
|
|
||||||
|
|
||||||
class CloseButton(IconTextButton):
|
class CloseButton(IconTextButton):
|
||||||
def __init__(self, label: str) -> None:
|
def __init__(self, label: str) -> None:
|
||||||
super().__init__(icon=CLOSE, label=label)
|
super().__init__(icon=CLOSE, label=label)
|
||||||
|
|
||||||
# TODO: strings
|
self.set_tooltip_text(buttons.unset_button_tooltip)
|
||||||
self.set_tooltip_text("Unset this server as favorite")
|
|
||||||
|
|
||||||
|
|
||||||
class WebButton(IconTextButton):
|
class WebButton(IconTextButton):
|
||||||
@@ -252,6 +249,7 @@ class AddButton(IconTextButton):
|
|||||||
self.set_tooltip_text(connect_panel.add_tooltip)
|
self.set_tooltip_text(connect_panel.add_tooltip)
|
||||||
|
|
||||||
|
|
||||||
|
# TODO: drop
|
||||||
class LoggerAlertsButton(IconTextButton):
|
class LoggerAlertsButton(IconTextButton):
|
||||||
def __init__(self, warnings: int, errors: int) -> None:
|
def __init__(self, warnings: int, errors: int) -> None:
|
||||||
warnings_text = ""
|
warnings_text = ""
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ from typing import Self, TYPE_CHECKING
|
|||||||
from dzgui.const.constants import CARET_DOWN, CARET_UP, UDP_PORT
|
from dzgui.const.constants import CARET_DOWN, CARET_UP, UDP_PORT
|
||||||
from dzgui.model.servers import ServerModelManager
|
from dzgui.model.servers import ServerModelManager
|
||||||
from dzgui.strings import connect_panel
|
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.util.keys import is_ctrl_mask
|
||||||
from dzgui.views.components.buttons import (
|
from dzgui.views.components.buttons import (
|
||||||
AddButton,
|
AddButton,
|
||||||
@@ -36,21 +41,18 @@ class DockButton(IconButton):
|
|||||||
self.child = child
|
self.child = child
|
||||||
self.connect("clicked", self._on_click)
|
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_margin_top(10)
|
||||||
self.set_tooltip_text(self.collapse_text)
|
self.set_tooltip_text(dock_button_collapse)
|
||||||
|
|
||||||
def collapse(self) -> None:
|
def collapse(self) -> None:
|
||||||
self.set_image(Icon(CARET_UP))
|
self.set_image(Icon(CARET_UP))
|
||||||
self.child.hide()
|
self.child.hide()
|
||||||
self.set_tooltip_text(self.expand_text)
|
self.set_tooltip_text(dock_button_expand)
|
||||||
|
|
||||||
def expand(self) -> None:
|
def expand(self) -> None:
|
||||||
self.set_image(Icon(CARET_DOWN))
|
self.set_image(Icon(CARET_DOWN))
|
||||||
self.child.show()
|
self.child.show()
|
||||||
self.set_tooltip_text(self.collapse_text)
|
self.set_tooltip_text(dock_button_collapse)
|
||||||
|
|
||||||
def _on_click(self, button: Self) -> None:
|
def _on_click(self, button: Self) -> None:
|
||||||
if self.expanded:
|
if self.expanded:
|
||||||
@@ -81,7 +83,6 @@ class LanPanel(Gtk.Frame):
|
|||||||
self.scan = Gtk.Button(label=connect_panel.lan_scan_button)
|
self.scan = Gtk.Button(label=connect_panel.lan_scan_button)
|
||||||
self.scan.connect("clicked", self._on_scan_clicked)
|
self.scan.connect("clicked", self._on_scan_clicked)
|
||||||
|
|
||||||
# TODO: strings
|
|
||||||
self.early_abort = Gtk.CheckButton(label=connect_panel.lan_checkbox)
|
self.early_abort = Gtk.CheckButton(label=connect_panel.lan_checkbox)
|
||||||
self.early_abort.set_active(True)
|
self.early_abort.set_active(True)
|
||||||
self.early_abort.set_tooltip_text(connect_panel.lan_abort_tooltip)
|
self.early_abort.set_tooltip_text(connect_panel.lan_abort_tooltip)
|
||||||
@@ -189,8 +190,7 @@ class FavPanel(Gtk.Frame):
|
|||||||
self.fav_button.connect("clicked", self._on_connect_clicked)
|
self.fav_button.connect("clicked", self._on_connect_clicked)
|
||||||
self.copy_button = CopyIpButton(self.controller, self.get_fav_ip)
|
self.copy_button = CopyIpButton(self.controller, self.get_fav_ip)
|
||||||
|
|
||||||
# TODO: strings
|
self.unset_button = CloseButton(unset_button_label)
|
||||||
self.unset_button = CloseButton("Unset")
|
|
||||||
self.unset_button.connect("clicked", self._on_unset_clicked)
|
self.unset_button.connect("clicked", self._on_unset_clicked)
|
||||||
|
|
||||||
if favorite is None:
|
if favorite is None:
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ from dzgui.api.servers import validate_ip
|
|||||||
from dzgui.const.constants import VIEW_CONCEAL, VIEW_REVEAL
|
from dzgui.const.constants import VIEW_CONCEAL, VIEW_REVEAL
|
||||||
from dzgui.util.css import add_class, remove_class
|
from dzgui.util.css import add_class, remove_class
|
||||||
from dzgui.strings import connect_panel
|
from dzgui.strings import connect_panel
|
||||||
|
from dzgui.strings.options import api_placeholder, api_validate
|
||||||
from dzgui.strings.errors import api_popover
|
from dzgui.strings.errors import api_popover
|
||||||
|
|
||||||
import gi
|
import gi
|
||||||
@@ -143,9 +144,8 @@ class APIEntry(Gtk.Box):
|
|||||||
|
|
||||||
self.func: Callable | None = None
|
self.func: Callable | None = None
|
||||||
|
|
||||||
# TODO: strings
|
|
||||||
self.entry = Gtk.Entry(
|
self.entry = Gtk.Entry(
|
||||||
width_chars=60, hexpand=True, placeholder_text="Enter API key"
|
width_chars=60, hexpand=True, placeholder_text=api_placeholder
|
||||||
)
|
)
|
||||||
self.entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, 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_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
|
||||||
@@ -154,8 +154,7 @@ class APIEntry(Gtk.Box):
|
|||||||
self.entry.connect("icon-release", self._on_icon_release)
|
self.entry.connect("icon-release", self._on_icon_release)
|
||||||
self.entry.connect("activate", self._on_field_activated)
|
self.entry.connect("activate", self._on_field_activated)
|
||||||
|
|
||||||
# TODO: strings
|
self.submit = Gtk.Button(label=api_validate)
|
||||||
self.submit = Gtk.Button(label="Validate")
|
|
||||||
self.submit.set_sensitive(False)
|
self.submit.set_sensitive(False)
|
||||||
self.submit.connect("clicked", self._on_submit)
|
self.submit.connect("clicked", self._on_submit)
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,12 @@ from dzgui.const.constants import (
|
|||||||
SEARCH_ICON,
|
SEARCH_ICON,
|
||||||
)
|
)
|
||||||
from dzgui.util.format import format_exception
|
from dzgui.util.format import format_exception
|
||||||
from dzgui.util.strings import all_maps
|
from dzgui.strings.filters import (
|
||||||
|
all_maps,
|
||||||
|
filters_heading,
|
||||||
|
keyword_placeholder,
|
||||||
|
map_placeholder,
|
||||||
|
)
|
||||||
from dzgui.views.components.maps_combo import MapsCombo
|
from dzgui.views.components.maps_combo import MapsCombo
|
||||||
from dzgui.views.components.labels import BoldLabel
|
from dzgui.views.components.labels import BoldLabel
|
||||||
|
|
||||||
@@ -42,7 +47,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():
|
||||||
@@ -99,8 +107,7 @@ class ButtonGrid(Gtk.Grid):
|
|||||||
|
|
||||||
class KeywordEntry(Gtk.Entry):
|
class KeywordEntry(Gtk.Entry):
|
||||||
def __init__(self, controller: "Controller") -> None:
|
def __init__(self, controller: "Controller") -> None:
|
||||||
# TODO :strings
|
super().__init__(placeholder_text=keyword_placeholder)
|
||||||
super().__init__(placeholder_text="Filter by keyword")
|
|
||||||
|
|
||||||
self.keyword = ""
|
self.keyword = ""
|
||||||
self.controller = controller
|
self.controller = controller
|
||||||
@@ -174,8 +181,7 @@ class FilterPanel(Gtk.Box):
|
|||||||
self.keyword_entry = KeywordEntry(self.controller)
|
self.keyword_entry = KeywordEntry(self.controller)
|
||||||
self.button_grid = ButtonGrid(self.controller, defaults, tooltips)
|
self.button_grid = ButtonGrid(self.controller, defaults, tooltips)
|
||||||
|
|
||||||
# TODO: strings
|
self.filters_label = BoldLabel(filters_heading)
|
||||||
self.filters_label = BoldLabel("Filters")
|
|
||||||
|
|
||||||
self.emitter.connect(
|
self.emitter.connect(
|
||||||
"request_keyword_focus", lambda _: self.keyword_entry.grab_focus()
|
"request_keyword_focus", lambda _: self.keyword_entry.grab_focus()
|
||||||
@@ -195,8 +201,7 @@ class FilterPanel(Gtk.Box):
|
|||||||
|
|
||||||
self.maps_entry: Gtk.Entry = self.maps_combo.get_child() # type: ignore
|
self.maps_entry: Gtk.Entry = self.maps_combo.get_child() # type: ignore
|
||||||
self.maps_entry.set_completion(completion)
|
self.maps_entry.set_completion(completion)
|
||||||
# TODO: strings
|
self.maps_entry.set_placeholder_text(map_placeholder)
|
||||||
self.maps_entry.set_placeholder_text("Filter by map")
|
|
||||||
self.maps_entry.connect("changed", self._on_map_completion, True)
|
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("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)
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ from dzgui.const.constants import (
|
|||||||
)
|
)
|
||||||
from dzgui.const.enum import ServerTab
|
from dzgui.const.enum import ServerTab
|
||||||
from dzgui.managers.update import UpdateManager
|
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.clip import copy_clipboard
|
||||||
from dzgui.util.file import is_writeable
|
from dzgui.util.file import is_writeable
|
||||||
from dzgui.views.components.buttonbox import ButtonBox
|
from dzgui.views.components.buttonbox import ButtonBox
|
||||||
@@ -65,8 +66,7 @@ class RightPanel(Gtk.Box):
|
|||||||
vexpand=True,
|
vexpand=True,
|
||||||
halign=Gtk.Align.END,
|
halign=Gtk.Align.END,
|
||||||
valign=Gtk.Align.END,
|
valign=Gtk.Align.END,
|
||||||
# TODO: strings
|
tooltip_text=version_tooltip,
|
||||||
tooltip_text="Click to copy to clipboard",
|
|
||||||
)
|
)
|
||||||
eb = Gtk.EventBox(halign=Gtk.Align.END, valign=Gtk.Align.END)
|
eb = Gtk.EventBox(halign=Gtk.Align.END, valign=Gtk.Align.END)
|
||||||
eb.add(self.version_label)
|
eb.add(self.version_label)
|
||||||
@@ -78,7 +78,7 @@ class RightPanel(Gtk.Box):
|
|||||||
self.pack_start(self.sel_panel, NO_EXPAND, NO_FILL, NO_PADDING)
|
self.pack_start(self.sel_panel, NO_EXPAND, NO_FILL, NO_PADDING)
|
||||||
|
|
||||||
self.update_button = IconTextButton(
|
self.update_button = IconTextButton(
|
||||||
"dialog-information-symbolic", label="Updates available"
|
"dialog-information-symbolic", label=update_button
|
||||||
)
|
)
|
||||||
|
|
||||||
self.gutter_box = Gtk.Box(
|
self.gutter_box = Gtk.Box(
|
||||||
@@ -131,7 +131,6 @@ class RightPanel(Gtk.Box):
|
|||||||
return
|
return
|
||||||
self.copying = True
|
self.copying = True
|
||||||
version = self.version_label.get_text()
|
version = self.version_label.get_text()
|
||||||
# TODO: strings
|
self.version_label.set_text(version_notifier)
|
||||||
self.version_label.set_text("Copied!")
|
|
||||||
copy_clipboard(version)
|
copy_clipboard(version)
|
||||||
GLib.timeout_add_seconds(1, revert)
|
GLib.timeout_add_seconds(1, revert)
|
||||||
@@ -140,8 +140,7 @@ class WaitDialog(GenericDialog):
|
|||||||
self.cur_job += 1
|
self.cur_job += 1
|
||||||
|
|
||||||
def _on_cancel_clicked(self, button: Gtk.Button) -> None:
|
def _on_cancel_clicked(self, button: Gtk.Button) -> None:
|
||||||
# TODO: strings
|
GLib.idle_add(self.update_text, dialogs.caught_cancel_signal)
|
||||||
GLib.idle_add(self.update_text, "Caught cancel signal, cleaning up")
|
|
||||||
self.controller.set_cancel_event()
|
self.controller.set_cancel_event()
|
||||||
|
|
||||||
def show_cancel(self, state: bool) -> None:
|
def show_cancel(self, state: bool) -> None:
|
||||||
|
|||||||
+11
-19
@@ -1,12 +1,13 @@
|
|||||||
from typing import Self, TYPE_CHECKING
|
from typing import Self, TYPE_CHECKING
|
||||||
|
|
||||||
|
from dzgui.strings import notes
|
||||||
from dzgui.views.components.entry import ValidatedEntry
|
from dzgui.views.components.entry import ValidatedEntry
|
||||||
from dzgui.views.dialogs.generic import GenericDialog
|
from dzgui.views.dialogs.generic import GenericDialog
|
||||||
|
|
||||||
import gi # noqa E402
|
import gi
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gdk, Gtk # noqa E402
|
from gi.repository import Gtk
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.controllers.mc import Controller
|
from dzgui.controllers.mc import Controller
|
||||||
@@ -14,23 +15,20 @@ if TYPE_CHECKING:
|
|||||||
|
|
||||||
class NoteDialog(GenericDialog):
|
class NoteDialog(GenericDialog):
|
||||||
def __init__(self, controller: "Controller"):
|
def __init__(self, controller: "Controller"):
|
||||||
# TODO: add to strings
|
|
||||||
title = "Add a short note/reminder."
|
|
||||||
secondary = "Limit 30 chars"
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
controller=controller,
|
controller=controller,
|
||||||
text=title,
|
text=notes.dialog_title,
|
||||||
buttons=Gtk.ButtonsType.NONE,
|
buttons=Gtk.ButtonsType.NONE,
|
||||||
mtype=Gtk.MessageType.INFO,
|
mtype=Gtk.MessageType.INFO,
|
||||||
secondary=secondary,
|
secondary=notes.dialog_subtitle,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.controller = controller
|
self.controller = controller
|
||||||
|
|
||||||
delete_button = Gtk.Button(label="Delete note")
|
delete_button = Gtk.Button(label=notes.delete_button)
|
||||||
delete_button.set_sensitive(False)
|
delete_button.set_sensitive(False)
|
||||||
self.add_action_widget(delete_button, Gtk.ResponseType.CANCEL)
|
self.add_action_widget(delete_button, Gtk.ResponseType.CANCEL)
|
||||||
self.ok = self.add_button("Update note", Gtk.ResponseType.OK)
|
self.ok = self.add_button(notes.ok_button, Gtk.ResponseType.OK)
|
||||||
self.ok.grab_default()
|
self.ok.grab_default()
|
||||||
|
|
||||||
self.entry = ValidatedEntry(controller, self.validate)
|
self.entry = ValidatedEntry(controller, self.validate)
|
||||||
@@ -42,7 +40,7 @@ class NoteDialog(GenericDialog):
|
|||||||
self.entry.set_text(note)
|
self.entry.set_text(note)
|
||||||
if len(note) > 0:
|
if len(note) > 0:
|
||||||
delete_button.set_sensitive(True)
|
delete_button.set_sensitive(True)
|
||||||
self.format_secondary_text(f"Current note: '{note}'")
|
self.format_secondary_text(notes.current_note.format(note))
|
||||||
elif len(note) == 0:
|
elif len(note) == 0:
|
||||||
self.ok.set_sensitive(False)
|
self.ok.set_sensitive(False)
|
||||||
|
|
||||||
@@ -55,9 +53,6 @@ class NoteDialog(GenericDialog):
|
|||||||
self.entry.connect("changed", self._on_text_changed)
|
self.entry.connect("changed", self._on_text_changed)
|
||||||
|
|
||||||
def _on_text_changed(self, entry: Gtk.Entry) -> None:
|
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:
|
if len(entry.get_text()) == 0:
|
||||||
self.ok.set_sensitive(False)
|
self.ok.set_sensitive(False)
|
||||||
|
|
||||||
@@ -71,14 +66,11 @@ class NoteDialog(GenericDialog):
|
|||||||
|
|
||||||
def _on_response(self, dialog: Self, response: Gtk.ResponseType) -> None:
|
def _on_response(self, dialog: Self, response: Gtk.ResponseType) -> None:
|
||||||
match response:
|
match response:
|
||||||
case Gtk.ResponseType.DELETE_EVENT:
|
|
||||||
self.destroy()
|
|
||||||
case Gtk.ResponseType.OK:
|
case Gtk.ResponseType.OK:
|
||||||
note = self.entry.get_text()
|
note = self.entry.get_text()
|
||||||
self.controller.add_note(note)
|
self.controller.add_note(note)
|
||||||
self.destroy()
|
|
||||||
case Gtk.ResponseType.CANCEL:
|
case Gtk.ResponseType.CANCEL:
|
||||||
self.controller.delete_note()
|
self.controller.delete_note()
|
||||||
self.destroy()
|
case _:
|
||||||
case Gtk.ResponseType.CANCEL | Gtk.ResponseType.CLOSE:
|
pass
|
||||||
self.destroy()
|
self.destroy()
|
||||||
@@ -14,7 +14,7 @@ from dzgui.const.constants import (
|
|||||||
HERO_PATH,
|
HERO_PATH,
|
||||||
FLATPAK_ROOT_PATH,
|
FLATPAK_ROOT_PATH,
|
||||||
LEGACY_CONFIG_PATH,
|
LEGACY_CONFIG_PATH,
|
||||||
TMP_PATH
|
TMP_PATH,
|
||||||
)
|
)
|
||||||
from dzgui.const.boilerplate import config_boilerplate
|
from dzgui.const.boilerplate import config_boilerplate
|
||||||
from dzgui.const.endpoints import STEAM_API_SETUP
|
from dzgui.const.endpoints import STEAM_API_SETUP
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ from typing import Self, TYPE_CHECKING
|
|||||||
from dzgui.const.constants import APP_NAME
|
from dzgui.const.constants import APP_NAME
|
||||||
from dzgui.const.enum import ContextMenuGroup, ServerTab
|
from dzgui.const.enum import ContextMenuGroup, ServerTab
|
||||||
from dzgui.views.trees.tree_servers import ServerTreeView
|
from dzgui.views.trees.tree_servers import ServerTreeView
|
||||||
|
from dzgui.strings.generic import tab_changed_label
|
||||||
from dzgui.util.strings import server_labels
|
from dzgui.util.strings import server_labels
|
||||||
|
|
||||||
import gi
|
import gi
|
||||||
@@ -147,8 +148,7 @@ class ServerNotebook(Gtk.ScrolledWindow):
|
|||||||
|
|
||||||
label = self.notebook.get_tab_label_text(child)
|
label = self.notebook.get_tab_label_text(child)
|
||||||
if label is not None:
|
if label is not None:
|
||||||
# TODO: strings
|
text = label.strip(tab_changed_label)
|
||||||
text = label.strip("*")
|
|
||||||
self.notebook.set_tab_label_text(child, text)
|
self.notebook.set_tab_label_text(child, text)
|
||||||
|
|
||||||
tree = child.get_tree()
|
tree = child.get_tree()
|
||||||
|
|||||||
Reference in new issue
Block a user