mirror of
https://github.com/aclist/dztui.git
synced 2026-11-10 12:00:38 +01:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c94e4e73db | ||
|
|
8da264686a | ||
|
|
598973104c | ||
|
|
15d4b71350 | ||
|
|
16d3df618a | ||
|
|
22dd8fc67f | ||
|
|
03fa707305 | ||
|
|
2479cbd41b |
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.
|
|
||||||
@@ -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.
|
||||||
@@ -5,6 +5,7 @@ from dzgui.util._json import read_json
|
|||||||
|
|
||||||
from dzgui.const.enum import Preferences
|
from dzgui.const.enum import Preferences
|
||||||
|
|
||||||
|
|
||||||
class ConfigFileError(Exception):
|
class ConfigFileError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -39,4 +40,4 @@ def get_favorites(path: Path) -> list[str]:
|
|||||||
|
|
||||||
|
|
||||||
def enum_to_key(enum: Preferences) -> str:
|
def enum_to_key(enum: Preferences) -> str:
|
||||||
return str(enum.dict["key"])
|
return str(enum.key)
|
||||||
+224
-206
@@ -1,7 +1,9 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
from dataclasses import dataclass
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
from typing import Any, Self
|
|
||||||
|
|
||||||
from dzgui.util import strings
|
from dzgui.util import strings
|
||||||
|
from dzgui.strings import rows
|
||||||
|
|
||||||
|
|
||||||
class Port(Enum):
|
class Port(Enum):
|
||||||
@@ -46,125 +48,61 @@ class FilterMode(Enum):
|
|||||||
TOGGLE_ON = 3
|
TOGGLE_ON = 3
|
||||||
|
|
||||||
|
|
||||||
class EnumWithAttrs(Enum):
|
@dataclass(slots=True, frozen=True)
|
||||||
def __new__(cls, *args: Any, **kwargs: Any) -> Self:
|
class ModButtonMeta:
|
||||||
value = len(cls.__members__) + 1
|
label: str
|
||||||
obj = object.__new__(cls)
|
tooltip: str
|
||||||
obj._value_ = value
|
|
||||||
return obj
|
|
||||||
|
|
||||||
def __init__(self, d: dict):
|
|
||||||
self.dict = d
|
|
||||||
|
|
||||||
|
|
||||||
class Preferences(EnumWithAttrs):
|
@dataclass(slots=True, frozen=True)
|
||||||
STEAM = {
|
class ButtonTypeMeta:
|
||||||
"key": "steam_api",
|
label: str
|
||||||
}
|
tooltip: str
|
||||||
CLIENT = {
|
opens: NotebookPage | None
|
||||||
"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",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class NotebookPage(EnumWithAttrs):
|
@dataclass(slots=True, frozen=True)
|
||||||
OFFLINE = {"crumbs": strings.crumbs.offline, "statusbar": True}
|
class ConfigKey:
|
||||||
CHANGELOG = {"crumbs": strings.crumbs.changelog, "statusbar": True}
|
key: str
|
||||||
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}
|
|
||||||
|
|
||||||
|
|
||||||
class RowType(EnumWithAttrs):
|
@dataclass(slots=True, frozen=True)
|
||||||
# TODO: strings
|
class NotebookMeta:
|
||||||
CHANGELOG = {
|
crumbs: str
|
||||||
"label": "View changelog",
|
has_statusbar: bool
|
||||||
"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",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# TODO: rename to ContextMenuItem
|
@dataclass(slots=True, frozen=True)
|
||||||
class ContextMenu(EnumWithAttrs):
|
class RowMeta:
|
||||||
ADD_NOTE = {"label": strings.add_note}
|
label: str
|
||||||
ADD_SERVER = {"label": strings.add}
|
tooltip: str
|
||||||
CONNECT = {"label": strings.connect}
|
|
||||||
COPY_LOG_CLIPBOARD = {"label": strings.copy_log}
|
|
||||||
COPY_SERVER_IP = {"label": strings.copy_ip}
|
@dataclass(slots=True, frozen=True)
|
||||||
COPY_SERVER_NAME = {"label": strings.copy_name}
|
class ContextMenuMeta:
|
||||||
UNSUB_MOD = {"label": strings.unsub_mod}
|
label: str
|
||||||
VALIDATE_MOD = {"label": strings.validate_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):
|
class ContextMenuGroup(Enum):
|
||||||
@@ -172,113 +110,193 @@ class ContextMenuGroup(Enum):
|
|||||||
Groupings of context menu items
|
Groupings of context menu items
|
||||||
"""
|
"""
|
||||||
|
|
||||||
SERVER_MOD = (ContextMenu.OPEN_WORKSHOP,)
|
SERVER_MOD = (ContextMenuItem.OPEN_WORKSHOP,)
|
||||||
MOD = (ContextMenu.OPEN_WORKSHOP, ContextMenu.UNSUB_MOD, ContextMenu.VALIDATE_MOD)
|
MOD = (
|
||||||
|
ContextMenuItem.OPEN_WORKSHOP,
|
||||||
|
ContextMenuItem.UNSUB_MOD,
|
||||||
|
ContextMenuItem.VALIDATE_MOD,
|
||||||
|
)
|
||||||
MOD_OFFLINE = (None,)
|
MOD_OFFLINE = (None,)
|
||||||
LOG = (ContextMenu.COPY_LOG_CLIPBOARD,)
|
LOG = (ContextMenuItem.COPY_LOG_CLIPBOARD,)
|
||||||
SERVER_BROWSER = (
|
SERVER_BROWSER = (
|
||||||
ContextMenu.CONNECT,
|
ContextMenuItem.CONNECT,
|
||||||
ContextMenu.ADD_SERVER,
|
ContextMenuItem.ADD_SERVER,
|
||||||
ContextMenu.SET_FAV,
|
ContextMenuItem.SET_FAV,
|
||||||
ContextMenu.COPY_SERVER_NAME,
|
ContextMenuItem.COPY_SERVER_NAME,
|
||||||
ContextMenu.COPY_SERVER_IP,
|
ContextMenuItem.COPY_SERVER_IP,
|
||||||
ContextMenu.ADD_NOTE,
|
ContextMenuItem.ADD_NOTE,
|
||||||
ContextMenu.SHOW_MODS,
|
ContextMenuItem.SHOW_MODS,
|
||||||
ContextMenu.SHOW_DETAILS,
|
ContextMenuItem.SHOW_DETAILS,
|
||||||
ContextMenu.REFRESH_PLAYERS,
|
ContextMenuItem.REFRESH_PLAYERS,
|
||||||
)
|
)
|
||||||
SCAN_LAN = (
|
SCAN_LAN = (
|
||||||
ContextMenu.CONNECT,
|
ContextMenuItem.CONNECT,
|
||||||
ContextMenu.SET_FAV,
|
ContextMenuItem.SET_FAV,
|
||||||
ContextMenu.COPY_SERVER_NAME,
|
ContextMenuItem.COPY_SERVER_NAME,
|
||||||
ContextMenu.COPY_SERVER_IP,
|
ContextMenuItem.COPY_SERVER_IP,
|
||||||
ContextMenu.ADD_NOTE,
|
ContextMenuItem.ADD_NOTE,
|
||||||
ContextMenu.SHOW_MODS,
|
ContextMenuItem.SHOW_MODS,
|
||||||
ContextMenu.SHOW_DETAILS,
|
ContextMenuItem.SHOW_DETAILS,
|
||||||
ContextMenu.REFRESH_PLAYERS,
|
ContextMenuItem.REFRESH_PLAYERS,
|
||||||
)
|
)
|
||||||
SAVED = (
|
SAVED = (
|
||||||
ContextMenu.CONNECT,
|
ContextMenuItem.CONNECT,
|
||||||
ContextMenu.SET_FAV,
|
ContextMenuItem.SET_FAV,
|
||||||
ContextMenu.REMOVE_SERVER,
|
ContextMenuItem.REMOVE_SERVER,
|
||||||
ContextMenu.COPY_SERVER_NAME,
|
ContextMenuItem.COPY_SERVER_NAME,
|
||||||
ContextMenu.COPY_SERVER_IP,
|
ContextMenuItem.COPY_SERVER_IP,
|
||||||
ContextMenu.ADD_NOTE,
|
ContextMenuItem.ADD_NOTE,
|
||||||
ContextMenu.SHOW_MODS,
|
ContextMenuItem.SHOW_MODS,
|
||||||
ContextMenu.SHOW_DETAILS,
|
ContextMenuItem.SHOW_DETAILS,
|
||||||
ContextMenu.REFRESH_PLAYERS,
|
ContextMenuItem.REFRESH_PLAYERS,
|
||||||
)
|
)
|
||||||
RECENT = (
|
RECENT = (
|
||||||
ContextMenu.CONNECT,
|
ContextMenuItem.CONNECT,
|
||||||
ContextMenu.ADD_SERVER,
|
ContextMenuItem.ADD_SERVER,
|
||||||
ContextMenu.SET_FAV,
|
ContextMenuItem.SET_FAV,
|
||||||
ContextMenu.REMOVE_HISTORY,
|
ContextMenuItem.REMOVE_HISTORY,
|
||||||
ContextMenu.COPY_SERVER_NAME,
|
ContextMenuItem.COPY_SERVER_NAME,
|
||||||
ContextMenu.COPY_SERVER_IP,
|
ContextMenuItem.COPY_SERVER_IP,
|
||||||
ContextMenu.ADD_NOTE,
|
ContextMenuItem.ADD_NOTE,
|
||||||
ContextMenu.SHOW_MODS,
|
ContextMenuItem.SHOW_MODS,
|
||||||
ContextMenu.SHOW_DETAILS,
|
ContextMenuItem.SHOW_DETAILS,
|
||||||
ContextMenu.REFRESH_PLAYERS,
|
ContextMenuItem.REFRESH_PLAYERS,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class ModButton(EnumWithAttrs):
|
class Preferences(Enum):
|
||||||
SELECT_ALL = {
|
STEAM = ConfigKey("steam_api")
|
||||||
"label": strings.mod_panel.select_all,
|
CLIENT = ConfigKey("client")
|
||||||
"tooltip": strings.mod_panel.select_all_tooltip,
|
WINDOW = ConfigKey("fullscreen")
|
||||||
}
|
DIST = ConfigKey("use_miles")
|
||||||
UNSELECT_ALL = {
|
NAME = ConfigKey("name")
|
||||||
"label": strings.mod_panel.unselect_all,
|
DEFAULT = ConfigKey("default_steam_path")
|
||||||
"tooltip": strings.mod_panel.unselect_all_tooltip,
|
FAV_LBL = ConfigKey("fav_label")
|
||||||
}
|
FAV_SRV = ConfigKey("fav_server")
|
||||||
HIGHLIGHT_STALE = {
|
IP_LIST = ConfigKey("ip_list")
|
||||||
"label": strings.mod_panel.highlight_stale,
|
START_TAB = ConfigKey("start_tab")
|
||||||
"tooltip": strings.mod_panel.highlight_stale_tooltip,
|
|
||||||
}
|
@property
|
||||||
UNHIGHLIGHT_STALE = {
|
def key(self) -> str:
|
||||||
"label": strings.mod_panel.unhighlight_stale,
|
return self.value.key
|
||||||
"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,
|
|
||||||
}
|
|
||||||
VALIDATE = {
|
|
||||||
"label": strings.mod_panel.validate,
|
|
||||||
"tooltip": strings.mod_panel.validate_tooltip,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class ButtonType(EnumWithAttrs):
|
class NotebookPage(Enum):
|
||||||
SERVERS = {
|
OFFLINE = NotebookMeta(strings.crumbs.offline, True)
|
||||||
"label": strings.buttons.servers_label,
|
CHANGELOG = NotebookMeta(strings.crumbs.changelog, True)
|
||||||
"tooltip": strings.buttons.servers_tooltip,
|
DEVELOPERS = NotebookMeta(strings.crumbs.developers, False)
|
||||||
"opens": NotebookPage.SERVERS,
|
HELP = NotebookMeta(strings.crumbs._help, True)
|
||||||
}
|
KEYS = NotebookMeta(strings.crumbs.keys, True)
|
||||||
MODS = {
|
LOG = NotebookMeta(strings.crumbs.log, True)
|
||||||
"label": strings.buttons.mods_label,
|
MODS = NotebookMeta(strings.crumbs.mods, True)
|
||||||
"tooltip": strings.buttons.mods_tooltip,
|
OPTIONS = NotebookMeta(strings.crumbs.options, False)
|
||||||
"opens": NotebookPage.MODS,
|
SERVERS = NotebookMeta(strings.crumbs.servers, True)
|
||||||
}
|
THANKS = NotebookMeta(strings.crumbs.thanks, True)
|
||||||
OPTIONS = {
|
CONNECTION = NotebookMeta(strings.crumbs.connect, True)
|
||||||
"label": strings.buttons.options_label,
|
|
||||||
"tooltip": strings.buttons.options_tooltip,
|
@property
|
||||||
"opens": NotebookPage.OPTIONS,
|
def crumbs(self) -> str:
|
||||||
}
|
return self.value.crumbs
|
||||||
HELP = {
|
|
||||||
"label": strings.buttons.help_label,
|
@property
|
||||||
"tooltip": strings.buttons.help_tooltip,
|
def has_statusbar(self) -> bool:
|
||||||
"opens": NotebookPage.HELP,
|
return self.value.has_statusbar
|
||||||
}
|
|
||||||
EXIT = {
|
|
||||||
"label": strings.buttons.exit_label,
|
class RowType(Enum):
|
||||||
"tooltip": strings.buttons.exit_tooltip,
|
CHANGELOG = RowMeta(rows.changelog_label, rows.changelog_status)
|
||||||
"opens": None,
|
SHOW_LOG = RowMeta(rows.log_label, rows.log_status)
|
||||||
}
|
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 = (
|
HELP_MENU_ROWS = (
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import dzgui.util._json as JSON # noqa
|
|||||||
|
|
||||||
from dzgui.const.enum import (
|
from dzgui.const.enum import (
|
||||||
ButtonType,
|
ButtonType,
|
||||||
ContextMenu,
|
ContextMenuItem,
|
||||||
FilterMode,
|
FilterMode,
|
||||||
NotebookPage,
|
NotebookPage,
|
||||||
Preferences,
|
Preferences,
|
||||||
@@ -196,7 +196,9 @@ class Controller(GObject.GObject):
|
|||||||
def show_developers_page(self) -> None:
|
def show_developers_page(self) -> None:
|
||||||
self.open_page(NotebookPage.DEVELOPERS)
|
self.open_page(NotebookPage.DEVELOPERS)
|
||||||
|
|
||||||
def open_page(self, page: NotebookPage) -> None:
|
def open_page(self, page: NotebookPage | None) -> None:
|
||||||
|
if page is None:
|
||||||
|
return
|
||||||
self.mediator.grid.notebook.set_page_by_enum(page)
|
self.mediator.grid.notebook.set_page_by_enum(page)
|
||||||
|
|
||||||
def open_page_by_button(self, button: "ContextualButton") -> None:
|
def open_page_by_button(self, button: "ContextualButton") -> None:
|
||||||
@@ -262,7 +264,7 @@ class Controller(GObject.GObject):
|
|||||||
logger.critical(e)
|
logger.critical(e)
|
||||||
return
|
return
|
||||||
|
|
||||||
def menu_action(self, action: ContextMenu, tree: "ServerTreeView") -> None:
|
def menu_action(self, action: ContextMenuItem, tree: "ServerTreeView") -> None:
|
||||||
context_man = ContextMenuManager(tree, self)
|
context_man = ContextMenuManager(tree, self)
|
||||||
context_man.process(action)
|
context_man.process(action)
|
||||||
|
|
||||||
@@ -274,7 +276,7 @@ class Controller(GObject.GObject):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
dialog = ExceptionDialog(self, str(e))
|
dialog = ExceptionDialog(self, str(e))
|
||||||
dialog.show_all()
|
dialog.show_all()
|
||||||
dialog.run()
|
dialog.run() # type: ignore[no-untyped-call]
|
||||||
|
|
||||||
def select_colorized(self) -> None:
|
def select_colorized(self) -> None:
|
||||||
mod_man = self.mediator.modtreeview.get_mod_man()
|
mod_man = self.mediator.modtreeview.get_mod_man()
|
||||||
@@ -308,7 +310,7 @@ class Controller(GObject.GObject):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
dialog = ExceptionDialog(self, str(e))
|
dialog = ExceptionDialog(self, str(e))
|
||||||
dialog.show_all()
|
dialog.show_all()
|
||||||
dialog.run()
|
dialog.run() # type: ignore[no-untyped-call]
|
||||||
|
|
||||||
def update_steam_api_key(self, text: str) -> None:
|
def update_steam_api_key(self, text: str) -> None:
|
||||||
self.config_man.update_steam_api_key(text)
|
self.config_man.update_steam_api_key(text)
|
||||||
@@ -365,12 +367,11 @@ class Controller(GObject.GObject):
|
|||||||
filter_man = self.get_filter_man()
|
filter_man = self.get_filter_man()
|
||||||
return filter_man.get_map_store()
|
return filter_man.get_map_store()
|
||||||
|
|
||||||
def get_enabled_filters(self) -> dict:
|
def get_enabled_filters(self) -> dict[str, bool]:
|
||||||
filter_man = self.get_filter_man()
|
filter_man = self.get_filter_man()
|
||||||
return filter_man.get_filters()
|
return filter_man.get_filters()
|
||||||
|
|
||||||
# FIXME: wipe maps store when changing tabs if model is none
|
# FIXME: wipe maps store when changing tabs if model is none
|
||||||
|
|
||||||
def has_server_model(self) -> bool:
|
def has_server_model(self) -> bool:
|
||||||
treeview = self.get_active_treeview()
|
treeview = self.get_active_treeview()
|
||||||
proxy_man = treeview.get_proxy_man()
|
proxy_man = treeview.get_proxy_man()
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ class ConfigManager:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def enum_to_key(self, enum: Preferences) -> str:
|
def enum_to_key(self, enum: Preferences) -> str:
|
||||||
return str(enum.dict["key"])
|
return str(enum.key)
|
||||||
|
|
||||||
def toggle_config(self, key: Preferences) -> None:
|
def toggle_config(self, key: Preferences) -> None:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import logging
|
|||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from dzgui.const.constants import APP_NAME
|
from dzgui.const.constants import APP_NAME
|
||||||
from dzgui.const.enum import ContextMenu, Preferences
|
from dzgui.const.enum import ContextMenuItem, Preferences
|
||||||
from dzgui.util.clip import copy_clipboard
|
from dzgui.util.clip import copy_clipboard
|
||||||
from dzgui.util.open_links import open_workshop_page
|
from dzgui.util.open_links import open_workshop_page
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ class ContextMenuManager:
|
|||||||
self.controller = controller
|
self.controller = controller
|
||||||
self.treeview = treeview
|
self.treeview = treeview
|
||||||
|
|
||||||
def process(self, action: ContextMenu) -> None:
|
def process(self, action: ContextMenuItem) -> None:
|
||||||
if isinstance(self.treeview, ServerTreeView):
|
if isinstance(self.treeview, ServerTreeView):
|
||||||
record = self.treeview.get_record()
|
record = self.treeview.get_record()
|
||||||
if record is None:
|
if record is None:
|
||||||
@@ -42,14 +42,14 @@ class ContextMenuManager:
|
|||||||
|
|
||||||
match action:
|
match action:
|
||||||
# UNTHREADED
|
# UNTHREADED
|
||||||
case ContextMenu.ADD_NOTE:
|
case ContextMenuItem.ADD_NOTE:
|
||||||
dialog = NoteDialog(self.controller)
|
dialog = NoteDialog(self.controller)
|
||||||
dialog.run()
|
dialog.run() # type: ignore[no-untyped-call]
|
||||||
case ContextMenu.COPY_SERVER_IP:
|
case ContextMenuItem.COPY_SERVER_IP:
|
||||||
self.copy_server_ip()
|
self.copy_server_ip()
|
||||||
case ContextMenu.COPY_SERVER_NAME:
|
case ContextMenuItem.COPY_SERVER_NAME:
|
||||||
self.copy_server_name()
|
self.copy_server_name()
|
||||||
case ContextMenu.SET_FAV:
|
case ContextMenuItem.SET_FAV:
|
||||||
name = self.treeview.get_value_at_index(0)
|
name = self.treeview.get_value_at_index(0)
|
||||||
# NOTE: fully qualified ip
|
# NOTE: fully qualified ip
|
||||||
fqip = self.treeview.get_record_string()
|
fqip = self.treeview.get_record_string()
|
||||||
@@ -58,40 +58,40 @@ class ContextMenuManager:
|
|||||||
self.controller.set_fav(name, fqip, simple)
|
self.controller.set_fav(name, fqip, simple)
|
||||||
|
|
||||||
# THREADED
|
# THREADED
|
||||||
case ContextMenu.ADD_SERVER:
|
case ContextMenuItem.ADD_SERVER:
|
||||||
self.controller.add_by_record(record)
|
self.controller.add_by_record(record)
|
||||||
case ContextMenu.CONNECT:
|
case ContextMenuItem.CONNECT:
|
||||||
self.controller.connect_by_record(record)
|
self.controller.connect_by_record(record)
|
||||||
case ContextMenu.REFRESH_PLAYERS:
|
case ContextMenuItem.REFRESH_PLAYERS:
|
||||||
self.controller.refresh_players(record)
|
self.controller.refresh_players(record)
|
||||||
case ContextMenu.REMOVE_HISTORY:
|
case ContextMenuItem.REMOVE_HISTORY:
|
||||||
self.controller.remove_from_history(record)
|
self.controller.remove_from_history(record)
|
||||||
case ContextMenu.REMOVE_SERVER:
|
case ContextMenuItem.REMOVE_SERVER:
|
||||||
self.controller.remove_by_record(record)
|
self.controller.remove_by_record(record)
|
||||||
case ContextMenu.SHOW_DETAILS:
|
case ContextMenuItem.SHOW_DETAILS:
|
||||||
self.controller.get_details(record)
|
self.controller.get_details(record)
|
||||||
case ContextMenu.SHOW_MODS:
|
case ContextMenuItem.SHOW_MODS:
|
||||||
self.controller.get_modlist(record)
|
self.controller.get_modlist(record)
|
||||||
|
|
||||||
if isinstance(self.treeview, (ModTreeView, OfflineModTreeView)):
|
if isinstance(self.treeview, (ModTreeView, OfflineModTreeView)):
|
||||||
match action:
|
match action:
|
||||||
case ContextMenu.OPEN_WORKSHOP:
|
case ContextMenuItem.OPEN_WORKSHOP:
|
||||||
self.open_mod_page()
|
self.open_mod_page()
|
||||||
case ContextMenu.UNSUB_MOD:
|
case ContextMenuItem.UNSUB_MOD:
|
||||||
self.controller.unsub_mods(self.treeview)
|
self.controller.unsub_mods(self.treeview)
|
||||||
case ContextMenu.VALIDATE_MOD:
|
case ContextMenuItem.VALIDATE_MOD:
|
||||||
self.controller.validate_mods(self.treeview)
|
self.controller.validate_mods(self.treeview)
|
||||||
case _:
|
case _:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if isinstance(self.treeview, LogTreeView):
|
if isinstance(self.treeview, LogTreeView):
|
||||||
match action:
|
match action:
|
||||||
case ContextMenu.COPY_LOG_CLIPBOARD:
|
case ContextMenuItem.COPY_LOG_CLIPBOARD:
|
||||||
self.copy_log()
|
self.copy_log()
|
||||||
|
|
||||||
if isinstance(self.treeview, ServerModTreeView):
|
if isinstance(self.treeview, ServerModTreeView):
|
||||||
match action:
|
match action:
|
||||||
case ContextMenu.OPEN_WORKSHOP:
|
case ContextMenuItem.OPEN_WORKSHOP:
|
||||||
self.open_mod_page()
|
self.open_mod_page()
|
||||||
|
|
||||||
def copy_server_ip(self) -> None:
|
def copy_server_ip(self) -> None:
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ class ModelFactory:
|
|||||||
|
|
||||||
def make_help_store(self) -> FastInsertListStore:
|
def make_help_store(self) -> FastInsertListStore:
|
||||||
store = self.new_model_from_class(MenuCols)
|
store = self.new_model_from_class(MenuCols)
|
||||||
rows = [[row.dict["label"], row] for row in HELP_MENU_ROWS]
|
rows = [[row.label, row] for row in HELP_MENU_ROWS]
|
||||||
store.extend(rows)
|
store.extend(rows)
|
||||||
return store
|
return store
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
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"
|
||||||
@@ -252,6 +252,7 @@ class Crumbs:
|
|||||||
developers: str
|
developers: str
|
||||||
default: str
|
default: str
|
||||||
offline: str
|
offline: str
|
||||||
|
connect: str
|
||||||
|
|
||||||
|
|
||||||
@dataclass(slots=True, frozen=True)
|
@dataclass(slots=True, frozen=True)
|
||||||
@@ -439,6 +440,7 @@ crumbs = Crumbs(
|
|||||||
developers="Options > Developers",
|
developers="Options > Developers",
|
||||||
default="Servers > ",
|
default="Servers > ",
|
||||||
offline="Mods > Play offline",
|
offline="Mods > Play offline",
|
||||||
|
connect="Connect",
|
||||||
)
|
)
|
||||||
|
|
||||||
no_mods = "No local mods found."
|
no_mods = "No local mods found."
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
|
|||||||
|
|
||||||
class ContextualButton(Gtk.Button):
|
class ContextualButton(Gtk.Button):
|
||||||
def __init__(
|
def __init__(
|
||||||
self, label: str, opens: "NotebookPage", tooltip: str, context: ButtonType
|
self, label: str, opens: "NotebookPage" | None, tooltip: str, context: ButtonType
|
||||||
) -> None:
|
) -> None:
|
||||||
super().__init__(
|
super().__init__(
|
||||||
label=label,
|
label=label,
|
||||||
@@ -51,9 +51,9 @@ class ButtonBox(Gtk.Box):
|
|||||||
|
|
||||||
for side_button in ButtonType:
|
for side_button in ButtonType:
|
||||||
button = ContextualButton(
|
button = ContextualButton(
|
||||||
label=side_button.dict["label"],
|
label=side_button.label,
|
||||||
opens=side_button.dict["opens"],
|
opens=side_button.opens,
|
||||||
tooltip=side_button.dict["tooltip"],
|
tooltip=side_button.tooltip,
|
||||||
context=side_button,
|
context=side_button,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ class Breadcrumbs(Gtk.Label):
|
|||||||
label = page.get_current_tab_text()
|
label = page.get_current_tab_text()
|
||||||
self.set_server_crumbs(label)
|
self.set_server_crumbs(label)
|
||||||
else:
|
else:
|
||||||
crumbs = enum.dict["crumbs"]
|
crumbs = enum.crumbs
|
||||||
self.set_crumbs(crumbs)
|
self.set_crumbs(crumbs)
|
||||||
|
|
||||||
def set_server_crumbs(self, suffix: str) -> None:
|
def set_server_crumbs(self, suffix: str) -> None:
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ class EnumeratedModButton(Gtk.Button):
|
|||||||
super().__init__(margin_start=10, margin_end=10, focus_on_click=False)
|
super().__init__(margin_start=10, margin_end=10, focus_on_click=False)
|
||||||
|
|
||||||
self.enum = enum
|
self.enum = enum
|
||||||
self.set_label(enum.dict["label"])
|
self.set_label(enum.label)
|
||||||
self.set_tooltip_text(enum.dict["tooltip"])
|
self.set_tooltip_text(enum.tooltip)
|
||||||
|
|
||||||
|
|
||||||
class ModPanelButton(EnumeratedModButton):
|
class ModPanelButton(EnumeratedModButton):
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ class Statusbar(Gtk.Grid):
|
|||||||
return
|
return
|
||||||
|
|
||||||
enum = notebook.get_page_by_enum()
|
enum = notebook.get_page_by_enum()
|
||||||
show_statusbar = enum.dict["statusbar"]
|
show_statusbar = enum.has_statusbar
|
||||||
|
|
||||||
if show_statusbar is False:
|
if show_statusbar is False:
|
||||||
self.set_by_context(enum, "")
|
self.set_by_context(enum, "")
|
||||||
@@ -152,5 +152,5 @@ class Statusbar(Gtk.Grid):
|
|||||||
row = tree.get_value_at_index(1)
|
row = tree.get_value_at_index(1)
|
||||||
if self.controller.loaded is False:
|
if self.controller.loaded is False:
|
||||||
return
|
return
|
||||||
tooltip = row.dict["tooltip"]
|
tooltip = row.tooltip
|
||||||
self.set_by_context(NotebookPage.HELP, tooltip)
|
self.set_by_context(NotebookPage.HELP, tooltip)
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
from dzgui.const.constants import APP_NAME
|
from dzgui.const.constants import APP_NAME
|
||||||
from dzgui.const.enum import ContextMenu
|
from dzgui.const.enum import ContextMenuItem
|
||||||
from dzgui.util.keys import is_ctrl_mask, is_navkey
|
from dzgui.util.keys import is_ctrl_mask, is_navkey
|
||||||
from dzgui.util.strings import edit_note
|
from dzgui.util.strings import edit_note
|
||||||
from dzgui.views.trees.tree_base import TreeView
|
from dzgui.views.trees.tree_base import TreeView
|
||||||
@@ -15,9 +15,7 @@ logger = logging.getLogger(APP_NAME)
|
|||||||
|
|
||||||
|
|
||||||
class ContextMixin(TreeView):
|
class ContextMixin(TreeView):
|
||||||
def present_menu(
|
def present_menu(self, widget: Gtk.Widget, event: Gdk.Event) -> bool:
|
||||||
self, widget: Gtk.Widget, event: Gdk.Event
|
|
||||||
) -> bool:
|
|
||||||
|
|
||||||
if self.menu is None:
|
if self.menu is None:
|
||||||
return False
|
return False
|
||||||
@@ -60,17 +58,17 @@ class ContextMixin(TreeView):
|
|||||||
self.context_menu.select_first(False)
|
self.context_menu.select_first(False)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def _process_dynamic_row(self, row: ContextMenu) -> Gtk.MenuItem:
|
def _process_dynamic_row(self, row: ContextMenuItem) -> Gtk.MenuItem:
|
||||||
if row == ContextMenu.ADD_SERVER and self.is_in_favs(): # type: ignore
|
if row == ContextMenuItem.ADD_SERVER and self.is_in_favs(): # type: ignore
|
||||||
row = ContextMenu.REMOVE_SERVER
|
row = ContextMenuItem.REMOVE_SERVER
|
||||||
|
|
||||||
item = Gtk.MenuItem(label=row.dict["label"])
|
item = Gtk.MenuItem(label=row.label)
|
||||||
item.connect("activate", self._on_menu_click, row)
|
item.connect("activate", self._on_menu_click, row)
|
||||||
|
|
||||||
if row == ContextMenu.SHOW_MODS:
|
if row == ContextMenuItem.SHOW_MODS:
|
||||||
item.set_sensitive(self.is_modded()) # type: ignore
|
item.set_sensitive(self.is_modded()) # type: ignore
|
||||||
|
|
||||||
if row == ContextMenu.ADD_NOTE:
|
if row == ContextMenuItem.ADD_NOTE:
|
||||||
if self.controller.has_note():
|
if self.controller.has_note():
|
||||||
item.set_label(edit_note)
|
item.set_label(edit_note)
|
||||||
|
|
||||||
@@ -94,7 +92,7 @@ class ContextMixin(TreeView):
|
|||||||
except AttributeError:
|
except AttributeError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def _on_menu_click(self, widget: Gtk.MenuItem, enum: ContextMenu) -> None:
|
def _on_menu_click(self, widget: Gtk.MenuItem, enum: ContextMenuItem) -> None:
|
||||||
self.controller.menu_action(enum, self) # type: ignore
|
self.controller.menu_action(enum, self) # type: ignore
|
||||||
|
|
||||||
def _on_key(self, menu: Gtk.Menu, event: Gdk.EventKey) -> bool | None:
|
def _on_key(self, menu: Gtk.Menu, event: Gdk.EventKey) -> bool | None:
|
||||||
|
|||||||
@@ -77,4 +77,4 @@ class MenuTreeView(TreeView):
|
|||||||
raise ValueError("Trying to call a method on non-existent model")
|
raise ValueError("Trying to call a method on non-existent model")
|
||||||
_iter = self.get_focused_row_iter()
|
_iter = self.get_focused_row_iter()
|
||||||
rowtype = model.get_value(_iter, 1)
|
rowtype = model.get_value(_iter, 1)
|
||||||
return str(rowtype.dict["tooltip"])
|
return str(rowtype.tooltip)
|
||||||
@@ -7,7 +7,7 @@ from warnings import deprecated
|
|||||||
|
|
||||||
from dzgui.api.servers import ping, Record
|
from dzgui.api.servers import ping, Record
|
||||||
from dzgui.const.constants import APP_NAME
|
from dzgui.const.constants import APP_NAME
|
||||||
from dzgui.const.enum import ContextMenu, ContextMenuGroup, ServerTab
|
from dzgui.const.enum import ContextMenuItem, ContextMenuGroup, ServerTab
|
||||||
from dzgui.managers.filter import FilterManager
|
from dzgui.managers.filter import FilterManager
|
||||||
from dzgui.model.proxy_model import ProxyModelManager
|
from dzgui.model.proxy_model import ProxyModelManager
|
||||||
from dzgui.util import strings
|
from dzgui.util import strings
|
||||||
@@ -250,9 +250,9 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore
|
|||||||
if self.enum is ServerTab.LAN:
|
if self.enum is ServerTab.LAN:
|
||||||
self.emitter.emit("request_custom_port_focus")
|
self.emitter.emit("request_custom_port_focus")
|
||||||
case Gdk.KEY_c:
|
case Gdk.KEY_c:
|
||||||
self.controller.menu_action(ContextMenu.COPY_SERVER_IP, self)
|
self.controller.menu_action(ContextMenuItem.COPY_SERVER_IP, self)
|
||||||
case Gdk.KEY_r:
|
case Gdk.KEY_r:
|
||||||
self.controller.menu_action(ContextMenu.REFRESH_PLAYERS, self)
|
self.controller.menu_action(ContextMenuItem.REFRESH_PLAYERS, self)
|
||||||
else:
|
else:
|
||||||
match event.keyval:
|
match event.keyval:
|
||||||
case Gdk.KEY_l | Gdk.KEY_Right:
|
case Gdk.KEY_l | Gdk.KEY_Right:
|
||||||
|
|||||||
@@ -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