Add Fullscreen actions

Author: mstuttgart

src/views/main_window_view.py

@@ -155,6 +155,7 @@ def __init__(self, MainController: "MainController") -> None:
         self._actionLastPage: QAction = QAction(self)
         self._actionPreviousComic: QAction = QAction(self)
         self._actionNextComic: QAction = QAction(self)
+        self._actionFullscreen: QAction = QAction(self)
         self._actionFitVertical: QAction = QAction(self)
         self._actionFitHorizontal: QAction = QAction(self)
         self._actionFitOriginal: QAction = QAction(self)
@@ -371,10 +372,7 @@ def _setupActions(self) -> None:
         self._setupNavigationActions()
 
         # Fit actions
-        self._setupFitActions()
-
-        # Rotate actions
-        self._setupRotateActions()
+        self._setupViewActions()
 
         # About action
         self._actionAbout = self._createAction(
@@ -460,12 +458,23 @@ def _setupNavigationActions(self) -> None:
             enable=False,
         )
 
-    def _setupFitActions(self) -> None:
+    def _setupViewActions(self) -> None:
         """
         Configures fit actions for adjusting the content display.
         """
         logger.debug("Setting up fit actions")
 
+        # Set Fullscreen action
+        self._actionFullscreen = self._createAction(
+            iconName="fullscreen",
+            text=self.tr("Fullscreen"),
+            objectName="actionFullscreen",
+            shortcut="F",
+            slot=self.onActionFullscreenTriggered,
+            checkable=True,
+            enable=True,
+        )
+
         # Fit Vertical action
         self._actionFitVertical = self._createAction(
             iconName="fit_page_height",
@@ -526,10 +535,6 @@ def _setupFitActions(self) -> None:
         for act in self._actionFitGroup.actions():
             act.setChecked(self._mainController.getCurrentFitMode() == act.objectName())
 
-    def _setupRotateActions(self) -> None:
-        """
-        Configures rotate actions for rotating the content.
-        """
         logger.debug("Setting up rotate actions")
 
         # Rotate Left action
@@ -567,6 +572,8 @@ def _setupMenuBar(self) -> None:
         self._menuFile.addAction(self._actionExit)
 
         self._menuView = QMenu(self._menuBar, title=self.tr("&View"))
+        self._menuView.addAction(self._actionFullscreen)
+        self._menuView.addSeparator()
         self._menuView.addActions(self._actionFitGroup.actions())
         self._menuView.addSeparator()
         self._menuView.addAction(self._actionRotateLeft)
@@ -681,10 +688,10 @@ def _setupGlobalShortcuts(self) -> None:
         logger.debug("Setting up global shortcuts")
 
         # Shortcut to toggle fullscreen mode using the "F" key
-        self.fullScreenShortcut = QShortcut(
-            QKeySequence("F"), self, self.onActionFullscreenTriggered
-        )
-        self.fullScreenShortcut.setEnabled(True)
+        # self.fullScreenShortcut = QShortcut(
+        #     QKeySequence("F"), self, self.onActionFullscreenTriggered
+        # )
+        # self.fullScreenShortcut.setEnabled(True)
 
         # Shortcut to close the application using "Ctrl+Q"
         self.closeShortcut = QShortcut(QKeySequence("Ctrl+Q"), self, self.close)
@@ -699,6 +706,8 @@ def _setupGlobalShortcuts(self) -> None:
             "Ctrl+Right": self._mainController.onActionLastPageTriggered,  # Navigate to last page
             "Right": self._mainController.onActionNextPageTriggered,  # Navigate to next page
             "Left": self._mainController.onActionPreviousPageTriggered,  # Navigate to previous page
+            "F": self.onActionFullscreenTriggered,  # Toggle fullscreen
+            "ESC": self.onActionFullscreenTriggered,  # Out fullscreen
         }
 
         # Create and configure shortcuts, initially disabled for fullscreen mode
@@ -943,6 +952,7 @@ def onActionFullscreenTriggered(self):
         # Check if the window is currently in fullscreen mode
         if self.isFullScreen():
             self._toolBar.show()  # Show the toolbar
+            self._menuBar.show()
             self.showNormal()  # Restore the window to normal mode
             self._mainController.updateCentralWidgetContent()  # Update the central widget content
 
@@ -954,6 +964,7 @@ def onActionFullscreenTriggered(self):
             # Enter fullscreen mode
             self.showFullScreen()  # Switch the window to fullscreen mode
             self._toolBar.hide()
+            self._menuBar.hide()
             self._mainController.updateCentralWidgetContent()  # Update the central widget content
 
             # Enable global shortcuts when entering fullscreen mode