allow exit of mtfg

Author: arch

funscript_editor/ui/cut_tracking_result.py

@@ -75,11 +75,19 @@ def __init__(self, raw_score, metrics, parent=None):
             "stop": data_len
         }
         self.update_plot()
+        self.close_with_ok = False
 
     cutCompleted = QtCore.pyqtSignal(dict)
 
 
+    def closeEvent(self, event):
+        event.accept()
+        if not self.close_with_ok:
+            sys.exit(1)
+
+
     def confirm(self):
+        self.close_with_ok = True
         self.hide()
         self.cutCompleted.emit(self.result)
         self.close()

funscript_editor/ui/postprocessing.py

@@ -6,6 +6,7 @@
 
 import funscript_editor.utils.logging as logging
 import copy
+import sys
 import numpy as np
 import pyqtgraph as pg
 
@@ -59,6 +60,7 @@ def __init__(self, metric, raw_score, video_info, parent=None):
         self.result_idx = []
         self.result_val = []
 
+        self.close_with_ok = False
         self.update_plot()
 
 
@@ -158,7 +160,14 @@ def get_current_tab_name(self) -> str:
         return self.tabs.tabText(self.tabs.currentIndex())
 
 
+    def closeEvent(self, event):
+        event.accept()
+        if not self.close_with_ok:
+            sys.exit(1)
+
+
     def confirm(self):
+        self.close_with_ok = True
         self.hide()
         self.postprocessingCompleted.emit(self.metric, self.result_idx, self.result_val)
         self.close()

funscript_editor/ui/settings_dialog.py

@@ -1,6 +1,7 @@
 """ Settings Dialog for the Funscript Generator """
 import json
 import os
+import sys
 import webbrowser
 
 import funscript_editor.ui.settings_view as settings_view
@@ -12,6 +13,19 @@
 
 from PyQt5 import QtWidgets, QtCore, QtGui
 
+
+class MyQDialog(QtWidgets.QDialog):
+
+    def __init__(self):
+        super(MyQDialog, self).__init__()
+        self.close_with_ok = False
+
+    def closeEvent(self, event):
+        event.accept()
+        if not self.close_with_ok:
+            sys.exit(1)
+
+
 class SettingsDialog(QtWidgets.QDialog):
     """ Settings Dialog
 
@@ -26,7 +40,7 @@ def __init__(self, settings: dict, include_vr: bool = True, include_multiaxis :
         self.include_vr = include_vr
         self.include_multiaxis = include_multiaxis
         self.ui = settings_view.Ui_Form()
-        self.form = QtWidgets.QDialog()
+        self.form = MyQDialog()
         self.ui.setupUi(self.form)
         self.form.setWindowTitle("MTFG Settings")
         self.settings = settings
@@ -171,6 +185,7 @@ def __set_tracking_metric(self, value):
 
 
     def __apply(self):
+        self.form.close_with_ok = True
         self.__save_settings()
         self.form.hide()
         self.applySettings.emit()