Window/CLI/Install/Schema: Remove remaining upstream removed options

Foldex · Jul 29, 2023 · dc1674c · dc1674c
1 parent c0f038e
commit dc1674c
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 67 deletions.
diff --git a/data/io.github.Foldex.AdwSteamGtk.gschema.xml b/data/io.github.Foldex.AdwSteamGtk.gschema.xml
@@ -54,15 +54,6 @@
       </choices>
     </key>
 
-    <!-- Top Bar -->
-    <key name="hide-bp-button-switch" type="b">
-      <default>false</default>
-    </key>
-
-    <key name="hide-nav-url-switch" type="b">
-      <default>false</default>
-    </key>
-
     <!-- Prefs -->
     <key name="prefs-autostart-update-check" type="b">
       <default>false</default>

diff --git a/src/cli.py b/src/cli.py
@@ -66,9 +66,6 @@ def get_options(option_string):
             "library_whats_new": not settings.get_boolean('hide-whats-new-switch'),
 
             "login_qr": settings.get_string('login-qr-options'),
-
-            "top_bar_bp_button": not settings.get_boolean('hide-bp-button-switch'),
-            "top_bar_nav_url": not settings.get_boolean('hide-nav-url-switch'),
         }
 
         if option_string is None:
@@ -87,9 +84,6 @@ def get_options(option_string):
             "library_whats_new": (True, False),
 
             "login_qr": ("Show", "Hover Only", "Hide"),
-
-            "top_bar_bp_button": (True, False),
-            "top_bar_nav_url": (True, False),
         }
 
         if ":" not in option_string:

diff --git a/src/install.py b/src/install.py
@@ -94,19 +94,6 @@ def gen_cmd_line(options, beta_support):
         case _:
             login_qr = ""
 
-
-    match options["top_bar_bp_button"]:
-        case False:
-            top_bar_bp_button = "-e topbar/hide_bp "
-        case _:
-            top_bar_bp_button = ""
-
-    match options["top_bar_nav_url"]:
-        case False:
-            top_bar_nav_url = "-e topbar/hide_url "
-        case _:
-            top_bar_nav_url = ""
-
     cmd = (
         f"{installer}"
         f"{install_fonts}"
@@ -122,9 +109,6 @@ def gen_cmd_line(options, beta_support):
 
         f"{login_qr}"
 
-        f"{top_bar_bp_button}"
-        f"{top_bar_nav_url}"
-
         f"{custom_css}"
     )
 

diff --git a/src/pages/window.py b/src/pages/window.py
@@ -48,10 +48,6 @@ class AdwaitaSteamGtkWindow(Gtk.ApplicationWindow):
     login_group = Gtk.Template.Child()
     login_qr_options = Gtk.Template.Child()
 
-    top_bar_group = Gtk.Template.Child()
-    hide_bp_button_switch = Gtk.Template.Child()
-    hide_nav_url_switch = Gtk.Template.Child()
-
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
@@ -130,9 +126,6 @@ def load_config(self):
 
         self.select_from_config('login-qr-options', self.login_qr_options, self.opt_array["login_qr"])
 
-        self.select_from_config('hide-bp-button-switch', self.hide_bp_button_switch)
-        self.select_from_config('hide-nav-url-switch', self.hide_nav_url_switch)
-
     def save_config(self):
         self.config_from_select('color-theme-options', self.color_theme_options, self.opt_array["color_theme"])
         self.config_from_select('no-rounded-corners-switch', self.no_rounded_corners_switch)
@@ -145,9 +138,6 @@ def save_config(self):
 
         self.config_from_select('login-qr-options', self.login_qr_options, self.opt_array["login_qr"])
 
-        self.config_from_select('hide-bp-button-switch', self.hide_bp_button_switch)
-        self.config_from_select('hide-nav-url-switch', self.hide_nav_url_switch)
-
 
     def get_selected_pref(self, widget, array=None):
         match type := widget.get_name():
@@ -231,9 +221,6 @@ def install_theme(self, *args):
             "library_whats_new": not self.get_selected_pref(self.hide_whats_new_switch),
 
             "login_qr": self.get_selected_pref(self.login_qr_options, self.opt_array["login_qr"]),
-
-            "top_bar_bp_button": not self.get_selected_pref(self.hide_bp_button_switch),
-            "top_bar_nav_url": not self.get_selected_pref(self.hide_nav_url_switch),
         }
 
         (ret, msg) = install.run(options, self.beta_support)

diff --git a/src/ui/window.blp b/src/ui/window.blp
@@ -97,29 +97,6 @@ template $AdwaitaSteamGtkWindow : ApplicationWindow {
           }
         }
 
-        Adw.PreferencesGroup top_bar_group {
-          title: _("Top Bar Options");
-          Adw.ActionRow {
-            title: _("Hide Big Picture Button");
-            tooltip-text: _("Disables display of the Big Picture button on the Top Bar.");
-            activatable-widget: hide_bp_button_switch;
-
-            Switch hide_bp_button_switch {
-              valign: center;
-            }
-          }
-          Adw.ActionRow {
-            title: _("Hide URL Bar");
-            tooltip-text: _("Disables display of the page URL on the Top Bar.");
-            activatable-widget: hide_nav_url_switch;
-
-            Switch hide_nav_url_switch {
-              valign: center;
-            }
-          }
-        }
-
-
        };
     };
   }