change: normalize icon names

dzgui/api/mods.py

@@ -24,6 +24,14 @@ from typing import Any
 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]:
     workshop_path = get_local_mod_path(steam_path)
     mods = get_local_mods(workshop_path)

dzgui/app_init.py

@@ -158,6 +158,9 @@ def build_gui(version: str, is_debug: bool) -> App | None:
         f.truncate(0)
 
     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):
             has_client = has_flatpak_client()
         else:

dzgui/const/constants.py

@@ -37,28 +37,6 @@ HEX_GREEN = "#32CD32"
 HEX_RED = "#FF0000"
 HEX_ORANGE = "#FFAC1C"
 
-# TODO: normalize icon names
-CALCULATOR = "accessories-calculator-symbolic"
-CARET_DOWN = "go-down-symbolic"
-CARET_UP = "go-up-symbolic"
-CLIPBOARD = "edit-copy-symbolic"
-CLOSE = "window-close-symbolic"
-FOLDER = "folder-symbolic"
-EDIT_DELETE = "edit-delete-symbolic"
-ERROR = "dialog-error-symbolic"
-HELP_BUBBLE = "help-about-symbolic"
-INPUT_KEYBOARD = "input-keyboard-symbolic"
-LIST_ADD = "list-add-symbolic"
-REFRESH_ICON = "view-refresh-symbolic"
-SEARCH_ICON = "system-search-symbolic"
-STEAM_ICON = "steam-tray-symbolic"
-VIEW_CONCEAL = "view-conceal-symbolic"
-VIEW_REVEAL = "view-reveal-symbolic"
-WARNING = "dialog-warning-symbolic"
-WEB_BROWSER = "web-browser-symbolic"
-DAY_ICON = "weather-clear-symbolic"
-NIGHT_ICON = "weather-clear-night-symbolic"
-
 SEPARATOR = "SEPARATOR"
 
 # TODO: drop

dzgui/const/icons.py

@@ -0,0 +1,20 @@
+ICON_CALCULATOR = "accessories-calculator-symbolic"
+ICON_CARET_DOWN = "go-down-symbolic"
+ICON_CARET_UP = "go-up-symbolic"
+ICON_CLIPBOARD = "edit-copy-symbolic"
+ICON_CLOSE = "window-close-symbolic"
+ICON_DAY = "weather-clear-symbolic"
+ICON_EDIT_DELETE = "edit-delete-symbolic"
+ICON_ERROR = "dialog-error-symbolic"
+ICON_FOLDER = "folder-symbolic"
+ICON_HELP_BUBBLE = "help-about-symbolic"
+ICON_INPUT_KEYBOARD = "input-keyboard-symbolic"
+ICON_LIST_ADD = "list-add-symbolic"
+ICON_NIGHT = "weather-clear-night-symbolic"
+ICON_REFRESH = "view-refresh-symbolic"
+ICON_SEARCH = "system-search-symbolic"
+ICON_STEAM = "steam-tray-symbolic"
+ICON_VIEW_CONCEAL = "view-conceal-symbolic"
+ICON_VIEW_REVEAL = "view-reveal-symbolic"
+ICON_WARNING = "dialog-warning-symbolic"
+ICON_WEB_BROWSER = "web-browser-symbolic"

dzgui/managers/connection.py

@@ -48,7 +48,7 @@ from dzgui.strings.dialogs import (
     waiting_for_directories,
 )
 from dzgui.strings import kb
-from dzgui.strings.server_mods import checkmark, resync, invalid_mod
+from dzgui.strings.server_mods import checkmark, resync
 from dzgui.util.format import format_exception, format_mib
 from dzgui.util.strings import dialog, server_timeout
 from dzgui.util.symlink import rebuild_symlinks
@@ -197,8 +197,9 @@ class ConnectionManager:
 
         is_last = self.is_last_server()
 
+        # TODO: strings
         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(
@@ -276,7 +277,8 @@ class ConnectionManager:
         for mod in alpha_mods:
             # NOTE: if the mod is neither synched or out of date, it is a malformed mod
             if mod[2] == "":
-                mod[2] = invalid_mod
+                # TODO: strings
+                mod[2] = "Invalid mod"
 
         return alpha_mods, missing_mods
 

dzgui/managers/filter.py

@@ -2,7 +2,7 @@ from typing import TYPE_CHECKING
 
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import strings
-from dzgui.strings.filters import all_maps
+from dzgui.util.strings import all_maps
 
 if TYPE_CHECKING:
     from dzgui.model.model_factory import FastInsertListStore
@@ -106,10 +106,16 @@ class FilterManager:
 
         self.reinit_map_store()
         maps.sort()
-        clean = [m for m in maps if m != all_maps]
-        for m in clean:
+        for m in maps:
+            # TODO: strings
+            if m == "All maps":
+                continue
             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:
         map_name = self.get_active_map_name()
         enabled = self.get_filters()

dzgui/model/proxy_model.py

@@ -5,7 +5,6 @@ from typing import Any, TYPE_CHECKING, Union
 from dzgui.const.enum import FilterMode
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import strings
-from dzgui.strings import filters as str_filters
 
 if TYPE_CHECKING:
     from dzgui.managers.filter import FilterManager
@@ -176,7 +175,7 @@ class ProxyModelManager:
         rows = self.filtered
         sel_map = self.filter_man.get_active_map_name()
 
-        if sel_map == str_filters.all_maps:
+        if sel_map == strings.all_maps:
             return rows
 
         rows = [row for row in rows if row[1] == sel_map]

dzgui/strings/buttons.py

@@ -1,16 +1,2 @@
-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_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"

dzgui/strings/dialogs.py

@@ -29,5 +29,3 @@ toggle_calc = "Toggle calculator"
 
 server_details = "Server details"
 server_message = "Server message"
-
-caught_cancel_signal = "Caught cancel signal, cleaning up"

dzgui/strings/filters.py

@@ -1,4 +0,0 @@
-all_maps = "All maps"
-filters_heading = "Filters"
-keyword_placeholder = "Filter by keyword"
-map_placeholder = "Filter by map"

dzgui/strings/generic.py

@@ -1,2 +1 @@
-tab_changed_label = "*"
 selectable_tree = "Ctrl-click to select multiple; Shift-click to select a range."

dzgui/strings/notes.py

@@ -1,5 +0,0 @@
-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}'"

dzgui/strings/options.py

@@ -16,9 +16,7 @@ lan_combo = "LAN"
 fullscreen_eventbox = "This option is not available on Steam Deck."
 save_button = "Save"
 
-api_placeholder = "Enter API key"
 api_failed = "API validation failed"
-api_validate = "Validate"
 
 flatpak_label = "Flatpak client"
 flatpak_standard = "Standard"

dzgui/strings/server_mods.py

@@ -3,5 +3,4 @@ mod_id = "ID"
 up_to_date = "Up to date"
 modlist = "Modlist"
 checkmark = "✓"
-resync = "⟳"
-invalid_mod = "Invalid mod"
+resync="⟳"

dzgui/util/strings.py

@@ -159,6 +159,9 @@ filter_unofficial = "Unofficial"
 filter_modded = "Modded"
 filter_unmodded = "Unmodded"
 
+# maps
+all_maps = "All maps"
+
 # state
 unknown = "Unknown"
 none_provided = "None provided"

dzgui/views/components/buttons.py

@@ -7,15 +7,15 @@ from dzgui.util.strings import (
     alert_button_tooltip,
     atomic_buttons,
 )
-from dzgui.const.constants import (
-    CLIPBOARD,
-    CLOSE,
-    INPUT_KEYBOARD,
-    LIST_ADD,
-    REFRESH_ICON,
-    STEAM_ICON,
-    WARNING,
-    WEB_BROWSER,
+from dzgui.const.icons import (
+    ICON_CLIPBOARD,
+    ICON_CLOSE,
+    ICON_INPUT_KEYBOARD,
+    ICON_LIST_ADD,
+    ICON_REFRESH,
+    ICON_STEAM,
+    ICON_WARNING,
+    ICON_WEB_BROWSER,
 )
 from dzgui.strings import connect_panel
 
@@ -102,11 +102,12 @@ class LargeIconTextButton(IconButton):
 
 class ClipboardButton(IconTextButton):
     def __init__(self, controller: Union["Controller", None], func: Callable) -> None:
-        super().__init__(CLIPBOARD, atomic_buttons.copy)
+        super().__init__(ICON_CLIPBOARD, atomic_buttons.copy)
         self.controller = controller
         self.connect("clicked", self._on_button_clicked, func)
 
-        self.set_tooltip_text(buttons.clipboard_button)
+        # TODO: strings
+        self.set_tooltip_text("Copy to clipboard")
 
     def _on_button_clicked(self, button: Self, func: Callable) -> None:
         def revert() -> Literal[False]:
@@ -124,26 +125,28 @@ class CopyIpButton(ClipboardButton):
     def __init__(self, controller: Union["Controller", None], func: Callable) -> None:
         super().__init__(controller, func)
 
-        self.set_tooltip_text(buttons.clipboard_ip_button)
+        # TODO: strings
+        self.set_tooltip_text("Copy IP to clipboard")
 
 
 class CloseButton(IconTextButton):
     def __init__(self, label: str) -> None:
-        super().__init__(icon=CLOSE, label=label)
+        super().__init__(icon=ICON_CLOSE, label=label)
 
-        self.set_tooltip_text(buttons.unset_button_tooltip)
+        # TODO: strings
+        self.set_tooltip_text("Unset this server as favorite")
 
 
 class WebButton(IconTextButton):
     def __init__(self, label: str) -> None:
-        super().__init__(icon=WEB_BROWSER, label=label)
+        super().__init__(icon=ICON_WEB_BROWSER, label=label)
         pass
 
 
 class RefreshButton(IconTextButton):
     def __init__(self, controller: "Controller") -> None:
         super().__init__(
-            icon=REFRESH_ICON,
+            icon=ICON_REFRESH,
             label=atomic_buttons.refresh,
         )
 
@@ -208,7 +211,7 @@ class RefreshButton(IconTextButton):
 
 class KeysButton(IconTextButton):
     def __init__(self, controller: "Controller") -> None:
-        super().__init__(icon=INPUT_KEYBOARD, label=atomic_buttons.keys)
+        super().__init__(icon=ICON_INPUT_KEYBOARD, label=atomic_buttons.keys)
 
         self.controller = controller
         self.set_margin_top(10)
@@ -225,7 +228,7 @@ class KeysButton(IconTextButton):
 
 class SteamConnectButton(LargeIconTextButton):
     def __init__(self) -> None:
-        super().__init__(icon=STEAM_ICON, label=connect_panel.connect_button)
+        super().__init__(icon=ICON_STEAM, label=connect_panel.connect_button)
         self.set_tooltip_text(connect_panel.connect_tooltip)
 
 
@@ -245,11 +248,10 @@ class SteamWorkshopButton(SteamTextButton):
 
 class AddButton(IconTextButton):
     def __init__(self) -> None:
-        super().__init__(icon=LIST_ADD, label=connect_panel.add_button)
+        super().__init__(icon=ICON_LIST_ADD, label=connect_panel.add_button)
         self.set_tooltip_text(connect_panel.add_tooltip)
 
 
-# TODO: drop
 class LoggerAlertsButton(IconTextButton):
     def __init__(self, warnings: int, errors: int) -> None:
         warnings_text = ""
@@ -265,7 +267,7 @@ class LoggerAlertsButton(IconTextButton):
             separator = ","
         concat = warnings_text + separator + errors_text
         super().__init__(
-            icon=WARNING,
+            icon=ICON_WARNING,
             label=f"Loaded with{concat}",
         )
         self.set_halign(Gtk.Align.END)

dzgui/views/components/connect_panel.py

@@ -1,13 +1,9 @@
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.constants import CARET_DOWN, CARET_UP, UDP_PORT
+from dzgui.const.icons import ICON_CARET_DOWN, ICON_CARET_UP
+from dzgui.const.constants import UDP_PORT
 from dzgui.model.servers import ServerModelManager
 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.views.components.buttons import (
     AddButton,
@@ -35,24 +31,27 @@ ROWS = 1
 
 class DockButton(IconButton):
     def __init__(self, child: Gtk.Widget) -> None:
-        super().__init__(CARET_DOWN)
+        super().__init__(ICON_CARET_DOWN)
 
         self.expanded = True
         self.child = child
         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_tooltip_text(dock_button_collapse)
+        self.set_tooltip_text(self.collapse_text)
 
     def collapse(self) -> None:
-        self.set_image(Icon(CARET_UP))
+        self.set_image(Icon(ICON_CARET_UP))
         self.child.hide()
-        self.set_tooltip_text(dock_button_expand)
+        self.set_tooltip_text(self.expand_text)
 
     def expand(self) -> None:
-        self.set_image(Icon(CARET_DOWN))
+        self.set_image(Icon(ICON_CARET_DOWN))
         self.child.show()
-        self.set_tooltip_text(dock_button_collapse)
+        self.set_tooltip_text(self.collapse_text)
 
     def _on_click(self, button: Self) -> None:
         if self.expanded:
@@ -83,6 +82,7 @@ class LanPanel(Gtk.Frame):
         self.scan = Gtk.Button(label=connect_panel.lan_scan_button)
         self.scan.connect("clicked", self._on_scan_clicked)
 
+        # TODO: strings
         self.early_abort = Gtk.CheckButton(label=connect_panel.lan_checkbox)
         self.early_abort.set_active(True)
         self.early_abort.set_tooltip_text(connect_panel.lan_abort_tooltip)
@@ -190,7 +190,8 @@ class FavPanel(Gtk.Frame):
         self.fav_button.connect("clicked", self._on_connect_clicked)
         self.copy_button = CopyIpButton(self.controller, self.get_fav_ip)
 
-        self.unset_button = CloseButton(unset_button_label)
+        # TODO: strings
+        self.unset_button = CloseButton("Unset")
         self.unset_button.connect("clicked", self._on_unset_clicked)
 
         if favorite is None:

dzgui/views/components/entry.py

@@ -1,10 +1,9 @@
 from typing import Any, Callable, TYPE_CHECKING
 
 from dzgui.api.servers import validate_ip
-from dzgui.const.constants import VIEW_CONCEAL, VIEW_REVEAL
+from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
 from dzgui.util.css import add_class, remove_class
 from dzgui.strings import connect_panel
-from dzgui.strings.options import api_placeholder, api_validate
 from dzgui.strings.errors import api_popover
 
 import gi
@@ -144,17 +143,19 @@ class APIEntry(Gtk.Box):
 
         self.func: Callable | None = None
 
+        # TODO: strings
         self.entry = Gtk.Entry(
-            width_chars=60, hexpand=True, placeholder_text=api_placeholder
+            width_chars=60, hexpand=True, placeholder_text="Enter API key"
         )
-        self.entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, VIEW_REVEAL)
+        self.entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, ICON_VIEW_REVEAL)
         self.entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
         self.entry.set_visibility(False)
         self.entry.connect("changed", self._on_text_changed)
         self.entry.connect("icon-release", self._on_icon_release)
         self.entry.connect("activate", self._on_field_activated)
 
-        self.submit = Gtk.Button(label=api_validate)
+        # TODO: strings
+        self.submit = Gtk.Button(label="Validate")
         self.submit.set_sensitive(False)
         self.submit.connect("clicked", self._on_submit)
 
@@ -205,9 +206,9 @@ class APIEntry(Gtk.Box):
     ) -> None:
         visible = widget.get_visibility()
         if visible:
-            icon, state = VIEW_REVEAL, False
+            icon, state = ICON_VIEW_REVEAL, False
         else:
-            icon, state = VIEW_CONCEAL, True
+            icon, state = ICON_VIEW_CONCEAL, True
         widget.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon)
         widget.set_visibility(state)
 

dzgui/views/components/eventbox.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from dzgui.const.enum import NotebookPage
-from dzgui.const.constants import HELP_BUBBLE
+from dzgui.const.icons import ICON_HELP_BUBBLE
 
 import gi
 
@@ -20,7 +20,7 @@ class InfoEventBox(Gtk.EventBox):
         self.text = text
 
         self.icon = Gtk.Image.new_from_icon_name(
-            HELP_BUBBLE, Gtk.IconSize.LARGE_TOOLBAR
+            ICON_HELP_BUBBLE, Gtk.IconSize.LARGE_TOOLBAR
         )
         self.icon.set_opacity(0.8)
         box = Gtk.Box()

dzgui/views/components/filter_panel.py

@@ -7,15 +7,10 @@ from dzgui.const.constants import (
     NO_EXPAND,
     NO_FILL,
     NO_PADDING,
-    SEARCH_ICON,
 )
+from dzgui.const.icons import ICON_SEARCH
 from dzgui.util.format import format_exception
-from dzgui.strings.filters import (
-    all_maps,
-    filters_heading,
-    keyword_placeholder,
-    map_placeholder,
-)
+from dzgui.util.strings import all_maps
 from dzgui.views.components.maps_combo import MapsCombo
 from dzgui.views.components.labels import BoldLabel
 
@@ -47,10 +42,7 @@ class ButtonGrid(Gtk.Grid):
         self.checks: list[Gtk.CheckButton] = []
 
         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():
@@ -107,7 +99,8 @@ class ButtonGrid(Gtk.Grid):
 
 class KeywordEntry(Gtk.Entry):
     def __init__(self, controller: "Controller") -> None:
-        super().__init__(placeholder_text=keyword_placeholder)
+        # TODO :strings
+        super().__init__(placeholder_text="Filter by keyword")
 
         self.keyword = ""
         self.controller = controller
@@ -116,7 +109,7 @@ class KeywordEntry(Gtk.Entry):
         self.connect("key-press-event", self._on_keypress)
         self.connect("icon-release", lambda *args: self.activate())
 
-        self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, SEARCH_ICON)
+        self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, ICON_SEARCH)
         self.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
 
         self.emitter.connect("load_maps", self._on_maps_loaded)
@@ -181,7 +174,8 @@ class FilterPanel(Gtk.Box):
         self.keyword_entry = KeywordEntry(self.controller)
         self.button_grid = ButtonGrid(self.controller, defaults, tooltips)
 
-        self.filters_label = BoldLabel(filters_heading)
+        # TODO: strings
+        self.filters_label = BoldLabel("Filters")
 
         self.emitter.connect(
             "request_keyword_focus", lambda _: self.keyword_entry.grab_focus()
@@ -201,7 +195,8 @@ class FilterPanel(Gtk.Box):
 
         self.maps_entry: Gtk.Entry = self.maps_combo.get_child()  # type: ignore
         self.maps_entry.set_completion(completion)
-        self.maps_entry.set_placeholder_text(map_placeholder)
+        # TODO: strings
+        self.maps_entry.set_placeholder_text("Filter by map")
         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("activate", self._on_maps_activated)

dzgui/views/components/misc.py

@@ -1,7 +1,8 @@
 from typing import Self
 from warnings import deprecated
 
-from dzgui.const.constants import ERROR, FLATPAK_RUN_CMD, FLATPAK_SANDBOX, STEAM_CMD
+from dzgui.const.constants import FLATPAK_RUN_CMD, FLATPAK_SANDBOX, STEAM_CMD
+from dzgui.const.icons import ICON_ERROR
 from dzgui.init.prereqs import has_steam_client, has_flatpak_client
 from dzgui.strings import options
 from dzgui.views.components.box import HBox
@@ -73,7 +74,7 @@ class ErrorPopover(Gtk.Popover):
 
         self.hbox = HBox()
         self.label = Gtk.Label(label="", margin_start=10, margin_end=10)
-        error_icon = Icon(ERROR, margin_start=10)
+        error_icon = Icon(ICON_ERROR, margin_start=10)
         self.hbox.extend([error_icon, self.label])
         self.add(self.hbox)
         self.show_all()

dzgui/views/components/right_panel.py

@@ -13,7 +13,6 @@ from dzgui.const.constants import (
 )
 from dzgui.const.enum import ServerTab
 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.file import is_writeable
 from dzgui.views.components.buttonbox import ButtonBox
@@ -66,7 +65,8 @@ class RightPanel(Gtk.Box):
             vexpand=True,
             halign=Gtk.Align.END,
             valign=Gtk.Align.END,
-            tooltip_text=version_tooltip,
+            # TODO: strings
+            tooltip_text="Click to copy to clipboard",
         )
         eb = Gtk.EventBox(halign=Gtk.Align.END, valign=Gtk.Align.END)
         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.update_button = IconTextButton(
-            "dialog-information-symbolic", label=update_button
+            "dialog-information-symbolic", label="Updates available"
         )
 
         self.gutter_box = Gtk.Box(
@@ -131,6 +131,7 @@ class RightPanel(Gtk.Box):
             return
         self.copying = True
         version = self.version_label.get_text()
-        self.version_label.set_text(version_notifier)
+        # TODO: strings
+        self.version_label.set_text("Copied!")
         copy_clipboard(version)
         GLib.timeout_add_seconds(1, revert)

dzgui/views/dialogs/calc.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from datetime import datetime, time, timedelta
 from typing import Literal
 
-from dzgui.const.constants import DAY_ICON, NIGHT_ICON
+from dzgui.const.icons import ICON_DAY, ICON_NIGHT
 from dzgui.strings import calc
 from dzgui.views.components.icon import Icon
 from dzgui.views.components.labels import BoldLabel
@@ -385,7 +385,7 @@ class TimePickerFrame(Gtk.Frame):
         h1 = BoldLabel(calc.heading_server_time)
         h2 = BoldLabel(calc.heading_target_time)
 
-        self.icon_indicator = Icon(DAY_ICON)
+        self.icon_indicator = Icon(ICON_DAY)
         self.update_server_icon()
 
         server_time_box = HBox(10)
@@ -411,7 +411,7 @@ class TimePickerFrame(Gtk.Frame):
         self.add(flowbox)
 
     def update_server_icon(self) -> None:
-        icon = DAY_ICON if self.server_time.is_day() else NIGHT_ICON
+        icon = ICON_DAY if self.server_time.is_day() else ICON_NIGHT
         self.icon_indicator.set_icon_name(icon)
 
     def _on_server_clock_increment(self, emitter: Emitter, time_now: datetime) -> None:

dzgui/views/dialogs/generic.py

@@ -140,7 +140,8 @@ class WaitDialog(GenericDialog):
         self.cur_job += 1
 
     def _on_cancel_clicked(self, button: Gtk.Button) -> None:
-        GLib.idle_add(self.update_text, dialogs.caught_cancel_signal)
+        # TODO: strings
+        GLib.idle_add(self.update_text, "Caught cancel signal, cleaning up")
         self.controller.set_cancel_event()
 
     def show_cancel(self, state: bool) -> None:

dzgui/views/dialogs/note.py

@@ -1,13 +1,12 @@
 from typing import Self, TYPE_CHECKING
 
-from dzgui.strings import notes
 from dzgui.views.components.entry import ValidatedEntry
 from dzgui.views.dialogs.generic import GenericDialog
 
-import gi
+import gi  # noqa E402
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gdk, Gtk  # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
@@ -15,20 +14,23 @@ if TYPE_CHECKING:
 
 class NoteDialog(GenericDialog):
     def __init__(self, controller: "Controller"):
+        # TODO: add to strings
+        title = "Add a short note/reminder."
+        secondary = "Limit 30 chars"
         super().__init__(
             controller=controller,
-            text=notes.dialog_title,
+            text=title,
             buttons=Gtk.ButtonsType.NONE,
             mtype=Gtk.MessageType.INFO,
-            secondary=notes.dialog_subtitle,
+            secondary=secondary,
         )
 
         self.controller = controller
 
-        delete_button = Gtk.Button(label=notes.delete_button)
+        delete_button = Gtk.Button(label="Delete note")
         delete_button.set_sensitive(False)
         self.add_action_widget(delete_button, Gtk.ResponseType.CANCEL)
-        self.ok = self.add_button(notes.ok_button, Gtk.ResponseType.OK)
+        self.ok = self.add_button("Update note", Gtk.ResponseType.OK)
         self.ok.grab_default()
 
         self.entry = ValidatedEntry(controller, self.validate)
@@ -40,7 +42,7 @@ class NoteDialog(GenericDialog):
         self.entry.set_text(note)
         if len(note) > 0:
             delete_button.set_sensitive(True)
-            self.format_secondary_text(notes.current_note.format(note))
+            self.format_secondary_text(f"Current note: '{note}'")
         elif len(note) == 0:
             self.ok.set_sensitive(False)
 
@@ -53,6 +55,9 @@ class NoteDialog(GenericDialog):
         self.entry.connect("changed", self._on_text_changed)
 
     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:
             self.ok.set_sensitive(False)
 
@@ -66,11 +71,14 @@ class NoteDialog(GenericDialog):
 
     def _on_response(self, dialog: Self, response: Gtk.ResponseType) -> None:
         match response:
+            case Gtk.ResponseType.DELETE_EVENT:
+                self.destroy()
             case Gtk.ResponseType.OK:
                 note = self.entry.get_text()
                 self.controller.add_note(note)
+                self.destroy()
             case Gtk.ResponseType.CANCEL:
                 self.controller.delete_note()
-            case _:
-                pass
-        self.destroy()
+                self.destroy()
+            case Gtk.ResponseType.CANCEL | Gtk.ResponseType.CLOSE:
+                self.destroy()

dzgui/views/dialogs/servers.py

@@ -2,7 +2,7 @@ import gi
 import html
 from typing import Self, TYPE_CHECKING
 
-from dzgui.const.constants import CALCULATOR
+from dzgui.const.icons import ICON_CALCULATOR
 from dzgui.const.enum import ContextMenuGroup
 from dzgui.model.model_factory import ModelFactory
 from dzgui.util import css
@@ -110,7 +110,7 @@ class ServerDetailsDialog(ServerDialog):
         text = format_hyperlinks(text)
         self.description.set_markup(html.escape(text))
 
-        calc_button = IconTextButton(CALCULATOR, dialogs.toggle_calc)
+        calc_button = IconTextButton(ICON_CALCULATOR, dialogs.toggle_calc)
         calc_button.connect("clicked", self._on_calc_pressed)
         calc_button.set_halign(Gtk.Align.END)
         calc_button.set_valign(Gtk.Align.START)

dzgui/views/dialogs/wizard.py

@@ -14,7 +14,7 @@ from dzgui.const.constants import (
     HERO_PATH,
     FLATPAK_ROOT_PATH,
     LEGACY_CONFIG_PATH,
-    TMP_PATH,
+    TMP_PATH
 )
 from dzgui.const.boilerplate import config_boilerplate
 from dzgui.const.endpoints import STEAM_API_SETUP

dzgui/views/pages/offline.py

@@ -3,14 +3,12 @@ from enum import Enum
 from typing import Self, TYPE_CHECKING, Union
 
 from dzgui.util import css
+from dzgui.const.icons import ICON_EDIT_DELETE, ICON_FOLDER, ICON_WARNING
 from dzgui.const.constants import (
     APPID_DAYZ,
     APPID_DAYZ_EXP,
     APPNAME_DAYZ,
     APPNAME_DAYZ_EXP_HUMAN,
-    EDIT_DELETE,
-    FOLDER,
-    WARNING,
 )
 from dzgui.const.enum import ContextMenuGroup, NotebookPage
 from dzgui.managers.offline import OfflineManager
@@ -87,7 +85,7 @@ class FolderHBox(HBox):
         self.emitter = controller.get_emitter()
 
         self.eb = InfoEventBox(eb_text, controller)
-        self.button = IconTextButton(FOLDER, btn_label, Gtk.PositionType.LEFT)
+        self.button = IconTextButton(ICON_FOLDER, btn_label, Gtk.PositionType.LEFT)
         self.button.set_halign(Gtk.Align.START)
         self.button.set_image_position(Gtk.PositionType.LEFT)
 
@@ -99,7 +97,7 @@ class FolderHBox(HBox):
         self.label = Gtk.Label()
         self.scrolled_label.add(self.label)
 
-        self.unset_button = IconTextButton(EDIT_DELETE, offline.unset_button)
+        self.unset_button = IconTextButton(ICON_EDIT_DELETE, offline.unset_button)
         self.unset_button.connect("clicked", self._on_unset_clicked)
 
         self.spinner = Gtk.Spinner()
@@ -195,7 +193,7 @@ class ModFrame(HeadingFrame):
         self.tree_vbox.extend([self.scrolled, self.status])
 
         self.no_mods = HBox(spacing=10)
-        no_mods_icon = Icon(WARNING, margin_start=10)
+        no_mods_icon = Icon(ICON_WARNING, margin_start=10)
         no_mods_label = Gtk.Label(label=offline.no_local_mods, halign=Gtk.Align.START)
         self.no_mods.extend([no_mods_icon, no_mods_label])
 

dzgui/views/pages/options.py

@@ -16,9 +16,8 @@ from dzgui.const.constants import (
     NO_EXPAND,
     NO_FILL,
     NO_PADDING,
-    VIEW_CONCEAL,
-    VIEW_REVEAL,
 )
+from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL
 from dzgui.const.endpoints import STEAM_API_SETUP
 from dzgui.const.enum import Preferences, ServerTab
 from dzgui.strings import options
@@ -67,7 +66,7 @@ class SubmitField(Gtk.Box):
         # TODO: audit for all applicable callbacks
         if private:
             self.entry.set_icon_from_icon_name(
-                Gtk.EntryIconPosition.SECONDARY, VIEW_REVEAL
+                Gtk.EntryIconPosition.SECONDARY, ICON_VIEW_REVEAL
             )
             self.entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, True)
             self.entry.connect("icon-release", self._on_icon_release)
@@ -131,9 +130,9 @@ class SubmitField(Gtk.Box):
     ) -> None:
         visible = widget.get_visibility()
         if visible:
-            icon, state = VIEW_REVEAL, False
+            icon, state = ICON_VIEW_REVEAL, False
         else:
-            icon, state = VIEW_CONCEAL, True
+            icon, state = ICON_VIEW_CONCEAL, True
         widget.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon)
         widget.set_visibility(state)
 

dzgui/views/pages/preconnect.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from typing import Self, Sequence, TYPE_CHECKING
 
-from dzgui.const.constants import (
-    ERROR,
-    WARNING,
+from dzgui.const.icons import (
+    ICON_ERROR,
+    ICON_WARNING,
 )
 from dzgui.const.enum import NotebookPage
 from dzgui.util.css import add_class
@@ -166,7 +166,7 @@ class PreConnectionAssistant(Gtk.Box):
 
         # TODO: abstract into components
         self.warning_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.warning_tree = MaskedTree(WARNING)
+        self.warning_tree = MaskedTree(ICON_WARNING)
         self.warning_placeholder = Placeholder(preconnect.placeholder_no_warnings)
         self.warning_box.add(self.warning_tree)
         self.warning_box.add(self.warning_placeholder)
@@ -175,7 +175,7 @@ class PreConnectionAssistant(Gtk.Box):
         )
 
         self.error_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.error_tree = MaskedTree(ERROR)
+        self.error_tree = MaskedTree(ICON_ERROR)
         self.error_placeholder = Placeholder(preconnect.no_errors)
         self.error_box.add(self.error_tree)
         self.error_box.add(self.error_placeholder)

dzgui/views/pages/servers.py

@@ -5,7 +5,6 @@ from typing import Self, TYPE_CHECKING
 from dzgui.const.constants import APP_NAME
 from dzgui.const.enum import ContextMenuGroup, ServerTab
 from dzgui.views.trees.tree_servers import ServerTreeView
-from dzgui.strings.generic import tab_changed_label
 from dzgui.util.strings import server_labels
 
 import gi
@@ -148,7 +147,8 @@ class ServerNotebook(Gtk.ScrolledWindow):
 
         label = self.notebook.get_tab_label_text(child)
         if label is not None:
-            text = label.strip(tab_changed_label)
+            # TODO: strings
+            text = label.strip("*")
             self.notebook.set_tab_label_text(child, text)
 
         tree = child.get_tree()