From 99ba4cd131a4d862a7a9a439edd7f51f0a8c910a Mon Sep 17 00:00:00 2001
From: Maxim Stewart <maximstewart1@gmail.com>
Date: Fri, 8 May 2020 22:43:25 -0500
Subject: [PATCH] Moved clock stuff to taskbar mixin

---
 src/Pytop/__init__.py                         |  4 +--
 .../{CrossClassSignals.py => Signals.py}      | 28 ++-----------------
 src/Pytop/signal_classes/__init__.py          |  2 +-
 .../signal_classes/mixins/TaskbarMixin.py     | 19 +++++++++++++
 4 files changed, 25 insertions(+), 28 deletions(-)
 rename src/Pytop/signal_classes/{CrossClassSignals.py => Signals.py} (73%)

diff --git a/src/Pytop/__init__.py b/src/Pytop/__init__.py
index aa6abfb..c197bbf 100755
--- a/src/Pytop/__init__.py
+++ b/src/Pytop/__init__.py
@@ -15,7 +15,7 @@ from gi.repository import GLib
 
 # Application imports
 from utils import Settings
-from signal_classes import CrossClassSignals, GridSignals
+from signal_classes import Signals, GridSignals
 
 
 class Main:
@@ -56,7 +56,7 @@ class Main:
     def connectBuilder(self, settings, builder):
         # Gets the methods from the classes and sets to handler.
         # Then, builder connects to any signals it needs.
-        classes  = [CrossClassSignals(settings),
+        classes  = [Signals(settings),
                     GridSignals(settings)]
 
         handlers = {}
diff --git a/src/Pytop/signal_classes/CrossClassSignals.py b/src/Pytop/signal_classes/Signals.py
similarity index 73%
rename from src/Pytop/signal_classes/CrossClassSignals.py
rename to src/Pytop/signal_classes/Signals.py
index 98e7e9c..2358284 100644
--- a/src/Pytop/signal_classes/CrossClassSignals.py
+++ b/src/Pytop/signal_classes/Signals.py
@@ -2,13 +2,13 @@
 from datetime import datetime
 
 # Gtk imports
-from gi.repository import GObject
+
 
 # Application imports
 from mixins import CPUDrawMixin, TaskbarMixin
 
 
-class CrossClassSignals(CPUDrawMixin, TaskbarMixin):
+class Signals(CPUDrawMixin, TaskbarMixin):
     def __init__(self, settings):
         self.settings       = settings
         self.builder        = self.settings.returnBuilder()
@@ -18,10 +18,8 @@ class CrossClassSignals(CPUDrawMixin, TaskbarMixin):
         self.brushSizeProp  = self.builder.get_object("brushSizeProp")
         self.brushColorProp = self.builder.get_object("brushColorProp")
 
-        # Menu bar setup
+        # Menu bar setup - Note: Must be before setting clock
         self.orientation = 1  # 0 = horizontal, 1 = vertical
-
-        # Must be before setting clock
         self.setPagerWidget()
         self.setTasklistWidget()
 
@@ -47,23 +45,3 @@ class CrossClassSignals(CPUDrawMixin, TaskbarMixin):
         self.good             = [0.53, 0.8, 0.15, 1.0]
         self.warning          = [1.0, 0.66, 0.0, 1.0]
         self.danger           = [1.0, 0.0, 0.0, 1.0]
-
-
-
-
-    # Displays Timer
-    def displayclock(self):
-        now = datetime.now()
-        hms = now.strftime("%I:%M %p")
-        mdy = now.strftime("%m/%d/%Y")
-        timeStr = hms + "\n" + mdy
-        self.timeLabel.set_label(timeStr)
-        return True
-
-    # Starting or clock
-    def startClock(self):
-        GObject.timeout_add(59000, self.displayclock)
-
-
-    def closePopup(self, widget, data=None):
-        widget.hide()
diff --git a/src/Pytop/signal_classes/__init__.py b/src/Pytop/signal_classes/__init__.py
index 7f79368..e906c78 100644
--- a/src/Pytop/signal_classes/__init__.py
+++ b/src/Pytop/signal_classes/__init__.py
@@ -1,4 +1,4 @@
 from mixins import CPUDrawMixin
 from mixins import TaskbarMixin
 from signal_classes.GridSignals import GridSignals
-from signal_classes.CrossClassSignals import CrossClassSignals
+from signal_classes.Signals import Signals
diff --git a/src/Pytop/signal_classes/mixins/TaskbarMixin.py b/src/Pytop/signal_classes/mixins/TaskbarMixin.py
index b2d7c13..f8fee3b 100644
--- a/src/Pytop/signal_classes/mixins/TaskbarMixin.py
+++ b/src/Pytop/signal_classes/mixins/TaskbarMixin.py
@@ -12,6 +12,7 @@ from gi.repository import Wnck as wnck
 from gi.repository import Gtk as gtk
 from gi.repository import Gdk as gdk
 from gi.repository import GLib
+from gi.repository import GObject
 
 # Application imports
 
@@ -69,3 +70,21 @@ class TaskbarMixin:
             self.builder.get_object('taskBarButtonsVer').add(tasklist)
 
         tasklist.show()
+
+
+    # Displays Timer
+    def displayclock(self):
+        now = datetime.now()
+        hms = now.strftime("%I:%M %p")
+        mdy = now.strftime("%m/%d/%Y")
+        timeStr = hms + "\n" + mdy
+        self.timeLabel.set_label(timeStr)
+        return True
+
+    # Starting or clock
+    def startClock(self):
+        GObject.timeout_add(59000, self.displayclock)
+
+
+    def closePopup(self, widget, data=None):
+        widget.hide()