From 5e0e6e4592d32b4aa56ec2ebdb5401c01fc5606a Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Wed, 13 May 2026 18:12:31 +0900 Subject: [PATCH] chore: update options page strings --- CHANGELOG.md | 3 +++ dzgui/views/pages/options.py | 38 ++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75a62ec..30c1729 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - Preconnect dialog - Preconnect warnings/failsafes like filesize + ## Changed - Reduce padding on keys button - Boldface breadcrumbs @@ -44,11 +45,13 @@ - Cull servers with abnormal queue values (integer overflow: 2147483647) - Packaging structure - Suppress log messages from imported modules +- Embed Workshop link in Options menu ## Dropped - Debug mode - Branch switching - Manual mod install mode (describe rationale) +- Force update mods ## Fixed - Longstanding issue with left clicks not registering as tree selection changes after spamming keyboard input diff --git a/dzgui/views/pages/options.py b/dzgui/views/pages/options.py index 0243713..fbb20c3 100644 --- a/dzgui/views/pages/options.py +++ b/dzgui/views/pages/options.py @@ -41,6 +41,13 @@ if TYPE_CHECKING: from dzgui.controllers.emitter import Emitter +class ShortHBox(Gtk.Box): + def __init__(self, widget: Gtk.Widget) -> None: + super().__init__(spacing=5, halign=Gtk.Align.START) + + self.pack_start(widget, NO_EXPAND, NO_FILL, NO_PADDING) + + class Options(Gtk.Box): def __init__(self, controller: "Controller"): super().__init__( @@ -96,15 +103,16 @@ class Options(Gtk.Box): ) self.client_combo = Gtk.ComboBoxText() - # TODO: strings - self.client_combo.append_text("Steam") - self.client_combo.append_text("Flatpak") - self.client_combo.append_text("Flatpak (container)") + for text in ( + options.steam_combo, + options.flatpak_combo, + options.flatpak_container_combo, + ): + self.client_combo.append_text(text) self.client_combo.set_active(0) self.client_combo.connect("changed", self._on_client_changed) - # TODO: short hbox class - client_hbox = Gtk.Box(spacing=5, halign=Gtk.Align.START) - client_hbox.pack_start(self.client_combo, NO_EXPAND, NO_FILL, NO_PADDING) + + client_hbox = ShortHBox(self.client_combo) self.distance_toggle = self.make_binary_radio( strings.options.km, strings.options.mi, Preferences.DIST @@ -112,10 +120,10 @@ class Options(Gtk.Box): combo_store = Gtk.ListStore(str, object) tabs = ( - ("Server browser", ServerTab.BROWSER), - ("Saved servers", ServerTab.SAVED), - ("Recent", ServerTab.RECENT), - ("LAN", ServerTab.LAN), + (options.server_combo, ServerTab.BROWSER), + (options.saved_combo, ServerTab.SAVED), + (options.recent_combo, ServerTab.RECENT), + (options.lan_combo, ServerTab.LAN), ) for tab in tabs: combo_store.append(tab) @@ -124,15 +132,15 @@ class Options(Gtk.Box): self.start_tab_combo.pack_start(renderer_text, True) self.start_tab_combo.add_attribute(renderer_text, "text", 0) self.start_tab_combo.set_active(0) - start_tab_hbox = Gtk.Box(spacing=5, halign=Gtk.Align.START) - start_tab_hbox.pack_start(self.start_tab_combo, NO_EXPAND, NO_FILL, NO_PADDING) + + start_tab_hbox = ShortHBox(self.start_tab_combo) self.start_tab_combo.connect("changed", self._on_start_tab_changed) pref_rows = [ [LeftLabel(strings.options.client), client_hbox], [LeftLabel(strings.options.window_size), self.fullscreen_toggle], [LeftLabel(strings.options.distance), self.distance_toggle], - [LeftLabel("Start tab"), start_tab_hbox], + [LeftLabel(options.start_tab), start_tab_hbox], [LeftLabel(strings.options.name), self.player_box], ] @@ -191,7 +199,7 @@ class Options(Gtk.Box): hexpand=True, ) - developers = Gtk.Button(label="Developers", halign=Gtk.Align.START) + developers = Gtk.Button(label=options.developers, halign=Gtk.Align.START) developers.connect("clicked", self._on_developers_clicked) prefs = self.controller.get_prefs()