rename and reorder GTK3- and DE-specific theme options

re: #191
themix-project · Dec 24, 2018 · 84bfc41 · 84bfc41
1 parent 600c469
commit 84bfc41
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 31 deletions.
diff --git a/oomox_gui/theme_model.py b/oomox_gui/theme_model.py
@@ -203,23 +203,11 @@ def merge_theme_model_with_base(whole_theme_model, base_theme_model, plugin_mode
         'fallback_value': 2,
         'display_name': _('Roundness'),
     },
-    {
-        'key': 'SPACING',
-        'type': 'int',
-        'fallback_value': 3,
-        'display_name': _('(GTK3) Spacing'),
-    },
     {
         'key': 'GRADIENT',
         'type': 'float',
         'fallback_value': 0.0,
-        'display_name': _('(GTK3) Gradient'),
-    },
-    {
-        'key': 'GTK3_GENERATE_DARK',
-        'type': 'bool',
-        'fallback_value': True,
-        'display_name': _('(GTK3) Add Dark Variant'),
+        'display_name': _('Gradient'),
     },
 ]
 merge_theme_model_with_base(THEME_MODEL, BASE_THEME_MODEL_OPTIONS, 'options')

diff --git a/plugins/theme_arc/oomox_plugin.py b/plugins/theme_arc/oomox_plugin.py
@@ -154,24 +154,23 @@ class Plugin(OomoxThemePlugin):
     #     'ROUNDNESS',
     # ]
 
-    theme_model_gtk = [
+    theme_model_gtk = []
+
+    theme_model_options = [
         {
             'key': 'ARC_WIDGET_BORDER_COLOR',
             'fallback_function': lambda colors: mix_theme_colors(
                 colors['BTN_BG'], colors['BTN_FG'],
                 0.75
             ),
             'type': 'color',
-            'display_name': _('(GTK3) Widget Border Color'),
+            'display_name': _('GTK3 Widget Border Color'),
         },
-    ]
-
-    theme_model_options = [
         {
             'key': 'ARC_TRANSPARENCY',
             'type': 'bool',
             'fallback_value': True,
-            'display_name': _('(GTK3) Enable Theme Transparency'),
+            'display_name': _('Enable GTK3 Theme Transparency'),
         },
         # {
         #     'key': 'GTK3_GENERATE_DARK',

diff --git a/plugins/theme_oomox/oomox_plugin.py b/plugins/theme_oomox/oomox_plugin.py
@@ -100,29 +100,52 @@ class Plugin(OomoxThemePlugin):
     ]
 
     theme_model_options = [
+        {
+            'type': 'separator',
+            'display_name': _('GTK3 Theme Options'),
+            'value_filter': {
+                'THEME_STYLE': 'oomox',
+            },
+        },
+        {
+            'key': 'SPACING',
+            'type': 'int',
+            'fallback_value': 3,
+            'display_name': _('Spacing'),
+        },
         {
             'key': 'OUTLINE_WIDTH',
             'type': 'int',
             'fallback_value': 1,
-            'display_name': _('(GTK3) Focused Outline Width'),
+            'display_name': _('Focused Outline Width'),
         },
         {
             'key': 'BTN_OUTLINE_WIDTH',
             'type': 'int',
             'fallback_value': 1,
-            'display_name': _('(GTK3) Focused Button Outline Width'),
+            'display_name': _('Focused Button Outline Width'),
         },
         {
             'key': 'BTN_OUTLINE_OFFSET',
             'type': 'int',
             'fallback_value': -3,
             'min_value': -20,
-            'display_name': _('(GTK3) Focused Button Outline Offset'),
+            'display_name': _('Focused Button Outline Offset'),
+        },
+        {
+            'key': 'GTK3_GENERATE_DARK',
+            'type': 'bool',
+            'fallback_value': True,
+            'display_name': _('Add Dark Variant'),
+        },
+
+        {
+            'type': 'separator',
+            'display_name': _('Text Input Caret'),
+            'value_filter': {
+                'THEME_STYLE': 'oomox',
+            },
         },
-        # {  @TODO: implement value_filter for separators
-        #     'type': 'separator',
-        #     'display_name': _('Text Input Caret'),
-        # },
         {
             'key': 'CARET1_FG',
             'type': 'color',
@@ -141,18 +164,28 @@ class Plugin(OomoxThemePlugin):
             'fallback_value': 0.04,  # GTK's default
             'display_name': _('Caret Aspect Ratio'),
         },
+        # ]
+
+        # theme_model_extra = [
         {
-            'key': 'UNITY_DEFAULT_LAUNCHER_STYLE',
-            'type': 'bool',
-            'fallback_value': False,
-            'display_name': _('(Unity) Use Default Launcher Style'),
+            'type': 'separator',
+            'display_name': _('Desktop Environments'),
+            'value_filter': {
+                'THEME_STYLE': 'oomox',
+            },
         },
         {
             'key': 'CINNAMON_OPACITY',
             'type': 'float',
             'fallback_value': 1.0,
             'max_value': 1.0,
-            'display_name': _('(Cinnamon) Opacity'),
+            'display_name': _('Cinnamon: Opacity'),
+        },
+        {
+            'key': 'UNITY_DEFAULT_LAUNCHER_STYLE',
+            'type': 'bool',
+            'fallback_value': False,
+            'display_name': _('Unity: Use Default Launcher Style'),
         },
     ]