diff --git a/bin/pytop-0-0-1-x64.deb b/bin/pytop-0-0-1-x64.deb index 4f4ef33..e1fe45e 100644 Binary files a/bin/pytop-0-0-1-x64.deb and b/bin/pytop-0-0-1-x64.deb differ diff --git a/src/Pytop/PyTop.py b/src/Pytop/PyTop.py old mode 100755 new mode 100644 diff --git a/src/Pytop/PyTop.sh b/src/Pytop/PyTop.sh old mode 100755 new mode 100644 diff --git a/src/Pytop/resources/PyTop.glade b/src/Pytop/resources/PyTop.glade index 01b77e9..46b1731 100644 --- a/src/Pytop/resources/PyTop.glade +++ b/src/Pytop/resources/PyTop.glade @@ -255,14 +255,22 @@ - - 126 + True False - False - - - + True + + + + 126 + True + False + False + + + + + False @@ -280,6 +288,22 @@ + + 420 + 225 + False + timeLabelEveBox + False + + + True + True + 2020 + 3 + 22 + + + True False diff --git a/src/Pytop/signal_classes/CrossClassSignals.py b/src/Pytop/signal_classes/CrossClassSignals.py index adf9081..9876233 100644 --- a/src/Pytop/signal_classes/CrossClassSignals.py +++ b/src/Pytop/signal_classes/CrossClassSignals.py @@ -19,9 +19,7 @@ class CrossClassSignals: # Displays Timer def displayclock(self): now = datetime.now() - - # timeStr = now.strftime("%H:%M %m/%d/%y") - timeStr = now.strftime("%I:%M %p %m/%d/%y") + timeStr = now.strftime("%I:%M %p %m/%d/%Y") self.timeLabel.set_label(timeStr) return True diff --git a/src/Pytop/signal_classes/DrawSignals.py b/src/Pytop/signal_classes/DrawSignals.py old mode 100755 new mode 100644 index b47ee2b..8b2296c --- a/src/Pytop/signal_classes/DrawSignals.py +++ b/src/Pytop/signal_classes/DrawSignals.py @@ -111,7 +111,7 @@ class DrawSignals: ah = area.get_allocated_height() self.aw = aw self.ah = ah - self.xStep = aw / 200 # For x-axis + self.xStep = aw / 200 # For x-axis 60 * 2 per 1 sec steps self.yStep = ah / 100 # For y-axis %s self.surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, aw, ah) self.brush = cairo.Context(self.surface) diff --git a/src/Pytop/signal_classes/TaskbarSignals.py b/src/Pytop/signal_classes/TaskbarSignals.py index 3217366..5a90075 100644 --- a/src/Pytop/signal_classes/TaskbarSignals.py +++ b/src/Pytop/signal_classes/TaskbarSignals.py @@ -1,5 +1,6 @@ # Python imports import threading +from datetime import datetime # Gtk imports import gi @@ -24,6 +25,23 @@ class TaskbarSignals: self.setPagerWidget() self.setTasklistWidget() + def toggleCalPopover(self, widget, eve): + calendarPopup = self.builder.get_object('calendarPopup') + if (calendarPopup.get_visible() == False): + calendarWid = self.builder.get_object('calendarWid') + now = datetime.now() + timeStr = now.strftime("%m/%d/%Y") + parts = timeStr.split("/") + month = int(parts[0]) + day = int(parts[1]) + year = int(parts[2]) + calendarWid.select_day(day) + calendarWid.select_month(month, year) + calendarPopup.popup() + else: + calendarPopup.popdown() + + def setPagerWidget(self): pager = wnck.Pager() diff --git a/src/Pytop/signal_classes/__pycache__/CrossClassSignals.cpython-36.pyc b/src/Pytop/signal_classes/__pycache__/CrossClassSignals.cpython-36.pyc new file mode 100644 index 0000000..7f37669 Binary files /dev/null and b/src/Pytop/signal_classes/__pycache__/CrossClassSignals.cpython-36.pyc differ diff --git a/src/Pytop/signal_classes/__pycache__/GridSignals.cpython-36.pyc b/src/Pytop/signal_classes/__pycache__/GridSignals.cpython-36.pyc new file mode 100644 index 0000000..8545049 Binary files /dev/null and b/src/Pytop/signal_classes/__pycache__/GridSignals.cpython-36.pyc differ diff --git a/src/Pytop/signal_classes/__pycache__/TaskbarSignals.cpython-36.pyc b/src/Pytop/signal_classes/__pycache__/TaskbarSignals.cpython-36.pyc new file mode 100644 index 0000000..781c6a3 Binary files /dev/null and b/src/Pytop/signal_classes/__pycache__/TaskbarSignals.cpython-36.pyc differ diff --git a/src/Pytop/signal_classes/__pycache__/__init__.cpython-36.pyc b/src/Pytop/signal_classes/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..3a2b068 Binary files /dev/null and b/src/Pytop/signal_classes/__pycache__/__init__.cpython-36.pyc differ diff --git a/src/Pytop/utils/FileHandler.py b/src/Pytop/utils/FileHandler.py index 6419eb5..3c8045d 100644 --- a/src/Pytop/utils/FileHandler.py +++ b/src/Pytop/utils/FileHandler.py @@ -62,7 +62,7 @@ class FileHandler: else: # Create Folder os.mkdir(name) except Exception as e: - print(e) + print( repr(e) ) return 1 return 0 @@ -86,7 +86,7 @@ class FileHandler: shutil.move(finalForm, toPath) except Exception as e: - print(e) + print( repr(e) ) return 1 return 0 @@ -106,7 +106,7 @@ class FileHandler: return 1 except Exception as e: print("An error occured deleting the file:") - print(e) + print( repr(e) ) return 1 return 0 @@ -129,7 +129,7 @@ class FileHandler: print("The folder/file does not exist") return 1 except Exception as e: - print(e) + print( repr(e) ) return 1 return 0 @@ -144,7 +144,7 @@ class FileHandler: print("The folder/file does not exist") return 1 except Exception as e: - print(e) + print( repr(e) ) return 1 return 0 diff --git a/src/Pytop/utils/__pycache__/Dragging.cpython-36.pyc b/src/Pytop/utils/__pycache__/Dragging.cpython-36.pyc new file mode 100644 index 0000000..2a3ab95 Binary files /dev/null and b/src/Pytop/utils/__pycache__/Dragging.cpython-36.pyc differ diff --git a/src/Pytop/utils/__pycache__/FileHandler.cpython-36.pyc b/src/Pytop/utils/__pycache__/FileHandler.cpython-36.pyc new file mode 100644 index 0000000..b8c3303 Binary files /dev/null and b/src/Pytop/utils/__pycache__/FileHandler.cpython-36.pyc differ diff --git a/src/Pytop/utils/__pycache__/Settings.cpython-36.pyc b/src/Pytop/utils/__pycache__/Settings.cpython-36.pyc new file mode 100644 index 0000000..c7ceeb7 Binary files /dev/null and b/src/Pytop/utils/__pycache__/Settings.cpython-36.pyc differ diff --git a/src/Pytop/utils/__pycache__/__init__.cpython-36.pyc b/src/Pytop/utils/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..74594fc Binary files /dev/null and b/src/Pytop/utils/__pycache__/__init__.cpython-36.pyc differ diff --git a/src/Pytop/widgets/__pycache__/Grid.cpython-36.pyc b/src/Pytop/widgets/__pycache__/Grid.cpython-36.pyc new file mode 100644 index 0000000..234cad4 Binary files /dev/null and b/src/Pytop/widgets/__pycache__/Grid.cpython-36.pyc differ diff --git a/src/Pytop/widgets/__pycache__/Icon.cpython-36.pyc b/src/Pytop/widgets/__pycache__/Icon.cpython-36.pyc new file mode 100644 index 0000000..36a5e6f Binary files /dev/null and b/src/Pytop/widgets/__pycache__/Icon.cpython-36.pyc differ diff --git a/src/Pytop/widgets/__pycache__/__init__.cpython-36.pyc b/src/Pytop/widgets/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..3166e35 Binary files /dev/null and b/src/Pytop/widgets/__pycache__/__init__.cpython-36.pyc differ diff --git a/src/Pytop/widgets/icon_manager/__pycache__/__init__.cpython-36.pyc b/src/Pytop/widgets/icon_manager/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..e6b5c50 Binary files /dev/null and b/src/Pytop/widgets/icon_manager/__pycache__/__init__.cpython-36.pyc differ diff --git a/src/Pytop/widgets/icon_manager/__pycache__/easybuttons.cpython-36.pyc b/src/Pytop/widgets/icon_manager/__pycache__/easybuttons.cpython-36.pyc new file mode 100644 index 0000000..c6edf71 Binary files /dev/null and b/src/Pytop/widgets/icon_manager/__pycache__/easybuttons.cpython-36.pyc differ diff --git a/src/Pytop/widgets/icon_manager/__pycache__/execute.cpython-36.pyc b/src/Pytop/widgets/icon_manager/__pycache__/execute.cpython-36.pyc new file mode 100644 index 0000000..009ff11 Binary files /dev/null and b/src/Pytop/widgets/icon_manager/__pycache__/execute.cpython-36.pyc differ diff --git a/src/Pytop/widgets/icon_manager/__pycache__/filemonitor.cpython-36.pyc b/src/Pytop/widgets/icon_manager/__pycache__/filemonitor.cpython-36.pyc new file mode 100644 index 0000000..f781eca Binary files /dev/null and b/src/Pytop/widgets/icon_manager/__pycache__/filemonitor.cpython-36.pyc differ