Merge pull request #135 from jitseniesen/dark

PR: Use appropriate colours when Spyder is in dark mode

Author: jitseniesen

spyder_unittest/unittestplugin.py

@@ -12,6 +12,7 @@
 from qtpy.QtWidgets import QVBoxLayout
 from spyder.api.plugins import SpyderPluginWidget
 from spyder.config.base import get_translation
+from spyder.config.gui import is_dark_interface
 from spyder.py3compat import getcwd
 from spyder.utils import icon_manager as ima
 from spyder.utils.qthelpers import create_action
@@ -175,6 +176,7 @@ def register_plugin(self):
         # Get information from Spyder proper into plugin
         self.update_pythonpath()
         self.update_default_wdir()
+        self.unittestwidget.use_dark_interface(is_dark_interface())
 
         # Connect to relevant signals
         self.main.sig_pythonpath_changed.connect(self.update_pythonpath)

spyder_unittest/widgets/datatree.py

@@ -34,6 +34,13 @@
     Category.PENDING: QBrush(QColor("#C5C5C5"))
 }
 
+COLORS_DARK = {
+    Category.OK: QBrush(QColor("#008000")),
+    Category.FAIL: QBrush(QColor("#C6001E")),
+    Category.SKIP: QBrush(QColor("#505050")),
+    Category.PENDING: QBrush(QColor("#505050"))
+}
+
 STATUS_COLUMN = 0
 NAME_COLUMN = 1
 MESSAGE_COLUMN = 2
@@ -188,6 +195,11 @@ class TestDataModel(QAbstractItemModel):
     a tuple (row, column, id). The id is TOPLEVEL_ID for top-level items.
     For level-2 items, the id is the index of the test in `self.testresults`.
 
+    Attributes
+    ----------
+    is_dark_interface : bool
+        Whether to use colours appropriate for a dark user interface.
+
     Signals
     -------
     sig_summary(str)
@@ -200,6 +212,7 @@ def __init__(self, parent=None):
         """Constructor."""
         QAbstractItemModel.__init__(self, parent)
         self.abbreviator = Abbreviator()
+        self.is_dark_interface = False
         self.testresults = []
         try:
             self.monospace_font = parent.window().editor.get_plugin_font()
@@ -319,7 +332,10 @@ def data(self, index, role):
         elif role == Qt.BackgroundRole:
             if id == TOPLEVEL_ID:
                 testresult = self.testresults[row]
-                return COLORS[testresult.category]
+                if self.is_dark_interface:
+                    return COLORS_DARK[testresult.category]
+                else:
+                    return COLORS[testresult.category]
         elif role == Qt.TextAlignmentRole:
             if id == TOPLEVEL_ID and column == TIME_COLUMN:
                 return Qt.AlignRight

spyder_unittest/widgets/tests/test_datatree.py

@@ -12,8 +12,8 @@
 
 # Local imports
 from spyder_unittest.backend.runnerbase import Category, TestResult
-from spyder_unittest.widgets.datatree import (COLORS, TestDataModel,
-                                              TestDataView)
+from spyder_unittest.widgets.datatree import (COLORS, COLORS_DARK,
+                                              TestDataModel, TestDataView)
 
 try:
     from unittest.mock import Mock
@@ -156,15 +156,19 @@ def test_testdatamodel_shows_time_when_blank(qtmodeltester):
     model.testresults = [res]
     assert model.data(model.index(0, 3), Qt.DisplayRole) == ''
 
-def test_testdatamodel_data_background():
+@pytest.mark.parametrize('dark', [False, True])
+def test_testdatamodel_data_background(dark):
     model = TestDataModel()
+    if dark:
+        model.is_dark_interface = True
     res = [TestResult(Category.OK, 'status', 'foo.bar'),
            TestResult(Category.FAIL, 'error', 'foo.bar', 'kadoom')]
     model.testresults = res
     index = model.index(0, 0)
-    assert model.data(index, Qt.BackgroundRole) == COLORS[Category.OK]
+    colors = COLORS_DARK if dark else COLORS
+    assert model.data(index, Qt.BackgroundRole) == colors[Category.OK]
     index = model.index(1, 2)
-    assert model.data(index, Qt.BackgroundRole) == COLORS[Category.FAIL]
+    assert model.data(index, Qt.BackgroundRole) == colors[Category.FAIL]
 
 def test_testdatamodel_data_userrole():
     model = TestDataModel()

spyder_unittest/widgets/unittestgui.py

@@ -88,6 +88,7 @@ def __init__(self, parent, options_button=None, options_menu=None):
         self.default_wdir = None
         self.pre_test_hook = None
         self.testrunner = None
+
         self.output = None
         self.testdataview = TestDataView(self)
         self.testdatamodel = TestDataModel(self)
@@ -146,6 +147,10 @@ def set_config_without_emit(self, new_config):
         """Set test configuration but do not emit any signal."""
         self._config = new_config
 
+    def use_dark_interface(self, flag):
+        """Set whether widget should use colours appropriate for dark UI."""
+        self.testdatamodel.is_dark_interface = flag
+
     def create_actions(self):
         """Create the actions for the unittest widget."""
         self.config_action = create_action(