Merge pull request #262 from juanis2112/new-color-roles

Change colors of qdarkstyle according to new ux palette
ColinDuquesnoy · Mar 24, 2021 · cf0146e · cf0146e
2 parents 1cea4be + a41d216
commit cf0146e
Show file tree

Hide file tree

Showing 5 changed files with 487 additions and 451 deletions.
diff --git a/qdarkstyle/__init__.py b/qdarkstyle/__init__.py
@@ -112,7 +112,7 @@ def _apply_os_patches():
             text-align: center;
             height: 12px;
         }}
-        '''.format(color=DarkPalette.COLOR_BACKGROUND_NORMAL)
+        '''.format(color=DarkPalette.COLOR_BACKGROUND_4)
 
     # Only open the QSS file if any patch is needed
     if os_fix:
@@ -160,7 +160,7 @@ def _apply_application_patches(QCoreApplication, QPalette, QColor):
     that moment for setting reasons.
     """
     # See issue #139
-    color = DarkPalette.COLOR_SELECTION_LIGHT
+    color = DarkPalette.COLOR_ACCENT_3
     qcolor = QColor(color)
 
     # Todo: check if it is qcoreapplication indeed

diff --git a/qdarkstyle/colorsystem.py b/qdarkstyle/colorsystem.py
@@ -3,18 +3,18 @@
 class Gray:
     B0 = '#000000'
     B10 = '#19232D'
-    B20 = '#262E38'
+    B20 = '#293544'
     B30 = '#37414F'
     B40 = '#455364'
     B50 = '#54687A'
     B60 = '#60798B'
     B70 = '#788D9C'
     B80 = '#9DA9B5'
-    B90 = '#CBCACA'
-    B100 = '#D9D8D8'
-    B110 = '#E1E1E1'
-    B120 = '#EEEEEE'
-    B130 = '#F5F5F5'
+    B90 = '#ACB1B6'
+    B100 = '#B9BDC1'
+    B110 = '#C9CDD0'
+    B120 = '#CED1D4'
+    B130 = '#E0E1E3'
     B140 = '#FAFAFA'
     B150 = '#FFFFFF'
 
@@ -30,9 +30,9 @@ class Blue:
     B70 = '#259AE9'
     B80 = '#37AEFE'
     B90 = '#73C7FF'
-    B100 = '#9FD9FF'
-    B110 = '#C2E3FA'
-    B120 = '#CEEBFF'
-    B130 = '#DAF0FF'
-    B140 = '#F5FBFF'
+    B100 = '#9FCBFF'
+    B110 = '#C2DFFA'
+    B120 = '#CEE8FF'
+    B130 = '#DAEDFF'
+    B140 = '#F5FAFF'
     B150 = '##FFFFFF'
diff --git a/qdarkstyle/darkpalette.py b/qdarkstyle/darkpalette.py
@@ -14,34 +14,41 @@ class DarkPalette(object):
     """Theme variables."""
 
     # Color
-    COLOR_BACKGROUND_LIGHT = Gray.B50
-    COLOR_BACKGROUND_NORMAL = Gray.B30
-    COLOR_BACKGROUND_DARK = Gray.B10
-
-    COLOR_FOREGROUND_LIGHT = Gray.B120
-    COLOR_FOREGROUND_NORMAL = Gray.B80
-    COLOR_FOREGROUND_DARK = Gray.B60
-
-    COLOR_SELECTION_LIGHT = Blue.B60
-    COLOR_SELECTION_NORMAL = Blue.B40
-    COLOR_SELECTION_DARK = Blue.B20
+    COLOR_BACKGROUND_1 = Gray.B10
+    COLOR_BACKGROUND_2 = Gray.B20
+    COLOR_BACKGROUND_3 = Gray.B30
+    COLOR_BACKGROUND_4 = Gray.B40
+    COLOR_BACKGROUND_5 = Gray.B50
+    COLOR_BACKGROUND_6 = Gray.B60
+
+    COLOR_TEXT_1 = Gray.B130
+    COLOR_TEXT_2 = Gray.B110
+    COLOR_TEXT_3 = Gray.B90
+    COLOR_TEXT_4 = Gray.B80
+
+    COLOR_ACCENT_1 = Blue.B20
+    COLOR_ACCENT_2 = Blue.B40
+    COLOR_ACCENT_3 = Blue.B50
+    COLOR_ACCENT_4 = Blue.B70
+    COLOR_ACCENT_5 = Blue.B80
 
     OPACITY_TOOLTIP = 230
 
     # Size
     SIZE_BORDER_RADIUS = '4px'
 
     # Borders
-    BORDER_LIGHT = '1px solid $COLOR_BACKGROUND_LIGHT'
-    BORDER_NORMAL = '1px solid $COLOR_BACKGROUND_NORMAL'
-    BORDER_DARK = '1px solid $COLOR_BACKGROUND_DARK'
+    BORDER_1 = '1px solid $COLOR_BACKGROUND_1'
+    BORDER_2 = '1px solid $COLOR_BACKGROUND_4'
+    BORDER_3 = '1px solid $COLOR_BACKGROUND_6'
+
+    BORDER_SELECTION_3 = '1px solid $COLOR_ACCENT_3'
+    BORDER_SELECTION_2 = '1px solid $COLOR_ACCENT_2'
+    BORDER_SELECTION_1 = '1px solid $COLOR_ACCENT_1'
 
-    BORDER_SELECTION_LIGHT = '1px solid $COLOR_SELECTION_LIGHT'
-    BORDER_SELECTION_NORMAL = '1px solid $COLOR_SELECTION_NORMAL'
-    BORDER_SELECTION_DARK = '1px solid $COLOR_SELECTION_DARK'
 
     # Example of additional widget specific variables
-    W_STATUS_BAR_BACKGROUND_COLOR = COLOR_SELECTION_DARK
+    W_STATUS_BAR_BACKGROUND_COLOR = COLOR_ACCENT_1
 
     # Paths
     PATH_RESOURCES = "':/qss_icons'"
@@ -50,23 +57,28 @@ class DarkPalette(object):
     def to_dict(cls, colors_only=False):
         """Convert variables to dictionary."""
         order = [
-            'COLOR_BACKGROUND_LIGHT',
-            'COLOR_BACKGROUND_NORMAL',
-            'COLOR_BACKGROUND_DARK',
-            'COLOR_FOREGROUND_LIGHT',
-            'COLOR_FOREGROUND_NORMAL',
-            'COLOR_FOREGROUND_DARK',
-            'COLOR_SELECTION_LIGHT',
-            'COLOR_SELECTION_NORMAL',
-            'COLOR_SELECTION_DARK',
+            'COLOR_BACKGROUND_6',
+            'COLOR_BACKGROUND_5',
+            'COLOR_BACKGROUND_4',
+            'COLOR_BACKGROUND_2',
+            'COLOR_BACKGROUND_3',
+            'COLOR_BACKGROUND_1',
+            'COLOR_TEXT_1',
+            'COLOR_TEXT_2',
+            'COLOR_TEXT_3',
+            'COLOR_TEXT_4',
+            'COLOR_ACCENT_1',
+            'COLOR_ACCENT_2',
+            'COLOR_ACCENT_3',
+            'COLOR_ACCENT_4',
             'OPACITY_TOOLTIP',
             'SIZE_BORDER_RADIUS',
-            'BORDER_LIGHT',
-            'BORDER_NORMAL',
-            'BORDER_DARK',
-            'BORDER_SELECTION_LIGHT',
-            'BORDER_SELECTION_NORMAL',
-            'BORDER_SELECTION_DARK',
+            'BORDER_1',
+            'BORDER_2',
+            'BORDER_3',
+            'BORDER_SELECTION_3',
+            'BORDER_SELECTION_2',
+            'BORDER_SELECTION_1',
             'W_STATUS_BAR_BACKGROUND_COLOR',
             'PATH_RESOURCES',
         ]