diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index 59d2dd2..8267777 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -541,9 +541,6 @@ class Controller(GObject.GObject): def update_status(self) -> None: self.mediator.preconnect.mark_finished() - def get_steam_client_name(self, cmd: str) -> str: - return self.mediator.options.get_client_name(cmd) - def present_window(self) -> None: self.mediator.window.present_with_time(Gdk.CURRENT_TIME) diff --git a/dzgui/managers/config.py b/dzgui/managers/config.py index 5783b5e..7490b15 100644 --- a/dzgui/managers/config.py +++ b/dzgui/managers/config.py @@ -6,9 +6,6 @@ from typing import Any, TYPE_CHECKING from dzgui.const.constants import ( APP_NAME, - FLATPAK_RUN_CMD, - FLATPAK_SANDBOX, - STEAM_CMD, WINDOW_DEFAULT_X, WINDOW_DEFAULT_Y, ) @@ -129,15 +126,6 @@ class ConfigManager: def enum_to_key(self, enum: Preferences) -> str: return str(enum.dict["key"]) - def get_client_index(self, client: str) -> int: - if client == STEAM_CMD: - return 0 - if client == FLATPAK_RUN_CMD: - return 1 - if client == FLATPAK_SANDBOX: - return 2 - return 0 - def toggle_config(self, key: Preferences) -> None: try: real_key = self.enum_to_key(key) diff --git a/dzgui/views/components/misc.py b/dzgui/views/components/misc.py index 80ef5fd..cdc3f49 100644 --- a/dzgui/views/components/misc.py +++ b/dzgui/views/components/misc.py @@ -1,17 +1,19 @@ +from typing import Self +from warnings import deprecated + from dzgui.const.constants import ERROR, FLATPAK_RUN_CMD, FLATPAK_SANDBOX, STEAM_CMD +from dzgui.init.prereqs import has_steam_client, has_flatpak_client from dzgui.strings import options from dzgui.views.components.box import HBox from dzgui.views.components.buttons import Icon -from typing import Self -from dzgui.init.prereqs import has_steam_client, has_flatpak_client - import gi gi.require_version("Gtk", "3.0") from gi.repository import Gtk # noqa +@deprecated("Client choice is determined at setup time") class ClientCombo(Gtk.ComboBox): def __init__(self) -> None: super().__init__() diff --git a/dzgui/views/pages/options.py b/dzgui/views/pages/options.py index 6b5da07..91e0b72 100644 --- a/dzgui/views/pages/options.py +++ b/dzgui/views/pages/options.py @@ -25,7 +25,7 @@ from dzgui.views.components.eventbox import InfoEventBox from dzgui.views.components.labels import LeftLabel from dzgui.views.components.buttons import SpinnerButton, WebButton from dzgui.views.components.frame import HeadingFrame -from dzgui.views.components.misc import ClientCombo, ErrorPopover +from dzgui.views.components.misc import ErrorPopover from dzgui.views.dialogs.generic import ExceptionDialog from dzgui.views.mixins.scrollable_mixin import ScrollableMixin @@ -281,11 +281,6 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore Preferences.WINDOW, ) - self.client_combo = ClientCombo() - self.client_combo.connect("changed", self._on_client_changed) - - client_hbox = ShortHBox(self.client_combo) - self.distance_toggle = ToggleField( self.controller, strings.options.km, strings.options.mi, Preferences.DIST ) @@ -309,7 +304,6 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore 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(options.start_tab), start_tab_hbox], @@ -367,17 +361,11 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore self.connect("key-press-event", self._on_keypress) - def get_client_name(self, cmd: str) -> str: - return self.client_combo.get_client_human_readable(cmd) - def block_text_entry(self) -> None: self.steam_box.block_text_entry() - # self.steam_entry.set_position(-1) - # self.steam_entry.set_can_focus(False) def unblock_text_entry(self) -> None: self.steam_box.unblock_text_entry() - # self.steam_entry.set_can_focus(True) def _on_developers_clicked(self, button: Gtk.Button) -> None: self.controller.show_developers_page() @@ -412,13 +400,6 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore index = enum.value self.controller.update_config(Preferences.START_TAB, index) - def _on_client_changed(self, combo: Gtk.ComboBoxText) -> None: - _iter = combo.get_active_iter() - if _iter is None: - raise ValueError(f"No active iterator set on {combo}") - real_cmd = combo.get_model()[_iter][1] - self.controller.update_config(Preferences.CLIENT, real_cmd) - def populate_settings(self) -> None: prefs = self.controller.get_prefs() # NOTE: re-check in case file was removed by user between runs @@ -464,10 +445,6 @@ class Options(ScrollableMixin, Gtk.ScrolledWindow): # type: ignore self.dayz_version_label.set_text(dayz_version) self.dayz_exp_version_label.set_text(dayz_exp_version) - # TODO: bicolumn list store with no cell renderer on index 1, use raw command names - active_combo = query.get_client_index(config["client"]) - self.client_combo.set_active(active_combo) - start_tab = self.controller.query_config(Preferences.START_TAB) self.start_tab_combo.set_active(start_tab)