Merge pull request slgobinath#744 from deltragon/ui-misc-fixes

settings: small ui fixes

Author: deltragon

safeeyes/ui/settings_dialog.py

@@ -288,7 +288,7 @@ def __create_plugin_item(self, plugin_config):
 
     def __show_plugins_properties_dialog(self, plugin_config):
         """Show the PluginProperties dialog."""
-        dialog = PluginSettingsDialog(self.application, plugin_config)
+        dialog = PluginSettingsDialog(self.window, plugin_config)
         dialog.show()
 
     def __disable_errored_plugin(self, button, plugin_config):
@@ -301,7 +301,7 @@ def __show_break_properties_dialog(
     ):
         """Show the BreakProperties dialog."""
         dialog = BreakSettingsDialog(
-            self.application,
+            self.window,
             break_config,
             is_short,
             parent,
@@ -355,7 +355,7 @@ def on_info_bar_long_break_close(self, infobar, *user_data):
     def add_break(self, button) -> None:
         """Event handler for add break button."""
         dialog = NewBreakDialog(
-            self.application,
+            self.window,
             self.config,
             lambda is_short, break_config: self.__create_break_item(
                 break_config, is_short
@@ -406,13 +406,13 @@ def on_window_delete(self, *args):
 class PluginSettingsDialog:
     """Builds a settings dialog based on the configuration of a plugin."""
 
-    def __init__(self, application, config):
+    def __init__(self, parent, config):
         self.config = config
         self.property_controls = []
 
         builder = utility.create_gtk_builder(SETTINGS_DIALOG_PLUGIN_GLADE)
         self.window = builder.get_object("dialog_settings_plugin")
-        self.window.set_application(application)
+        self.window.set_transient_for(parent)
         box_settings = builder.get_object("box_settings")
         self.window.set_title(_("Plugin Settings"))
         for setting in config.get("settings"):
@@ -421,21 +421,21 @@ def __init__(self, application, config):
                     self.__load_int_item(
                         setting["label"],
                         setting["id"],
-                        setting["safeeyes_config"],
+                        config["active_plugin_config"],
                         setting.get("min", 0),
                         setting.get("max", 120),
                     )
                 )
             elif setting["type"].upper() == "TEXT":
                 box_settings.append(
                     self.__load_text_item(
-                        setting["label"], setting["id"], setting["safeeyes_config"]
+                        setting["label"], setting["id"], config["active_plugin_config"]
                     )
                 )
             elif setting["type"].upper() == "BOOL":
                 box_settings.append(
                     self.__load_bool_item(
-                        setting["label"], setting["id"], setting["safeeyes_config"]
+                        setting["label"], setting["id"], config["active_plugin_config"]
                     )
                 )
 
@@ -450,9 +450,7 @@ def __load_int_item(self, name, key, settings, min_value, max_value):
         spin_value.set_value(settings[key])
         box = builder.get_object("box")
         box.set_visible(True)
-        self.property_controls.append(
-            {"key": key, "settings": settings, "value": spin_value.get_value}
-        )
+        self.property_controls.append({"key": key, "value": spin_value.get_value})
         return box
 
     def __load_text_item(self, name, key, settings):
@@ -463,9 +461,7 @@ def __load_text_item(self, name, key, settings):
         txt_value.set_text(settings[key])
         box = builder.get_object("box")
         box.set_visible(True)
-        self.property_controls.append(
-            {"key": key, "settings": settings, "value": txt_value.get_text}
-        )
+        self.property_controls.append({"key": key, "value": txt_value.get_text})
         return box
 
     def __load_bool_item(self, name, key, settings):
@@ -476,17 +472,15 @@ def __load_bool_item(self, name, key, settings):
         switch_value.set_active(settings[key])
         box = builder.get_object("box")
         box.set_visible(True)
-        self.property_controls.append(
-            {"key": key, "settings": settings, "value": switch_value.get_active}
-        )
+        self.property_controls.append({"key": key, "value": switch_value.get_active})
         return box
 
     def on_window_delete(self, *args):
         """Event handler for Properties dialog close action."""
         for property_control in self.property_controls:
-            property_control["settings"][property_control["key"]] = property_control[
-                "value"
-            ]()
+            self.config["active_plugin_config"][property_control["key"]] = (
+                property_control["value"]()
+            )
         self.window.destroy()
 
     def show(self):
@@ -499,7 +493,7 @@ class BreakSettingsDialog:
 
     def __init__(
         self,
-        application,
+        parent,
         break_config,
         is_short,
         parent_config,
@@ -518,7 +512,7 @@ def __init__(
 
         builder = utility.create_gtk_builder(SETTINGS_DIALOG_BREAK_GLADE)
         self.window = builder.get_object("dialog_settings_break")
-        self.window.set_application(application)
+        self.window.set_transient_for(parent)
         self.txt_break = builder.get_object("txt_break")
         self.switch_override_interval = builder.get_object("switch_override_interval")
         self.switch_override_duration = builder.get_object("switch_override_duration")
@@ -698,13 +692,13 @@ def show(self):
 class NewBreakDialog:
     """Builds a new break dialog."""
 
-    def __init__(self, application, parent_config, on_add):
+    def __init__(self, parent, parent_config, on_add):
         self.parent_config = parent_config
         self.on_add = on_add
 
         builder = utility.create_gtk_builder(SETTINGS_DIALOG_NEW_BREAK_GLADE)
         self.window = builder.get_object("dialog_new_break")
-        self.window.set_application(application)
+        self.window.set_transient_for(parent)
         self.txt_break = builder.get_object("txt_break")
         self.cmb_type = builder.get_object("cmb_type")
         list_types = builder.get_object("lst_break_types")

safeeyes/utility.py

@@ -259,8 +259,8 @@ def load_plugins_config(safeeyes_config):
         config["id"] = plugin["id"]
         config["icon"] = icon
         config["enabled"] = plugin["enabled"]
-        for setting in config["settings"]:
-            setting["safeeyes_config"] = plugin["settings"]
+        config["active_plugin_config"] = plugin.get("settings")
+
         configs.append(config)
     return configs