arsenetar
/
dupeguru
mirror of https://github.com/arsenetar/dupeguru.git
1
0
Fork 0
Code Releases Wiki Activity

Reorganize view menu entries and keep consistency

This commit is contained in:
glubsy 2020-07-31 16:57:18 +02:00
parent 86e1b55b02
commit a542168a0d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qt/directories_dialog.py
View File

@ -94,7 +94,6 @@ class DirectoriesDialog(QMainWindow):
("actionAddFolder", "", "", tr("Add Folder..."), self.addFolderTriggered), ("actionAddFolder", "", "", tr("Add Folder..."), self.addFolderTriggered),
] ]
createActions(ACTIONS, self) createActions(ACTIONS, self)
# if self.app.main_window: # We use tab widgets in this case # if self.app.main_window: # We use tab widgets in this case
# # Keep track of actions which should only be accessible from this class # # Keep track of actions which should only be accessible from this class
# for action, _, _, _, _ in ACTIONS: # for action, _, _, _, _ in ACTIONS:
@ -122,16 +121,20 @@ class DirectoriesDialog(QMainWindow):
self.menuLoadRecent = QMenu(self.menuFile) self.menuLoadRecent = QMenu(self.menuFile)
self.menuLoadRecent.setTitle(tr("Load Recent Results")) self.menuLoadRecent.setTitle(tr("Load Recent Results"))
self.menuFile.addAction(self.actionLoadResults) self.menuFile.addAction(self.actionLoadResults)
self.menuFile.addAction(self.menuLoadRecent.menuAction()) self.menuFile.addAction(self.menuLoadRecent.menuAction())
self.menuFile.addSeparator() self.menuFile.addSeparator()
self.menuFile.addAction(self.app.actionClearPictureCache) self.menuFile.addAction(self.app.actionClearPictureCache)
self.menuFile.addSeparator() self.menuFile.addSeparator()
self.menuFile.addAction(self.app.actionQuit) 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.actionShowResultsWindow)
self.menuView.addAction(self.app.actionIgnoreList) 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.actionShowHelp)
self.menuHelp.addAction(self.app.actionOpenDebugLog) self.menuHelp.addAction(self.app.actionOpenDebugLog)
self.menuHelp.addAction(self.app.actionAbout) self.menuHelp.addAction(self.app.actionAbout)

12
qt/result_window.py
View File

@ -214,7 +214,7 @@ class ResultWindow(QMainWindow):
self.specific_actions.add(getattr(self, action)) self.specific_actions.add(getattr(self, action))
def _setupMenu(self): 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 # we are our own QMainWindow, we need our own menu bar
self.menubar = QMenuBar() # self.menuBar() works as well here self.menubar = QMenuBar() # self.menuBar() works as well here
self.menubar.setGeometry(QRect(0, 0, 630, 22)) self.menubar.setGeometry(QRect(0, 0, 630, 22))
@ -260,12 +260,18 @@ class ResultWindow(QMainWindow):
self.menuMark.addAction(self.actionMarkNone) self.menuMark.addAction(self.actionMarkNone)
self.menuMark.addAction(self.actionInvertMarking) self.menuMark.addAction(self.actionInvertMarking)
self.menuMark.addAction(self.actionMarkSelected) self.menuMark.addAction(self.actionMarkSelected)
self.menuView.addAction(self.actionDetails)
self.menuView.addSeparator()
self.menuView.addAction(self.actionPowerMarker) self.menuView.addAction(self.actionPowerMarker)
self.menuView.addAction(self.actionDelta) self.menuView.addAction(self.actionDelta)
self.menuView.addSeparator() self.menuView.addSeparator()
self.menuView.addAction(self.actionDetails) if not self.app.use_tabs:
self.menuView.addAction(self.app.actionIgnoreList) 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.menuView.addAction(self.app.actionPreferences)
self.menuHelp.addAction(self.app.actionShowHelp) self.menuHelp.addAction(self.app.actionShowHelp)
self.menuHelp.addAction(self.app.actionOpenDebugLog) self.menuHelp.addAction(self.app.actionOpenDebugLog)
self.menuHelp.addAction(self.app.actionAbout) self.menuHelp.addAction(self.app.actionAbout)

4
qt/tabbed_window.py
View File

@ -126,12 +126,10 @@ class TabWindow(QMainWindow):
continue continue
else: else:
menu.setEnabled(True) menu.setEnabled(True)
for action in menu.actions(): for action in menu.actions():
if action not in active_widget.specific_actions: if action not in active_widget.specific_actions:
if action in self.previous_widget_actions: if action in self.previous_widget_actions:
# action.setEnabled(False) action.setEnabled(False)
menu.removeAction(action)
continue continue
action.setEnabled(True) action.setEnabled(True)