meh

Author: TheEvilSkeleton

bottles/frontend/bottle_details_page.py

@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import os
 import uuid
 from datetime import datetime
 from gettext import gettext as _
@@ -98,7 +99,6 @@ def __init__(self, details, config, **kwargs):
 
         # common variables and references
         self.window = details.window
-        self.manager = details.window.manager
         self.stack_bottle = details.stack_bottle
         self.leaflet = details.leaflet
         self.details = details
@@ -209,8 +209,10 @@ def set_config(self, config: BottleConfig):
         self.grid_versioning.set_visible(self.config.Versioning)
         self.label_state.set_text(str(self.config.State))
 
+        app = self.window.get_application()
+
         if (
-            config.Runner not in self.manager.runners_available
+            config.Runner not in os.listdir(os.path.join(app.bottles_data_dir, "runners"))
             and not self.config.Environment == "Steam"
         ):
             self.__alert_missing_runner()

bottles/frontend/bottle_details_view.py

@@ -71,7 +71,7 @@ def __init__(self, window, config: BottleConfig | None = None, **kwargs):
 
         self.view_bottle = BottleDetailsPage(self, config)
         self.view_dependencies = DetailsDependenciesView(self, config)
-        self.view_preferences = DetailsPreferencesPage(self, config)
+        self.view_preferences = DetailsPreferencesPage()
         self.view_taskmanager = DetailsTaskManagerView(self, config)
 
         self.btn_back.connect("clicked", self.go_back)

bottles/frontend/details_preferences_page.py

@@ -120,13 +120,10 @@ class DetailsPreferencesPage(Adw.PreferencesPage):
 
     # endregion
 
-    def __init__(self, details, config, **kwargs):
+    def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        # common variables and references
-        self.window = details.window
-        self.config = config
-        self.details = details
+        self.window = GtkUtils.get_parent_window()
 
         if not gamemode_available or not Xdp.Portal.running_under_sandbox():
             return
@@ -336,19 +333,20 @@ def update_combo_components(self):
         self.str_list_dxvk.append("Disabled")
         self.str_list_vkd3d.append("Disabled")
         self.str_list_latencyflex.append("Disabled")
-        for index, dxvk in enumerate(self.manager.dxvk_available):
+        app = self.window.get_application()
+        for index, dxvk in enumerate(os.path.join(app.bottles_data_dir, "dxvk")):
             self.str_list_dxvk.append(dxvk)
 
-        for index, vkd3d in enumerate(self.manager.vkd3d_available):
+        for index, vkd3d in enumerate(os.path.join(app.bottles_data_dir, "vkd3d")):
             self.str_list_vkd3d.append(vkd3d)
 
-        for index, runner in enumerate(self.manager.runners_available):
+        for index, runner in enumerate(os.path.join(app.bottles_data_dir, "runners")):
             self.str_list_runner.append(runner)
 
-        for index, nvapi in enumerate(self.manager.nvapi_available):
+        for index, nvapi in enumerate(os.path.join(app.bottles_data_dir, "nvapi")):
             self.str_list_nvapi.append(nvapi)
 
-        for index, latencyflex in enumerate(self.manager.latencyflex_available):
+        for index, latencyflex in enumerate(os.path.join(app.bottles_data_dir, "latencyflex")):
             self.str_list_latencyflex.append(latencyflex)
 
         for lang in ManagerUtils.get_languages():

bottles/frontend/main.py

@@ -49,7 +49,8 @@ class Bottles(Adw.Application):
     arg_bottle = None
     dark_provider = None
     local_bottles: dict[str, BottleConfig] = {}
-    bottles_config_dir = os.path.join(GLib.get_user_data_dir(), "bottles", "bottles")
+    bottles_data_dir = os.path.join(GLib.get_user_data_dir(), "bottles")
+    bottles_config_dir = os.path.join(bottles_data_dir, "bottles")
 
     def __init__(self):
         super().__init__(