Merge pull request #346 from ales-erjavec/optional-symbolic-icons

[ENH] Make symbolic icons optional

Author: janezd

i18n/si/msgs.jaml

@@ -223,11 +223,11 @@ resources.py:
         icons/default-widget.svg: false
         def `icon_glob`:
             _*: false
-        def `is_icon_glob`:
-            _*: false
+            -symbolic: false
         def `get`:
             .svg: false
             current-color-scheme: false
+            .*-symbolic\.\w+$: false
     def `load_styled_svg_icon`:
         icons/{name}: false
 application/aboutdialog.py:
@@ -2034,7 +2034,7 @@ document/schemeedit.py:
         def `__toggleNewTextAnnotation`:
             Canceled new text annotation: false
         def `__triggerNewTextAnnotation`:
-              text/markdown: false
+            text/markdown: false
         def `__onHelpAction`:
             help://search?: false
             id: false
@@ -2268,10 +2268,13 @@ gui/svgiconengine.py:
 .ColorScheme-Background {{
     color: {background};
 }}
+.ColorScheme-ViewBackground {{
+    color: {base};
+}}
 .ColorScheme-Highlight {{
     color: {highlight};
 }}
-.ColorScheme-Disabled-Text {{
+.ColorScheme-DisabledText {{
     color: {disabled_text};
 }}
 .ColorScheme-Contrast {{
@@ -2280,6 +2283,15 @@ gui/svgiconengine.py:
 .ColorScheme-Complement {{
     color: {complement};
 }}
+.ColorScheme-PositiveText {{
+    color:#27ae60;
+}}
+.ColorScheme-NeutralText {{
+    color:#f67400;
+}}
+.ColorScheme-NegativeText {{
+    color:#da4453;
+}}
 ': false
     def `replace_css_style`:
         current-color-scheme: false

orangecanvas/gui/svgiconengine.py

@@ -217,10 +217,13 @@ def clone(self) -> 'QIconEngine':
 .ColorScheme-Background {{
     color: {background};
 }}
+.ColorScheme-ViewBackground {{
+    color: {base};
+}}
 .ColorScheme-Highlight {{
     color: {highlight};
 }}
-.ColorScheme-Disabled-Text {{
+.ColorScheme-DisabledText {{
     color: {disabled_text};
 }}
 .ColorScheme-Contrast {{
@@ -229,6 +232,15 @@ def clone(self) -> 'QIconEngine':
 .ColorScheme-Complement {{
     color: {complement};
 }}
+.ColorScheme-PositiveText {{
+    color:#27ae60;
+}}
+.ColorScheme-NeutralText {{
+    color:#f67400;
+}}
+.ColorScheme-NegativeText {{
+    color:#da4453;
+}}
 """
 
 
@@ -252,13 +264,15 @@ def render_svg_color_scheme_css(palette: QPalette, state: QIcon.State) -> str:
     selected = state == QIcon.Selected
     text = QPalette.HighlightedText if selected else QPalette.WindowText
     background = QPalette.Highlight if selected else QPalette.Window
+    base = QPalette.Base
     hligh = QPalette.HighlightedText if selected else QPalette.Highlight
     lum = luminance(palette.color(background))
     complement = QColor(Qt.white) if lum > 0.5 else QColor(Qt.black)
     contrast = QColor(Qt.black) if lum > 0.5 else QColor(Qt.white)
     return TEMPLATE.format(
         text=_hexrgb_solid(palette.color(text), palette.color(background)),
         background=_hexrgb_solid(palette.color(background)),
+        base=_hexrgb_solid(palette.color(base)),
         highlight=_hexrgb_solid(palette.color(hligh)),
         disabled_text=_hexrgb_solid(palette.color(QPalette.Disabled, text),
                                     palette.color(QPalette.Disabled, background)),

orangecanvas/resources.py

@@ -5,6 +5,7 @@
 import os
 import glob
 import pkgutil
+import re
 from typing import Tuple, Dict, Optional, List, IO
 
 from AnyQt.QtCore import QObject
@@ -172,14 +173,13 @@ def match(self, path):
     def icon_glob(self, path):
         # type: (str) -> List[str]
         name, ext = os.path.splitext(path)
-        pattern = name + "_*" + ext
-        return glob.glob(pattern)
+        pattern1 = name + "_*" + ext
+        pattern2 = name + "-symbolic" + ext
+        return glob.glob(pattern1) + glob.glob(pattern2)
 
     def is_icon_glob(self, path):
         # type: (str) -> bool
-        name, ext = os.path.splitext(path)
-        pattern = name + "_*" + ext
-        return bool(glob.glob(pattern))
+        return bool(self.icon_glob(path))
 
     def get(self, name, default=None):
         # type: (str, Optional[str]) -> QIcon
@@ -218,7 +218,8 @@ def get(self, name, default=None):
             if cache_key not in self._icon_cache:
                 for path in icons:
                     icon.addFile(path)
-                icon = QIcon(SymbolIconEngine(icon))
+                if len(icons) == 1 and re.match(r".*-symbolic\.\w+$", icons[0]):
+                    icon = QIcon(SymbolIconEngine(icon))
                 self._icon_cache[cache_key] = icon
             else:
                 icon = self._icon_cache[cache_key]