diff --git a/pype/modules/logging/__init__.py b/pype/modules/logging/__init__.py new file mode 100644 index 0000000000..48128a0f7e --- /dev/null +++ b/pype/modules/logging/__init__.py @@ -0,0 +1,6 @@ +from .logging_module import LoggingModule + + +__all__ = ( + "LoggingModule" +) diff --git a/pype/modules/logging/tray/logging_module.py b/pype/modules/logging/logging_module.py similarity index 53% rename from pype/modules/logging/tray/logging_module.py rename to pype/modules/logging/logging_module.py index 84b40f68e1..a4400a610a 100644 --- a/pype/modules/logging/tray/logging_module.py +++ b/pype/modules/logging/logging_module.py @@ -1,41 +1,46 @@ from pype.api import Logger +from .. import PypeModule, ITrayModule -class LoggingModule: - def __init__(self, main_parent=None, parent=None): - self.parent = parent - self.log = Logger().get_logger(self.__class__.__name__, "logging") +class LoggingModule(PypeModule, ITrayModule): + name = "Logging" + def initialize(self, modules_settings): + logging_settings = modules_settings[self.name] + self.enabled = logging_settings["enabled"] + + # Tray attributes self.window = None - self.tray_init(main_parent, parent) - def tray_init(self, main_parent, parent): try: - from .gui.app import LogsWindow + from .tray.app import LogsWindow self.window = LogsWindow() - self.tray_menu = self._tray_menu except Exception: self.log.warning( "Couldn't set Logging GUI due to error.", exc_info=True ) # Definition of Tray menu - def _tray_menu(self, parent_menu): + def tray_menu(self, tray_menu): from Qt import QtWidgets # Menu for Tray App - menu = QtWidgets.QMenu('Logging', parent_menu) + 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) - parent_menu.addMenu(menu) + tray_menu.addMenu(menu) def tray_start(self): - pass + return - def process_modules(self, modules): + def tray_exit(self): + return + + def connect_with_modules(self, _enabled_modules): + """Nothing special.""" return def _show_logs_gui(self): diff --git a/pype/modules/logging/tray/__init__.py b/pype/modules/logging/tray/__init__.py index a2586155e7..e69de29bb2 100644 --- a/pype/modules/logging/tray/__init__.py +++ b/pype/modules/logging/tray/__init__.py @@ -1,5 +0,0 @@ -from .logging_module import LoggingModule - - -def tray_init(tray_widget, main_widget): - return LoggingModule(main_widget, tray_widget) diff --git a/pype/modules/logging/tray/gui/app.py b/pype/modules/logging/tray/app.py similarity index 100% rename from pype/modules/logging/tray/gui/app.py rename to pype/modules/logging/tray/app.py diff --git a/pype/modules/logging/tray/gui/__init__.py b/pype/modules/logging/tray/gui/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pype/modules/logging/tray/gui/models.py b/pype/modules/logging/tray/models.py similarity index 100% rename from pype/modules/logging/tray/gui/models.py rename to pype/modules/logging/tray/models.py diff --git a/pype/modules/logging/tray/gui/widgets.py b/pype/modules/logging/tray/widgets.py similarity index 100% rename from pype/modules/logging/tray/gui/widgets.py rename to pype/modules/logging/tray/widgets.py