From 1dab85efd880b5f7a949b517656ddcc56ce862c9 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 22 Dec 2020 10:21:14 +0100 Subject: [PATCH 1/3] renamed logging module to log_viewer --- pype/modules/__init__.py | 4 +- .../{logging => log_viewer}/__init__.py | 0 pype/modules/log_viewer/log_view_module.py | 48 +++++++++++++++++++ .../{logging => log_viewer}/logging_module.py | 0 .../{logging => log_viewer}/tray/__init__.py | 0 .../{logging => log_viewer}/tray/app.py | 0 .../{logging => log_viewer}/tray/models.py | 0 .../{logging => log_viewer}/tray/widgets.py | 0 8 files changed, 50 insertions(+), 2 deletions(-) rename pype/modules/{logging => log_viewer}/__init__.py (100%) create mode 100644 pype/modules/log_viewer/log_view_module.py rename pype/modules/{logging => log_viewer}/logging_module.py (100%) rename pype/modules/{logging => log_viewer}/tray/__init__.py (100%) rename pype/modules/{logging => log_viewer}/tray/app.py (100%) rename pype/modules/{logging => log_viewer}/tray/models.py (100%) rename pype/modules/{logging => log_viewer}/tray/widgets.py (100%) diff --git a/pype/modules/__init__.py b/pype/modules/__init__.py index 4f76dc2df0..46ac0b918c 100644 --- a/pype/modules/__init__.py +++ b/pype/modules/__init__.py @@ -32,7 +32,7 @@ from .ftrack import ( IFtrackEventHandlerPaths ) from .clockify import ClockifyModule -from .logging import LoggingModule +from .log_viewer import LogViewModule from .muster import MusterModule from .standalonepublish_action import StandAlonePublishAction from .websocket_server import WebsocketModule @@ -70,7 +70,7 @@ __all__ = ( "ClockifyModule", "IdleManager", - "LoggingModule", + "LogViewModule", "MusterModule", "StandAlonePublishAction", diff --git a/pype/modules/logging/__init__.py b/pype/modules/log_viewer/__init__.py similarity index 100% rename from pype/modules/logging/__init__.py rename to pype/modules/log_viewer/__init__.py diff --git a/pype/modules/log_viewer/log_view_module.py b/pype/modules/log_viewer/log_view_module.py new file mode 100644 index 0000000000..1252eaf888 --- /dev/null +++ b/pype/modules/log_viewer/log_view_module.py @@ -0,0 +1,48 @@ +from pype.api import Logger +from .. import PypeModule, ITrayModule + + +class LogViewModule(PypeModule, ITrayModule): + name = "log_viewer" + + def initialize(self, modules_settings): + logging_settings = modules_settings[self.name] + self.enabled = logging_settings["enabled"] + + # Tray attributes + self.window = None + + def tray_init(self): + try: + from .tray.app import LogsWindow + self.window = LogsWindow() + except Exception: + self.log.warning( + "Couldn't set Logging GUI due to error.", exc_info=True + ) + + # Definition of Tray menu + def tray_menu(self, tray_menu): + from Qt import QtWidgets + # Menu for Tray App + menu = QtWidgets.QMenu('Logging', tray_menu) + + show_action = QtWidgets.QAction("Show Logs", menu) + show_action.triggered.connect(self._show_logs_gui) + menu.addAction(show_action) + + tray_menu.addMenu(menu) + + def tray_start(self): + return + + def tray_exit(self): + return + + def connect_with_modules(self, _enabled_modules): + """Nothing special.""" + return + + def _show_logs_gui(self): + if self.window: + self.window.show() diff --git a/pype/modules/logging/logging_module.py b/pype/modules/log_viewer/logging_module.py similarity index 100% rename from pype/modules/logging/logging_module.py rename to pype/modules/log_viewer/logging_module.py diff --git a/pype/modules/logging/tray/__init__.py b/pype/modules/log_viewer/tray/__init__.py similarity index 100% rename from pype/modules/logging/tray/__init__.py rename to pype/modules/log_viewer/tray/__init__.py diff --git a/pype/modules/logging/tray/app.py b/pype/modules/log_viewer/tray/app.py similarity index 100% rename from pype/modules/logging/tray/app.py rename to pype/modules/log_viewer/tray/app.py diff --git a/pype/modules/logging/tray/models.py b/pype/modules/log_viewer/tray/models.py similarity index 100% rename from pype/modules/logging/tray/models.py rename to pype/modules/log_viewer/tray/models.py diff --git a/pype/modules/logging/tray/widgets.py b/pype/modules/log_viewer/tray/widgets.py similarity index 100% rename from pype/modules/logging/tray/widgets.py rename to pype/modules/log_viewer/tray/widgets.py From 49c22b6217c942fadaa3b3f1b33bac57dc2ac2f1 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 22 Dec 2020 10:22:54 +0100 Subject: [PATCH 2/3] removed previous module file --- pype/modules/log_viewer/logging_module.py | 48 ----------------------- 1 file changed, 48 deletions(-) delete mode 100644 pype/modules/log_viewer/logging_module.py diff --git a/pype/modules/log_viewer/logging_module.py b/pype/modules/log_viewer/logging_module.py deleted file mode 100644 index 06101b51a5..0000000000 --- a/pype/modules/log_viewer/logging_module.py +++ /dev/null @@ -1,48 +0,0 @@ -from pype.api import Logger -from .. import PypeModule, ITrayModule - - -class LoggingModule(PypeModule, ITrayModule): - name = "log_viewer" - - def initialize(self, modules_settings): - logging_settings = modules_settings[self.name] - self.enabled = logging_settings["enabled"] - - # Tray attributes - self.window = None - - def tray_init(self): - try: - from .tray.app import LogsWindow - self.window = LogsWindow() - except Exception: - self.log.warning( - "Couldn't set Logging GUI due to error.", exc_info=True - ) - - # Definition of Tray menu - def tray_menu(self, tray_menu): - from Qt import QtWidgets - # Menu for Tray App - menu = QtWidgets.QMenu('Logging', tray_menu) - - show_action = QtWidgets.QAction("Show Logs", menu) - show_action.triggered.connect(self._show_logs_gui) - menu.addAction(show_action) - - tray_menu.addMenu(menu) - - def tray_start(self): - return - - def tray_exit(self): - return - - def connect_with_modules(self, _enabled_modules): - """Nothing special.""" - return - - def _show_logs_gui(self): - if self.window: - self.window.show() From 1a190670f1a42777a43caf4a90fab6c6a974ef22 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 22 Dec 2020 10:23:38 +0100 Subject: [PATCH 3/3] fix log_viewer init file --- pype/modules/log_viewer/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pype/modules/log_viewer/__init__.py b/pype/modules/log_viewer/__init__.py index c87d8b7f43..672f47c015 100644 --- a/pype/modules/log_viewer/__init__.py +++ b/pype/modules/log_viewer/__init__.py @@ -1,6 +1,6 @@ -from .logging_module import LoggingModule +from .log_view_module import LogViewModule __all__ = ( - "LoggingModule", + "LogViewModule", )