Skip to content

Commit

Permalink
Merge pull request #1137 from TheTimeWalker/accelerator-keys
Browse files Browse the repository at this point in the history 
Shortcuts for menu bar and tabs, toolbar items and remove exit from toolbar
  • Loading branch information
@emtiu
emtiu committed Sep 6, 2022
2 parents 3e03cff + 330978d commit bcf4b90
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
19 changes: 12 additions & 7 deletions qt/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,15 @@ def __init__(self, config, appInstance, qapp):

# take_snapshot button
self.btnTakeSnapshot = self.mainToolbar.addAction(icon.TAKE_SNAPSHOT, _('Take snapshot'))
self.btnTakeSnapshot.setShortcuts(QKeySequence(Qt.CTRL + Qt.Key_S))
self.btnTakeSnapshot.triggered.connect(self.btnTakeSnapshotClicked)

takeSnapshotMenu = qttools.Menu()
action = takeSnapshotMenu.addAction(icon.TAKE_SNAPSHOT, _('Take snapshot'))
action.triggered.connect(self.btnTakeSnapshotClicked)
self.btnTakeSnapshotChecksum = takeSnapshotMenu.addAction(icon.TAKE_SNAPSHOT, _('Take snapshot with checksums'))
self.btnTakeSnapshotChecksum.setToolTip(_('Use checksum to detect changes'))
self.btnTakeSnapshotChecksum.setShortcuts(QKeySequence(Qt.CTRL + Qt.SHIFT + Qt.Key_S))
self.btnTakeSnapshotChecksum.triggered.connect(self.btnTakeSnapshotChecksumClicked)
self.btnTakeSnapshot.setMenu(takeSnapshotMenu)

Expand Down Expand Up @@ -121,9 +123,11 @@ def __init__(self, config, appInstance, qapp):
self.btnUpdateSnapshots.triggered.connect(self.btnUpdateSnapshotsClicked)

self.btnNameSnapshot = self.mainToolbar.addAction(icon.SNAPSHOT_NAME, _('Snapshot Name'))
self.btnNameSnapshot.setShortcuts([Qt.Key_F2])
self.btnNameSnapshot.triggered.connect(self.btnNameSnapshotClicked)

self.btnRemoveSnapshot = self.mainToolbar.addAction(icon.REMOVE_SNAPSHOT, _('Remove Snapshot'))
self.btnRemoveSnapshot.setShortcuts([Qt.Key_Delete])
self.btnRemoveSnapshot.triggered.connect(self.btnRemoveSnapshotClicked)

self.btnSnapshotLogView = self.mainToolbar.addAction(icon.VIEW_SNAPSHOT_LOG, _('View Snapshot Log'))
Expand All @@ -135,6 +139,7 @@ def __init__(self, config, appInstance, qapp):
self.mainToolbar.addSeparator()

self.btnSettings = self.mainToolbar.addAction(icon.SETTINGS, _('Settings'))
self.btnSettings.setShortcuts(QKeySequence(Qt.CTRL + Qt.SHIFT + Qt.Key_Comma))
self.btnSettings.triggered.connect(self.btnSettingsClicked)

self.mainToolbar.addSeparator()
Expand All @@ -146,8 +151,9 @@ def __init__(self, config, appInstance, qapp):
self.btnShutdown.setEnabled(self.shutdown.canShutdown())
self.btnShutdown.toggled.connect(self.btnShutdownToggled)

self.btnQuit = self.mainToolbar.addAction(icon.EXIT, _('Exit'))
self.btnQuit.setShortcut(QKeySequence(Qt.CTRL + Qt.Key_W))
self.menuSnapshot = self.menuBar().addMenu(_('&Snapshot'))
self.btnQuit = self.menuSnapshot.addAction(icon.EXIT, _('Exit'))
self.btnQuit.setShortcut(QKeySequence(Qt.CTRL + Qt.Key_Q))
self.btnQuit.triggered.connect(self.close)

empty = QWidget(self)
Expand All @@ -156,6 +162,7 @@ def __init__(self, config, appInstance, qapp):

menuHelp = QMenu(self)
self.btnHelp = menuHelp.addAction(icon.HELP, _('Help'))
self.btnHelp.setShortcuts([Qt.Key_F1])
self.btnHelp.triggered.connect(self.btnHelpClicked)
self.btnHelpConfig = menuHelp.addAction(icon.HELP, _('Config File Help'))
self.btnHelpConfig.triggered.connect(self.btnHelpConfigClicked)
Expand Down Expand Up @@ -256,8 +263,6 @@ def __init__(self, config, appInstance, qapp):

filesLayout.addWidget(self.filesViewToolbar)

#menubar
self.menuSnapshot = self.menuBar().addMenu(_('Snapshot'))
self.menuSnapshot.addAction(self.btnTakeSnapshot)
self.menuSnapshot.addAction(self.btnUpdateSnapshots)
self.menuSnapshot.addAction(self.btnNameSnapshot)
Expand All @@ -268,7 +273,7 @@ def __init__(self, config, appInstance, qapp):
self.menuSnapshot.addAction(self.btnShutdown)
self.menuSnapshot.addAction(self.btnQuit)

self.menuView = self.menuBar().addMenu(_('View'))
self.menuView = self.menuBar().addMenu(_('&View'))
self.menuView.addAction(self.btnFolderUp)
self.menuView.addAction(self.btnShowHiddenFiles)
self.menuView.addSeparator()
Expand All @@ -277,14 +282,14 @@ def __init__(self, config, appInstance, qapp):
self.menuView.addSeparator()
self.menuView.addAction(self.btnSnapshots)

self.menuRestore = self.menuBar().addMenu(_('Restore'))
self.menuRestore = self.menuBar().addMenu(_('&Restore'))
self.menuRestore.addAction(self.btnRestore)
self.menuRestore.addAction(self.btnRestoreTo)
self.menuRestore.addSeparator()
self.menuRestore.addAction(self.btnRestoreParent)
self.menuRestore.addAction(self.btnRestoreParentTo)

self.menuHelp = self.menuBar().addMenu(_('Help'))
self.menuHelp = self.menuBar().addMenu(_('&Help'))
self.menuHelp.addAction(self.btnHelp)
self.menuHelp.addAction(self.btnHelpConfig)
self.menuHelp.addSeparator()
Expand Down
12 changes: 6 additions & 6 deletions qt/settingsdialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def __init__(self, parent):
#TAB: General
scrollArea = QScrollArea(self)
scrollArea.setFrameStyle(QFrame.NoFrame)
self.tabs.addTab(scrollArea, _('General'))
self.tabs.addTab(scrollArea, _('&General'))

layoutWidget = QWidget(self)
layout = QVBoxLayout(layoutWidget)
Expand Down Expand Up @@ -392,7 +392,7 @@ def __init__(self, parent):

#TAB: Include
tabWidget = QWidget(self)
self.tabs.addTab(tabWidget, _('Include'))
self.tabs.addTab(tabWidget, _('&Include'))
layout = QVBoxLayout(tabWidget)

self.listInclude = QTreeWidget(self)
Expand Down Expand Up @@ -428,7 +428,7 @@ def __init__(self, parent):

#TAB: Exclude
tabWidget = QWidget(self)
self.tabs.addTab(tabWidget, _('Exclude'))
self.tabs.addTab(tabWidget, _('&Exclude'))
layout = QVBoxLayout(tabWidget)

self.lblSshEncfsExcludeWarning = QLabel(_('<b>Warning:</b> Wildcards (\'foo*\', \'[fF]oo\', \'fo?\') will be ignored with mode \'SSH encrypted\'.\nOnly separate asterisk are allowed (\'foo/*\', \'foo/**/bar\')'), self)
Expand Down Expand Up @@ -503,7 +503,7 @@ def __init__(self, parent):
#TAB: Auto-remove
scrollArea = QScrollArea(self)
scrollArea.setFrameStyle(QFrame.NoFrame)
self.tabs.addTab(scrollArea, _('Auto-remove'))
self.tabs.addTab(scrollArea, _('&Auto-remove'))

layoutWidget = QWidget(self)
layout = QGridLayout(layoutWidget)
Expand Down Expand Up @@ -607,7 +607,7 @@ def __init__(self, parent):
#TAB: Options
scrollArea = QScrollArea(self)
scrollArea.setFrameStyle(QFrame.NoFrame)
self.tabs.addTab(scrollArea, _('Options'))
self.tabs.addTab(scrollArea, _('&Options'))

layoutWidget = QWidget(self)
layout = QVBoxLayout(layoutWidget)
Expand Down Expand Up @@ -668,7 +668,7 @@ def __init__(self, parent):
#TAB: Expert Options
scrollArea = QScrollArea(self)
scrollArea.setFrameStyle(QFrame.NoFrame)
self.tabs.addTab(scrollArea, _('Expert Options'))
self.tabs.addTab(scrollArea, _('E&xpert Options'))

layoutWidget = QWidget(self)
layout = QVBoxLayout(layoutWidget)
Expand Down

0 comments on commit bcf4b90

Please sign in to comment.