From 89e894e71452a23e655654b2ed948f27fc1ddde8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 20 Dec 2024 03:58:47 +0100 Subject: [PATCH] bottles: remove "Core" tab --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 1 + .../bottles-unwrapped/remove-core-tab.patch | 76 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index c1ac15836939..f8c738bd1452 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { [ ./vulkan_icd.patch ./remove-flatpak-check.patch + ./remove-core-tab.patch ] ++ ( if removeWarningPopup then diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch new file mode 100644 index 000000000000..79e88db7dc5f --- /dev/null +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch @@ -0,0 +1,76 @@ +diff --git a/bottles/frontend/ui/preferences.blp b/bottles/frontend/ui/preferences.blp +index 9dd12a16..c1fcf649 100644 +--- a/bottles/frontend/ui/preferences.blp ++++ b/bottles/frontend/ui/preferences.blp +@@ -284,20 +284,6 @@ template $PreferencesWindow: Adw.PreferencesWindow { + } + } + +- Adw.PreferencesPage pref_core { +- icon-name: "application-x-addon-symbolic"; +- title: _("Core"); +- visible: false; +- +- Adw.PreferencesGroup list_runtimes { +- title: _("Runtime"); +- } +- +- Adw.PreferencesGroup list_winebridge { +- title: _("WineBridge"); +- } +- } +- + Adw.PreferencesPage { + icon-name: "applications-science-symbolic"; + title: _("Experiments"); +diff --git a/bottles/frontend/views/preferences.py b/bottles/frontend/views/preferences.py +index ce7ec958..f46c6e5b 100644 +--- a/bottles/frontend/views/preferences.py ++++ b/bottles/frontend/views/preferences.py +@@ -53,8 +53,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + switch_steam_programs = Gtk.Template.Child() + switch_epic_games = Gtk.Template.Child() + switch_ubisoft_connect = Gtk.Template.Child() +- list_winebridge = Gtk.Template.Child() +- list_runtimes = Gtk.Template.Child() + list_runners = Gtk.Template.Child() + list_dxvk = Gtk.Template.Child() + list_vkd3d = Gtk.Template.Child() +@@ -66,7 +64,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + btn_bottles_path_reset = Gtk.Template.Child() + label_bottles_path = Gtk.Template.Child() + btn_steam_proton_doc = Gtk.Template.Child() +- pref_core = Gtk.Template.Child() + + # endregion + +@@ -170,10 +167,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + self.installers_stack.set_visible_child_name("installers_offline") + self.dlls_stack.set_visible_child_name("dlls_offline") + +- # populate components lists +- self.populate_runtimes_list() +- self.populate_winebridge_list() +- + RunAsync(self.ui_update) + + # connect signals +@@ -319,18 +312,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + list_component.add(_entry) + self.__registry.append(_entry) + +- def populate_runtimes_list(self): +- for runtime in self.manager.supported_runtimes.items(): +- self.list_runtimes.add( +- ComponentEntry(self.window, runtime, "runtime", is_upgradable=True) +- ) +- +- def populate_winebridge_list(self): +- for bridge in self.manager.supported_winebridge.items(): +- self.list_winebridge.add( +- ComponentEntry(self.window, bridge, "winebridge", is_upgradable=True) +- ) +- + def populate_dxvk_list(self): + self.__populate_component_list( + "dxvk", self.manager.supported_dxvk, self.list_dxvk