From a542168a0d02fd6757895b5edea08fff9a3612ec Mon Sep 17 00:00:00 2001 From: glubsy Date: Fri, 31 Jul 2020 16:57:18 +0200 Subject: [PATCH] Reorganize view menu entries and keep consistency --- qt/directories_dialog.py | 9 ++++++--- qt/result_window.py | 12 +++++++++--- qt/tabbed_window.py | 4 +--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/qt/directories_dialog.py b/qt/directories_dialog.py index 5d772cb7..283731e9 100644 --- a/qt/directories_dialog.py +++ b/qt/directories_dialog.py @@ -94,7 +94,6 @@ class DirectoriesDialog(QMainWindow): ("actionAddFolder", "", "", tr("Add Folder..."), self.addFolderTriggered), ] createActions(ACTIONS, self) - # if self.app.main_window: # We use tab widgets in this case # # Keep track of actions which should only be accessible from this class # for action, _, _, _, _ in ACTIONS: @@ -122,16 +121,20 @@ class DirectoriesDialog(QMainWindow): self.menuLoadRecent = QMenu(self.menuFile) self.menuLoadRecent.setTitle(tr("Load Recent Results")) + self.menuFile.addAction(self.actionLoadResults) self.menuFile.addAction(self.menuLoadRecent.menuAction()) self.menuFile.addSeparator() self.menuFile.addAction(self.app.actionClearPictureCache) self.menuFile.addSeparator() self.menuFile.addAction(self.app.actionQuit) - self.menuView.addAction(self.app.actionPreferences) + + self.menuView.addAction(self.app.actionDirectoriesWindow) self.menuView.addAction(self.actionShowResultsWindow) self.menuView.addAction(self.app.actionIgnoreList) - self.menuView.addAction(self.app.actionDirectoriesWindow) + self.menuView.addSeparator() + self.menuView.addAction(self.app.actionPreferences) + self.menuHelp.addAction(self.app.actionShowHelp) self.menuHelp.addAction(self.app.actionOpenDebugLog) self.menuHelp.addAction(self.app.actionAbout) diff --git a/qt/result_window.py b/qt/result_window.py index 5656fbeb..06c24e44 100644 --- a/qt/result_window.py +++ b/qt/result_window.py @@ -214,7 +214,7 @@ class ResultWindow(QMainWindow): self.specific_actions.add(getattr(self, action)) def _setupMenu(self): - if not self.app.main_window: + if not self.app.use_tabs: # we are our own QMainWindow, we need our own menu bar self.menubar = QMenuBar() # self.menuBar() works as well here self.menubar.setGeometry(QRect(0, 0, 630, 22)) @@ -260,12 +260,18 @@ class ResultWindow(QMainWindow): self.menuMark.addAction(self.actionMarkNone) self.menuMark.addAction(self.actionInvertMarking) self.menuMark.addAction(self.actionMarkSelected) + + self.menuView.addAction(self.actionDetails) + self.menuView.addSeparator() self.menuView.addAction(self.actionPowerMarker) self.menuView.addAction(self.actionDelta) self.menuView.addSeparator() - self.menuView.addAction(self.actionDetails) - self.menuView.addAction(self.app.actionIgnoreList) + if not self.app.use_tabs: + self.menuView.addAction(self.app.actionIgnoreList) + # This also pushes back the options entry to the bottom of the menu + self.menuView.addSeparator() self.menuView.addAction(self.app.actionPreferences) + self.menuHelp.addAction(self.app.actionShowHelp) self.menuHelp.addAction(self.app.actionOpenDebugLog) self.menuHelp.addAction(self.app.actionAbout) diff --git a/qt/tabbed_window.py b/qt/tabbed_window.py index 66ea13cc..83f1c5c8 100644 --- a/qt/tabbed_window.py +++ b/qt/tabbed_window.py @@ -126,12 +126,10 @@ class TabWindow(QMainWindow): continue else: menu.setEnabled(True) - for action in menu.actions(): if action not in active_widget.specific_actions: if action in self.previous_widget_actions: - # action.setEnabled(False) - menu.removeAction(action) + action.setEnabled(False) continue action.setEnabled(True)