diff --git a/dzgui/main.py b/dzgui/main.py index a32d0212..d8bb0c6a 100644 --- a/dzgui/main.py +++ b/dzgui/main.py @@ -7,7 +7,7 @@ from dzgui.init.libgi import test_libgi_missing from dzgui.init.prefix import get_version from dzgui.util.deck import is_steam_deck from dzgui.util.map_count import set_map_count -from dzgui.util.strings import flags +from dzgui.strings import flags from dzgui.views.dialogs.uninstall import UninstallWizard from dzgui.config.xdg import get_xdg_paths diff --git a/dzgui/strings/buttons.py b/dzgui/strings/buttons.py index 539b7a0c..90de4949 100644 --- a/dzgui/strings/buttons.py +++ b/dzgui/strings/buttons.py @@ -14,3 +14,9 @@ update_button = "Updates available" unset_button_label = "Unset" unset_button_tooltip = "Unset this server as favorite" + +refresh_button = "Refresh" +refresh_tooltip = "Refresh server data" +copy_button = "Copy" +keys_button = "Keys" +keys_button_tooltip = "Toggles the keybindings dialog" diff --git a/dzgui/util/strings.py b/dzgui/util/strings.py index 3384aded..d3b28155 100644 --- a/dzgui/util/strings.py +++ b/dzgui/util/strings.py @@ -9,24 +9,6 @@ class ServerLabels: lan: str -@dataclass(slots=True, frozen=True) -class AtomicButton: - refresh: str - refresh_tooltip: str - copy: str - keys: str - keys_tooltip: str - - -@dataclass(slots=True, frozen=True) -class Flags: - description: str - version: str - uninstall: str - debug: str - map_count: str - - @dataclass(slots=True, frozen=True) class ModPanelStrings: header: str @@ -366,12 +348,3 @@ server_labels = ServerLabels( recent="Recent", lan="LAN", ) - - -atomic_buttons = AtomicButton( - refresh="Refresh", - refresh_tooltip="Refresh server data", - copy="Copy", - keys="Keys", - keys_tooltip="Toggles the keybindings dialog", -) diff --git a/dzgui/views/components/buttons.py b/dzgui/views/components/buttons.py index 7fc45b45..d9f70ee3 100644 --- a/dzgui/views/components/buttons.py +++ b/dzgui/views/components/buttons.py @@ -2,9 +2,6 @@ from typing import Callable, Literal, Self, TYPE_CHECKING from dzgui.util.clip import copy_clipboard from dzgui.strings import buttons -from dzgui.util.strings import ( - atomic_buttons, -) from dzgui.const.icons import ( ICON_CLIPBOARD, ICON_CLOSE, @@ -99,7 +96,7 @@ class LargeIconTextButton(IconButton): class ClipboardButton(IconTextButton): def __init__(self, func: Callable[[], str]) -> None: - super().__init__(ICON_CLIPBOARD, atomic_buttons.copy) + super().__init__(ICON_CLIPBOARD, buttons.copy_button) self.connect("clicked", self._on_button_clicked, func) self.set_tooltip_text(buttons.clipboard_button) @@ -139,7 +136,7 @@ class RefreshButton(IconTextButton): def __init__(self, controller: "Controller") -> None: super().__init__( icon=ICON_REFRESH, - label=atomic_buttons.refresh, + label=buttons.refresh_button, ) self.controller = controller @@ -152,7 +149,7 @@ class RefreshButton(IconTextButton): self.set_margin_top(10) self.set_margin_start(80) self.set_margin_end(80) - self.set_tooltip_text(atomic_buttons.refresh_tooltip) + self.set_tooltip_text(buttons.refresh_tooltip) self.connect("clicked", self._on_refresh_clicked) emitter.connect("servers_loaded", self._on_load) @@ -196,21 +193,21 @@ class RefreshButton(IconTextButton): def show_time(self, state: bool) -> None: if state is True: - self.set_label(f"{atomic_buttons.refresh} ({str(self.time)})") + self.set_label(f"{buttons.refresh_button} ({str(self.time)})") else: - self.set_label(atomic_buttons.refresh) + self.set_label(buttons.refresh_button) class KeysButton(IconTextButton): def __init__(self, controller: "Controller") -> None: - super().__init__(icon=ICON_INPUT_KEYBOARD, label=atomic_buttons.keys) + super().__init__(icon=ICON_INPUT_KEYBOARD, label=buttons.keys_button) self.controller = controller self.set_margin_top(10) self.set_margin_start(80) self.set_margin_end(80) - self.set_tooltip_text(atomic_buttons.keys_tooltip) + self.set_tooltip_text(buttons.keys_button_tooltip) self.connect("clicked", self._on_keys_clicked)