Merge pull request #65 from loathingKernel/colors

Simplify color scheme format
2024-09-29 17:02:20 +13:00 · 2021-05-22 17:25:50 +02:00 · 2021-05-22 17:25:50 +02:00 · e2ffc689a1
commit e2ffc689a1
parent e457be024d 6686a5ddc6
11 changed files with 248 additions and 190 deletions
--- a/rare/styles/colors/Adapta-Nokto.scheme
+++ b/rare/styles/colors/Adapta-Nokto.scheme
@ -0,0 +1,25 @@
+[ColorScheme]
+Active\AlternateBase=#ff273339
+Active\Base=#ff2f3d44
+Active\BrightText=#ffffffff
+Active\Button=#ff263238
+Active\ButtonText=#ffb9c3c7
+Active\Dark=#ff1f292e
+Active\Highlight=#ff00bcd4
+Active\HighlightedText=#ffffffff
+Active\Light=#ff2f3e46
+Active\Link=#ff0000ff
+Active\LinkVisited=#ffff00ff
+Active\Mid=#ffb8b5b2
+Active\Midlight=#ffcbc7c4
+Active\PlaceholderText=#80b9c3c7
+Active\Shadow=#ff1d262b
+Active\Text=#ffb9c3c7
+Active\ToolTipBase=#ff263238
+Active\ToolTipText=#ffcfd8dc
+Active\Window=#ff263238
+Active\WindowText=#ffb9c3c7
+Disabled\ButtonText=#ff808080
+Disabled\HighlightedText=#ff808080
+Disabled\Text=#ff808080
+Disabled\WindowText=#ff808080
--- a/rare/styles/colors/Airy.scheme
+++ b/rare/styles/colors/Airy.scheme
@ -0,0 +1,39 @@
+[ColorScheme]
+Active\AlternateBase=#ff5c5b5a
+Active\Base=#ffc8c8c8
+Active\BrightText=#ff0a0a0a
+Active\Button=#ffdcdcdc
+Active\ButtonText=#ff0a0a0a
+Active\Dark=#ff646464
+Active\Highlight=#ff0986d3
+Active\HighlightedText=#ff0a0a0a
+Active\Light=#ffdcdcdc
+Active\Link=#ff0986d3
+Active\LinkVisited=#ffa70b06
+Active\Mid=#ffe1e1e1
+Active\Midlight=#ff5e5c5b
+Active\PlaceholderText=#80000000
+Active\Shadow=#ffe7e4e0
+Active\Text=#ff000000
+Active\ToolTipBase=#ff646464
+Active\ToolTipText=#ff050505
+Active\Window=#ffffffff
+Active\WindowText=#ff000000
+Disabled\Base=#ff969696
+Disabled\BrightText=#ffffffff
+Disabled\Button=#ff424245
+Disabled\ButtonText=#ff808080
+Disabled\HighlightedText=#ff808080
+Disabled\Text=#ff808080
+Disabled\ToolTipText=#ffffffff
+Disabled\Window=#ffc8c8c8
+Disabled\WindowText=#ffffffff
+Inactive\Base=#ff969696
+Inactive\BrightText=#ff323232
+Inactive\Button=#ffb4b4b4
+Inactive\ButtonText=#ff323232
+Inactive\HighlightedText=#ff323232
+Inactive\Text=#ff323232
+Inactive\ToolTipText=#ff323232
+Inactive\Window=#ffc8c8c8
+Inactive\WindowText=#ff323232
--- a/rare/styles/colors/Arc-Dark.scheme
+++ b/rare/styles/colors/Arc-Dark.scheme
@ -0,0 +1,26 @@
+[ColorScheme]
+Active\AlternateBase=#ff3f4350
+Active\Base=#ff404552
+Active\BrightText=#ffffffff
+Active\Button=#ff383c4a
+Active\ButtonText=#ffd3dae3
+Active\Dark=#ff2e323d
+Active\Highlight=#ff5294e2
+Active\HighlightedText=#ffffffff
+Active\Light=#ff464b5c
+Active\Link=#ff0000ff
+Active\LinkVisited=#ffff00ff
+Active\Mid=#ffa0a0a4
+Active\Midlight=#ffe9e7e3
+Active\PlaceholderText=#80d3dae3
+Active\Shadow=#ff2b2e39
+Active\Text=#ffd3dae3
+Active\ToolTipBase=#ffffffdc
+Active\ToolTipText=#ffd3dae3
+Active\Window=#ff383c4a
+Active\WindowText=#ffd3dae3
+Disabled\ButtonText=#ff858b96
+Disabled\Highlight=#ffe2e2e2
+Disabled\Text=#ff858b96
+Disabled\WindowText=#ff858b96
+Inactive\Highlight=#ff4084d6
--- a/rare/styles/colors/Arc-Darker.scheme
+++ b/rare/styles/colors/Arc-Darker.scheme
@ -0,0 +1,26 @@
+[ColorScheme]
+Active\AlternateBase=#fffafafa
+Active\Base=#ffffffff
+Active\BrightText=#ffffffff
+Active\Button=#fff5f6f7
+Active\ButtonText=#ff5c616c
+Active\Dark=#ffcccdce
+Active\Highlight=#ff5294e2
+Active\HighlightedText=#ffffffff
+Active\Light=#ffffffff
+Active\Link=#ff0000ff
+Active\LinkVisited=#ffff00ff
+Active\Mid=#ffa0a0a4
+Active\Midlight=#ffe9e7e3
+Active\PlaceholderText=#805c616c
+Active\Shadow=#ffbdbdbe
+Active\Text=#ff5c616c
+Active\ToolTipBase=#ffffffdc
+Active\ToolTipText=#ff5c616c
+Active\Window=#fff5f6f7
+Active\WindowText=#ff5c616c
+Disabled\ButtonText=#ffa8abb1
+Disabled\Highlight=#ffe2e2e2
+Disabled\Text=#ffa8abb1
+Disabled\WindowText=#ffa8abb1
+Inactive\Highlight=#ff4084d6
--- a/rare/styles/colors/Darker.scheme
+++ b/rare/styles/colors/Darker.scheme
@ -0,0 +1,25 @@
+[ColorScheme]
+Active\AlternateBase=#ff5c5b5a
+Active\Base=#ff3d3d3d
+Active\BrightText=#ffffffff
+Active\Button=#ff424245
+Active\ButtonText=#ffffffff
+Active\Dark=#ff302f2e
+Active\Highlight=#ff12608a
+Active\HighlightedText=#fff9f9f9
+Active\Light=#ff979797
+Active\Link=#ff0986d3
+Active\LinkVisited=#ffa70b06
+Active\Mid=#ff4a4947
+Active\Midlight=#ff5e5c5b
+Active\PlaceholderText=#80ffffff
+Active\Shadow=#ffe7e4e0
+Active\Text=#ffffffff
+Active\ToolTipBase=#ff3f3f36
+Active\ToolTipText=#ffffffff
+Active\Window=#ff222020
+Active\WindowText=#ffffffff
+Disabled\ButtonText=#ff808080
+Disabled\HighlightedText=#ff808080
+Disabled\Text=#ff808080
+Disabled\WindowText=#ff808080
--- a/rare/styles/colors/Dusk.scheme
+++ b/rare/styles/colors/Dusk.scheme
@ -0,0 +1,26 @@
+[ColorScheme]
+Active\AlternateBase=#ff7f7f7f
+Active\Base=#ff7f7f7f
+Active\BrightText=#ffffffff
+Active\Button=#ff7f7f7f
+Active\ButtonText=#ff000000
+Active\Dark=#ff7f7f7f
+Active\Highlight=#ff308cc6
+Active\HighlightedText=#ffffffff
+Active\Light=#ffffffff
+Active\Link=#ff0000ff
+Active\LinkVisited=#ffff00ff
+Active\Mid=#ffb8b5b2
+Active\Midlight=#ffcbc7c4
+Active\PlaceholderText=#80000000
+Active\Shadow=#ff707070
+Active\Text=#ff000000
+Active\ToolTipBase=#ff7f7f7f
+Active\ToolTipText=#ff000000
+Active\Window=#ff7f7f7f
+Active\WindowText=#ff000000
+Disabled\ButtonText=#ffbebebe
+Disabled\Highlight=#ff7f7f7f
+Disabled\Shadow=#ffb1aeab
+Disabled\Text=#ffbebebe
+Disabled\WindowText=#ffbebebe
--- a/rare/styles/colors/Numix-Dark.scheme
+++ b/rare/styles/colors/Numix-Dark.scheme
@ -1,61 +1,25 @@
 [ColorScheme]
-Active\AlternateBase=#2f2f2f
-Active\Base=#333333
-Active\BrightText=#ffffff
-Active\Button=#525252
-Active\ButtonText=#dddddd
-Active\Dark=#333333
-Active\Highlight=#f0544c
-Active\HighlightedText=#ffffff
-Active\Light=#555555
-Active\Link=#fc6f5d
-Active\LinkVisited=#853931
-Active\Mid=#a0a0a4
-Active\Midlight=#e9e7e3
-Active\PlaceholderText=#eeeeee
-Active\Shadow=#343434
-Active\Text=#eeeeee
-Active\ToolTipBase=#444444
-Active\ToolTipText=#eeeeee
-Active\Window=#444444
-Active\WindowText=#dddddd
-Disabled\AlternateBase=#2f2f2f
-Disabled\Base=#333333
-Disabled\BrightText=#ffffff
-Disabled\Button=#525252
-Disabled\ButtonText=#808080
-Disabled\Dark=#333333
-Disabled\Highlight=#f0544c
-Disabled\HighlightedText=#808080
-Disabled\Light=#555555
-Disabled\Link=#fc6f5d
-Disabled\LinkVisited=#853931
-Disabled\Mid=#a0a0a4
-Disabled\Midlight=#e9e7e3
-Disabled\PlaceholderText=#eeeeee
-Disabled\Shadow=#343434
-Disabled\Text=#808080
-Disabled\ToolTipBase=#444444
-Disabled\ToolTipText=#eeeeee
-Disabled\Window=#444444
-Disabled\WindowText=#808080
-Inactive\AlternateBase=#2f2f2f
-Inactive\Base=#333333
-Inactive\BrightText=#ffffff
-Inactive\Button=#525252
-Inactive\ButtonText=#dddddd
-Inactive\Dark=#333333
-Inactive\Highlight=#f0544c
-Inactive\HighlightedText=#ffffff
-Inactive\Light=#555555
-Inactive\Link=#fc6f5d
-Inactive\LinkVisited=#853931
-Inactive\Mid=#a0a0a4
-Inactive\Midlight=#e9e7e3
-Inactive\PlaceholderText=#eeeeee
-Inactive\Shadow=#343434
-Inactive\Text=#eeeeee
-Inactive\ToolTipBase=#444444
-Inactive\ToolTipText=#eeeeee
-Inactive\Window=#444444
-Inactive\WindowText=#dddddd
+Active\AlternateBase=#ff2f2f2f
+Active\Base=#ff333333
+Active\BrightText=#ffffffff
+Active\Button=#ff525252
+Active\ButtonText=#ffdddddd
+Active\Dark=#ff333333
+Active\Highlight=#fff0544c
+Active\HighlightedText=#ffffffff
+Active\Light=#ff555555
+Active\Link=#fffc6f5d
+Active\LinkVisited=#ff853931
+Active\Mid=#ffa0a0a4
+Active\Midlight=#ffe9e7e3
+Active\PlaceholderText=#80eeeeee
+Active\Shadow=#ff343434
+Active\Text=#ffeeeeee
+Active\ToolTipBase=#ff444444
+Active\ToolTipText=#ffeeeeee
+Active\Window=#ff444444
+Active\WindowText=#ffdddddd
+Disabled\ButtonText=#ff808080
+Disabled\HighlightedText=#ff808080
+Disabled\Text=#ff808080
+Disabled\WindowText=#ff808080
--- a/rare/styles/colors/Rare.scheme
+++ b/rare/styles/colors/Rare.scheme
@ -1,61 +1,25 @@
 [ColorScheme]
-Active\AlternateBase=#f7f7f7
-Active\Base=#333344
-Active\BrightText=#ffffff
-Active\Button=#3c3f41
-Active\ButtonText=#eeeeee
-Active\Dark=#9f0910
-Active\Highlight=#2f4f4f
-Active\HighlightedText=#eeeeee
-Active\Light=#ffffff
-Active\Link=#0000ff
-Active\LinkVisited=#ff00ff
-Active\Mid=#b80e35
-Active\Midlight=#ca0651
-Active\PlaceholderText=#eeeeee
-Active\Shadow=#767676
-Active\Text=#eeeeee
-Active\ToolTipBase=#ffffdc
-Active\ToolTipText=#eeeeee
-Active\Window=#202225
-Active\WindowText=#eeeeee
-Disabled\AlternateBase=#f7f7f7
-Disabled\Base=#333344
-Disabled\BrightText=#ffffff
-Disabled\Button=#3c3f41
-Disabled\ButtonText=#808080
-Disabled\Dark=#9f0910
-Disabled\Highlight=#2f4f4f
-Disabled\HighlightedText=#808080
-Disabled\Light=#ffffff
-Disabled\Link=#0000ff
-Disabled\LinkVisited=#ff00ff
-Disabled\Mid=#b80e35
-Disabled\Midlight=#ca0651
-Disabled\PlaceholderText=#eeeeee
-Disabled\Shadow=#767676
-Disabled\Text=#808080
-Disabled\ToolTipBase=#ffffdc
-Disabled\ToolTipText=#eeeeee
-Disabled\Window=#202225
-Disabled\WindowText=#808080
-Inactive\AlternateBase=#f7f7f7
-Inactive\Base=#333344
-Inactive\BrightText=#ffffff
-Inactive\Button=#3c3f41
-Inactive\ButtonText=#eeeeee
-Inactive\Dark=#9f0910
-Inactive\Highlight=#2f4f4f
-Inactive\HighlightedText=#eeeeee
-Inactive\Light=#ffffff
-Inactive\Link=#0000ff
-Inactive\LinkVisited=#ff00ff
-Inactive\Mid=#b80e35
-Inactive\Midlight=#ca0651
-Inactive\PlaceholderText=#eeeeee
-Inactive\Shadow=#767676
-Inactive\Text=#eeeeee
-Inactive\ToolTipBase=#ffffdc
-Inactive\ToolTipText=#eeeeee
-Inactive\Window=#202225
-Inactive\WindowText=#eeeeee
+Active\AlternateBase=#fff7f7f7
+Active\Base=#ff333344
+Active\BrightText=#ffffffff
+Active\Button=#ff3c3f41
+Active\ButtonText=#ffeeeeee
+Active\Dark=#ff9f0910
+Active\Highlight=#ff2f4f4f
+Active\HighlightedText=#ffeeeeee
+Active\Light=#ffffffff
+Active\Link=#ff0000ff
+Active\LinkVisited=#ffff00ff
+Active\Mid=#ffb80e35
+Active\Midlight=#ffca0651
+Active\PlaceholderText=#80eeeeee
+Active\Shadow=#ff767676
+Active\Text=#ffeeeeee
+Active\ToolTipBase=#ffffffdc
+Active\ToolTipText=#ffeeeeee
+Active\Window=#ff202225
+Active\WindowText=#ffeeeeee
+Disabled\ButtonText=#ff808080
+Disabled\HighlightedText=#ff808080
+Disabled\Text=#ff808080
+Disabled\WindowText=#ff808080
--- a/rare/styles/colors/Zukitre.scheme
+++ b/rare/styles/colors/Zukitre.scheme
@ -0,0 +1,25 @@
+[ColorScheme]
+Active\AlternateBase=#fff7f7f7
+Active\Base=#fff7f7f7
+Active\BrightText=#ffffffff
+Active\Button=#ffd6d6d6
+Active\ButtonText=#ff2c2c2c
+Active\Dark=#ffb3b3b3
+Active\Highlight=#ff258ef8
+Active\HighlightedText=#ffffffff
+Active\Light=#ffffffff
+Active\Link=#ff0000ff
+Active\LinkVisited=#ffff00ff
+Active\Mid=#ffa0a0a4
+Active\Midlight=#ffe9e7e3
+Active\PlaceholderText=#802c2c2c
+Active\Shadow=#ffa5a5a5
+Active\Text=#ff2c2c2c
+Active\ToolTipBase=#ffffffdc
+Active\ToolTipText=#ff000000
+Active\Window=#ffd6d6d6
+Active\WindowText=#ff2c2c2c
+Disabled\ButtonText=#ff808080
+Disabled\HighlightedText=#ff808080
+Disabled\Text=#ff808080
+Disabled\WindowText=#ff808080
--- a/rare/styles/colors/ia_ora.scheme
+++ b/rare/styles/colors/ia_ora.scheme
@ -1,61 +0,0 @@
-[ColorScheme]
-Active\AlternateBase=#eff3f7
-Active\Base=#eff3f7
-Active\BrightText=#ffffff
-Active\Button=#eff3f7
-Active\ButtonText=#000000
-Active\Dark=#c7cbce
-Active\Highlight=#4965ae
-Active\HighlightedText=#ffffff
-Active\Light=#ffffff
-Active\Link=#0000ff
-Active\LinkVisited=#ff00ff
-Active\Mid=#a0a0a4
-Active\Midlight=#e9e7e3
-Active\PlaceholderText=#000000
-Active\Shadow=#b8bbbe
-Active\Text=#000000
-Active\ToolTipBase=#ffffdc
-Active\ToolTipText=#000000
-Active\Window=#eff3f7
-Active\WindowText=#000000
-Disabled\AlternateBase=#eff3f7
-Disabled\Base=#eff3f7
-Disabled\BrightText=#ffffff
-Disabled\Button=#eff3f7
-Disabled\ButtonText=#808080
-Disabled\Dark=#c7cbce
-Disabled\Highlight=#4965ae
-Disabled\HighlightedText=#808080
-Disabled\Light=#ffffff
-Disabled\Link=#0000ff
-Disabled\LinkVisited=#ff00ff
-Disabled\Mid=#a0a0a4
-Disabled\Midlight=#e9e7e3
-Disabled\PlaceholderText=#000000
-Disabled\Shadow=#b8bbbe
-Disabled\Text=#808080
-Disabled\ToolTipBase=#ffffdc
-Disabled\ToolTipText=#000000
-Disabled\Window=#eff3f7
-Disabled\WindowText=#808080
-Inactive\AlternateBase=#eff3f7
-Inactive\Base=#eff3f7
-Inactive\BrightText=#ffffff
-Inactive\Button=#eff3f7
-Inactive\ButtonText=#000000
-Inactive\Dark=#c7cbce
-Inactive\Highlight=#4965ae
-Inactive\HighlightedText=#ffffff
-Inactive\Light=#ffffff
-Inactive\Link=#0000ff
-Inactive\LinkVisited=#ff00ff
-Inactive\Mid=#a0a0a4
-Inactive\Midlight=#e9e7e3
-Inactive\PlaceholderText=#000000
-Inactive\Shadow=#b8bbbe
-Inactive\Text=#000000
-Inactive\ToolTipBase=#ffffdc
-Inactive\ToolTipText=#000000
-Inactive\Window=#eff3f7
-Inactive\WindowText=#000000
--- a/rare/utils/utils.py
+++ b/rare/utils/utils.py
@ -157,7 +157,7 @@ color_group_map = {


 def load_color_scheme(path: str):
-    custom_palette = QPalette()
+    palette = QPalette()
    settings = QSettings(path, QSettings.IniFormat)
    try:
        settings.beginGroup("ColorScheme")
@ -166,17 +166,16 @@ def load_color_scheme(path: str):
            group = QPalette.ColorGroup(g)
            for r in color_role_map:
                role = QPalette.ColorRole(r)
-                custom_palette.setColor(group, role, QColor(settings.value(color_role_map[r])))
+                color = settings.value(color_role_map[r], None)
+                if color is not None:
+                    palette.setColor(group, role, QColor(color))
+                else:
+                    palette.setColor(group, role, palette.color(QPalette.Active, role))
            settings.endGroup()
        settings.endGroup()
-        text_color = custom_palette.text().color()
-        text_color.setAlpha(128)
-        custom_palette.setColor(custom_palette.Active, custom_palette.PlaceholderText, text_color)
-        custom_palette.setColor(custom_palette.Inactive, custom_palette.PlaceholderText, text_color)
-        custom_palette.setColor(custom_palette.Disabled, custom_palette.PlaceholderText, text_color)
    except:
-        custom_palette = None
-    return custom_palette
+        palette = None
+    return palette


 def get_color_schemes():