[gui] Use an sleeping symbol instead of ok in table

IceflowRE · Jan 9, 2021 · e12310b · e12310b
1 parent bd7bc27
commit e12310b
Show file tree

Hide file tree

Showing 6 changed files with 239 additions and 8 deletions.
diff --git a/mp3monitoring/core/job.py b/mp3monitoring/core/job.py
@@ -76,7 +76,7 @@ def __run(self):
         """
         self._active = True
         while True:
-            self.status = 'search'
+            self.status = 'searching'
             cur_check: float = time.time()
             mp3_files: List[Path] = []
             if self.config.recursive:
@@ -103,7 +103,7 @@ def __run(self):
 
             self.config.last_check = cur_check
             if not self._sleep_event.is_set():
-                self.status = 'ok'
+                self.status = 'sleeping'
             if self._sleep_event.wait(self.config.sleep_time):
                 self._sleep_event.clear()
                 self._active = False

diff --git a/mp3monitoring/gui/monitor_table_model.py b/mp3monitoring/gui/monitor_table_model.py
@@ -16,12 +16,11 @@ def __init__(self, parent):
 
     def paint(self, painter, option, index):
         str_to_symbol = {
-            "error": pkg_data.ERROR_SYMBOL,
-            "ok": pkg_data.OK_SYMBOL,
-            "search": pkg_data.SEARCH_SYMBOL,
-            "stopped": pkg_data.STOPPED_SYMBOL,
-            "wait": pkg_data.WAIT_SYMBOL,
-            "stopping": pkg_data.WAIT_SYMBOL,
+            'error': pkg_data.ERROR_SYMBOL,
+            'sleeping': pkg_data.SLEEPING_SYMBOL,
+            'searching': pkg_data.SEARCH_QUAD_SYMBOL,
+            'stopped': pkg_data.STOPPED_SYMBOL,
+            'stopping': pkg_data.WAIT_SYMBOL,
         }
 
         if int(option.state) & QStyle.State_Enabled and int(option.state) & QStyle.State_Selected and int(option.state) & QStyle.State_Active:

diff --git a/mp3monitoring/gui/pkg_data/__init__.py b/mp3monitoring/gui/pkg_data/__init__.py
@@ -12,6 +12,10 @@
     OK_SYMBOL = Path(p)
 with resources.path('mp3monitoring.gui.pkg_data.symbols', 'search.svg') as p:
     SEARCH_SYMBOL = Path(p)
+with resources.path('mp3monitoring.gui.pkg_data.symbols', 'search_quad.svg') as p:
+    SEARCH_QUAD_SYMBOL = Path(p)
+with resources.path('mp3monitoring.gui.pkg_data.symbols', 'sleeping.svg') as p:
+    SLEEPING_SYMBOL = Path(p)
 with resources.path('mp3monitoring.gui.pkg_data.symbols', 'stopped.svg') as p:
     STOPPED_SYMBOL = Path(p)
 with resources.path('mp3monitoring.gui.pkg_data.symbols', 'wait.svg') as p:

diff --git a/mp3monitoring/gui/pkg_data/symbols/license.rst b/mp3monitoring/gui/pkg_data/symbols/license.rst
@@ -7,7 +7,9 @@ This work
 - power.svg
 - remove.svg
 - search.svg
+- search_quad.svg
 - settings.svg
+- sleeping.svg
 - start.svg
 - stop.svg
 - stopped.svg

diff --git a/mp3monitoring/gui/pkg_data/symbols/search_quad.svg b/mp3monitoring/gui/pkg_data/symbols/search_quad.svg
diff --git a/mp3monitoring/gui/pkg_data/symbols/sleeping.svg b/mp3monitoring/gui/pkg_data/symbols/sleeping.svg