Update Closing File (#53)

* Partially or completely closes #50.

* Removed Signal usage, should be more robust. feels a bit slower, needs review on that.

* - small modification enabling navigation to menu's

on windows / linux you can now get to the file menu with ALT+F ... then with n to new / o to open ...

---------

Co-authored-by: Frank T. Bergmann <frank.thomas.bergmann@gmail.com>

Author: PaulJonasJost

src/petab_gui/controllers/mother_controller.py

@@ -160,10 +160,6 @@ def setup_connections(self):
         self.model.sbml.something_changed.connect(
             self.unsaved_changes_change
         )
-        # Closing event
-        self.view.closing_signal.connect(
-            self.maybe_close
-        )
         # correctly update the visibility even when "x" is clicked in a dock
         self.view.measurement_dock.visibilityChanged.connect(
             lambda visible: self.actions["show_measurement"].setChecked(
@@ -189,22 +185,22 @@ def setup_actions(self):
         """Setup actions for the main controller."""
         actions = {"close": QAction(
             qta.icon("mdi6.close"),
-            "Close", self.view
+            "&Close", self.view
         )}
         # Close
         actions["close"].setShortcut("Ctrl+Q")
-        actions["close"].triggered.connect(self.maybe_close)
+        actions["close"].triggered.connect(self.view.close)
         # New File
         actions["new"] = QAction(
             qta.icon("mdi6.file-document"),
-            "New", self.view
+            "&New", self.view
         )
         actions["new"].setShortcut("Ctrl+N")
         actions["new"].triggered.connect(self.new_file)
         # Open File
         actions["open"] = QAction(
             qta.icon("mdi6.folder-open"),
-            "Open", self.view
+            "&Open", self.view
         )
         actions["open"].setShortcut("Ctrl+O")
         actions["open"].triggered.connect(
@@ -222,7 +218,7 @@ def setup_actions(self):
         # Save
         actions["save"] = QAction(
             qta.icon("mdi6.content-save-all"),
-            "Save", self.view
+            "&Save", self.view
         )
         actions["save"].setShortcut("Ctrl+S")
         actions["save"].triggered.connect(self.save_model)
@@ -346,7 +342,7 @@ def save_model(self):
             options=options
         )
         if not file_name:
-            return None
+            return False
         if not file_name.endswith(".zip"):
             file_name += ".zip"
 
@@ -370,6 +366,7 @@ def save_model(self):
             self.view, "Save Project",
             f"Project saved successfully to {file_name}"
         )
+        return True
 
     def open_find_replace_dialog(self):
         current_tab = self.view.tab_widget.currentIndex()
@@ -631,8 +628,8 @@ def maybe_close(self):
             QMessageBox.Save
         )
         if reply == QMessageBox.Save:
-            self.save_model()
-            self.view.allow_close = True
+            saved = self.save_model()
+            self.view.allow_close = saved
         elif reply == QMessageBox.Discard:
             self.view.allow_close = True
         else:

src/petab_gui/views/main_view.py

@@ -10,8 +10,6 @@
 
 
 class MainWindow(QMainWindow):
-    closing_signal = Signal()
-
     def __init__(self):
         super().__init__()
 
@@ -184,7 +182,7 @@ def set_docks_visible(self, index):
     def closeEvent(self, event):
         """Override the closeEvent to emit a signal and let the controller handle it."""
         # Emit the signal to let the controller decide what to do
-        self.closing_signal.emit()
+        self.controller.maybe_close()
 
         if self.allow_close:
             self.save_settings()

src/petab_gui/views/task_bar.py

@@ -39,7 +39,7 @@ def menu_name(self):
 class FileMenu(BasicMenu):
     """Class for the file menu."""
     def menu_name(self):
-        return "File"
+        return "&File"
 
     def __init__(self, parent, actions):
         super().__init__(parent, actions)
@@ -58,7 +58,7 @@ class EditMenu(BasicMenu):
     #  done in the next PR)
     """Edit Menu of the TaskBar."""
     def menu_name(self):
-        return "Edit"
+        return "&Edit"
 
     def __init__(self, parent, actions):
         super().__init__(parent, actions)
@@ -78,7 +78,7 @@ def __init__(self, parent, actions):
 class ViewMenu(BasicMenu):
     """View Menu of the TaskBar."""
     def menu_name(self):
-        return "View"
+        return "&View"
 
     def __init__(self, parent, actions):
         super().__init__(parent, actions)