diff --git a/pype/modules/clockify/clockify.py b/pype/modules/clockify/clockify.py
index 4309bff9f2..9658e178e4 100644
--- a/pype/modules/clockify/clockify.py
+++ b/pype/modules/clockify/clockify.py
@@ -32,7 +32,7 @@ class ClockifyModule:
self.main_parent = main_parent
self.parent = parent
self.message_widget = None
- self.widget_settings = ClockifySettings(main_parent, self)
+ self.widget_settings = ClockifySettings(self.clockapi)
self.widget_settings_required = None
self.thread_timer_check = None
@@ -198,20 +198,20 @@ class ClockifyModule:
"Project \"{}\" was not found in Clockify. Timer won't start."
).format(project_name))
+ if not self.MessageWidgetClass:
+ return
+
msg = (
"Project \"{}\" is not"
" in Clockify Workspace \"{}\"."
"
Please inform your Project Manager."
).format(project_name, str(self.clockapi.workspace_name))
- if self.MessageWidgetClass:
- self.message_widget = self.MessageWidgetClass(
- self.main_parent, msg, "Clockify - Info Message"
- )
- self.message_widget.closed.connect(
- self.on_message_widget_close
- )
- self.message_widget.show()
+ self.message_widget = self.MessageWidgetClass(
+ msg, "Clockify - Info Message"
+ )
+ self.message_widget.closed.connect(self.on_message_widget_close)
+ self.message_widget.show()
return
diff --git a/pype/modules/clockify/widgets.py b/pype/modules/clockify/widgets.py
index dc57a48ecb..74b2dede66 100644
--- a/pype/modules/clockify/widgets.py
+++ b/pype/modules/clockify/widgets.py
@@ -10,18 +10,12 @@ class MessageWidget(QtWidgets.QWidget):
closed = QtCore.Signal()
- def __init__(self, parent=None, messages=[], title="Message"):
-
+ def __init__(self, messages=[], title="Message"):
super(MessageWidget, self).__init__()
- self._parent = parent
-
# Icon
- if parent and hasattr(parent, 'icon'):
- self.setWindowIcon(parent.icon)
- else:
- icon = QtGui.QIcon(resources.pype_icon_filepath())
- self.setWindowIcon(icon)
+ icon = QtGui.QIcon(resources.pype_icon_filepath())
+ self.setWindowIcon(icon)
self.setWindowFlags(
QtCore.Qt.WindowCloseButtonHint |
@@ -93,30 +87,21 @@ class MessageWidget(QtWidgets.QWidget):
class ClockifySettings(QtWidgets.QWidget):
-
SIZE_W = 300
SIZE_H = 130
loginSignal = QtCore.Signal(object, object, object)
- def __init__(self, main_parent=None, parent=None, optional=True):
-
+ def __init__(self, clockapi, optional=True):
super(ClockifySettings, self).__init__()
- self.parent = parent
- self.main_parent = main_parent
- self.clockapi = parent.clockapi
+ self.clockapi = clockapi
self.optional = optional
self.validated = False
# Icon
- if hasattr(parent, 'icon'):
- self.setWindowIcon(self.parent.icon)
- elif hasattr(parent, 'parent') and hasattr(parent.parent, 'icon'):
- self.setWindowIcon(self.parent.parent.icon)
- else:
- icon = QtGui.QIcon(resources.pype_icon_filepath())
- self.setWindowIcon(icon)
+ icon = QtGui.QIcon(resources.pype_icon_filepath())
+ self.setWindowIcon(icon)
self.setWindowFlags(
QtCore.Qt.WindowCloseButtonHint |