ref: minor cleanup

Author: paulmueller

dcoraid/gui/download/widget_download.py

@@ -67,6 +67,12 @@ def download_resource(self, resource_id, condensed=False):
         dl_path = self.settings.value("downloads/default path", fallback)
         self.widget_jobs.jobs.new_job(resource_id, dl_path, condensed)
 
+    def stop_timers(self):
+        """Should be called before the application quits"""
+        self.init_timer.stop()
+        if self.widget_jobs.timer is not None:
+            self.widget_jobs.timer.stop()
+
 
 class DownloadTableWidget(QtWidgets.QTableWidget):
     download_finished = QtCore.pyqtSignal()

dcoraid/gui/main.py

@@ -132,10 +132,13 @@ def __init__(self, *args, **kwargs):
         self.show()
         self.raise_()
 
-    def close(self):
-        if self.panel_upload.widget_jobs.timer is not None:
-            self.panel_upload.widget_jobs.timer.stop()
-        super(DCORAid, self).close()
+    def closeEvent(self, event):
+        self.panel_upload.stop_timers()
+        self.panel_download.stop_timers()
+        self.status_widget.stop_timers()
+        QtWidgets.QApplication.processEvents(QtCore.QEventLoop.AllEvents,
+                                             300)
+        event.accept()
 
     @QtCore.pyqtSlot()
     def on_action_about(self):

dcoraid/gui/preferences/dlg_preferences.py

@@ -19,10 +19,10 @@ class PreferencesDialog(QtWidgets.QMainWindow):
     show_server = QtCore.pyqtSignal()
     show_user = QtCore.pyqtSignal()
 
-    def __init__(self, parent=None):
+    def __init__(self, *args, **kwargs):
         """Create a new window for preferences
         """
-        super(PreferencesDialog, self).__init__(parent)
+        super(PreferencesDialog, self).__init__(*args, **kwargs)
         path_ui = pkg_resources.resource_filename(
             "dcoraid.gui.preferences", "dlg_preferences.ui")
         uic.loadUi(path_ui, self)

dcoraid/gui/status_widget.py

@@ -92,6 +92,10 @@ def set_status(self, text, tooltip, icon, server):
         self.toolButton_user.setToolTip(tooltip)
         self.toolButton_user.setIcon(QtGui.QIcon.fromTheme(icon))
 
+    def stop_timers(self):
+        if self.timer is not None:
+            self.timer.stop()
+
 
 class StatusWidetUpdateWorker(QtCore.QRunnable):
     """Worker for updating the current API situation

dcoraid/gui/upload/dlg_upload.py

@@ -26,10 +26,10 @@ class UploadDialog(QtWidgets.QDialog):
     finished = QtCore.pyqtSignal(object)
     instance_counter = 1
 
-    def __init__(self, parent=None):
+    def __init__(self, *args, **kwargs):
         """Create a new window for setting up a file upload
         """
-        super(UploadDialog, self).__init__(parent)
+        super(UploadDialog, self).__init__(*args, **kwargs)
         self.logger = logging.getLogger(__name__)
         path_ui = pkg_resources.resource_filename(
             "dcoraid.gui.upload", "dlg_upload.ui")

dcoraid/gui/upload/widget_upload.py

@@ -293,6 +293,12 @@ def on_upload_task(self, action):
             "\n\n".join(messages),
         )
 
+    def stop_timers(self):
+        """Should be called before the application quits"""
+        self.init_timer.stop()
+        if self.widget_jobs.timer is not None:
+            self.widget_jobs.timer.stop()
+
 
 class UploadTableWidget(QtWidgets.QTableWidget):
     upload_finished = QtCore.pyqtSignal()

tests/test_gui.py

@@ -33,13 +33,13 @@ def mw(qtbot):
     mw = DCORAid()
     qtbot.addWidget(mw)
     QtWidgets.QApplication.setActiveWindow(mw)
-    QtTest.QTest.qWait(200)
+    QtTest.QTest.qWait(100)
     QtWidgets.QApplication.processEvents(QtCore.QEventLoop.AllEvents, 5000)
     # Run test
     yield mw
     # Make sure that all daemons are gone
     mw.close()
-    QtTest.QTest.qWait(500)
+    QtTest.QTest.qWait(100)
     QtWidgets.QApplication.processEvents(QtCore.QEventLoop.AllEvents, 5000)