Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Rearrange menu bar in main window #1487

Merged
merged 6 commits into from
Aug 6, 2023
Merged

feat: Rearrange menu bar in main window #1487

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
743e63f
rearranged mainmenu
buhtz Jul 26, 2023
f5851cd
activate tooltips for all menus
buhtz Jul 26, 2023
465ec79
Modified shortcut
buhtz Jul 26, 2023
119c985
changelog
buhtz Jul 26, 2023
fd5feb1
typo in changelog
buhtz Jul 26, 2023
c8a15a7
PR tempalte
buhtz Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 25 additions & 28 deletions qt/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,13 +429,14 @@ def _create_actions(self):
# tooltip
#),
'act_take_snapshot': (
icon.TAKE_SNAPSHOT, _('Take snapshot'),
self.btnTakeSnapshotClicked, ['Ctrl+S'], None),
icon.TAKE_SNAPSHOT, _('Take a snapshot'),
self.btnTakeSnapshotClicked, ['Ctrl+S'],
_('Use modification time & size for file change detection.')),

'act_take_snapshot_checksum': (
icon.TAKE_SNAPSHOT, _('Take snapshot with checksums'),
icon.TAKE_SNAPSHOT, _('Take a snapshot (checksum mode)'),
self.btnTakeSnapshotChecksumClicked, ['Ctrl+Shift+S'],
_('Use checksum to detect changes')),
_('Use checksums for file change detection.')),

'act_pause_take_snapshot': (
icon.PAUSE, _('Pause snapshot process'),
Expand All @@ -451,27 +452,27 @@ def _create_actions(self):
self.btnStopTakeSnapshotClicked, None,
None),
'act_update_snapshots': (
icon.REFRESH_SNAPSHOT, _('Refresh snapshots list'),
icon.REFRESH_SNAPSHOT, _('Refresh snapshot list'),
self.btnUpdateSnapshotsClicked, ['F5', 'Ctrl+R'],
None),
'act_name_snapshot': (
icon.SNAPSHOT_NAME, _('Snapshot Name'),
icon.SNAPSHOT_NAME, _('Name snapshot'),
self.btnNameSnapshotClicked, ['F2'],
None),
'act_remove_snapshot': (
icon.REMOVE_SNAPSHOT, _('Remove Snapshot'),
icon.REMOVE_SNAPSHOT, _('Remove snapshot'),
self.btnRemoveSnapshotClicked, ['Delete'],
None),
'act_snapshot_logview': (
icon.VIEW_SNAPSHOT_LOG, _('View Snapshot Log'),
icon.VIEW_SNAPSHOT_LOG, _('View snapshot log'),
self.btnSnapshotLogViewClicked, None,
None),
'act_last_logview': (
icon.VIEW_LAST_LOG, _('View Last Log'),
icon.VIEW_LAST_LOG, _('View last log'),
self.btnLastLogViewClicked, None,
None),
'act_settings': (
icon.SETTINGS, _('Settings'),
icon.SETTINGS, _('Manage profiles…'),
self.btnSettingsClicked, ['Ctrl+Shift+,'],
None),
'act_shutdown': (
Expand All @@ -487,7 +488,7 @@ def _create_actions(self):
self.btnHelpClicked, ['F1'],
None),
'act_help_configfile': (
icon.HELP, _('Config File Help'),
icon.HELP, _('Profiles config file'),
self.btnHelpConfigClicked, None, None),
'act_help_website': (
icon.WEBSITE, _('Website'),
Expand Down Expand Up @@ -534,7 +535,7 @@ def _create_actions(self):
icon.SHOW_HIDDEN, _('Show hidden files'),
None, ['Ctrl+H'], None),
'act_snapshots_dialog': (
icon.SNAPSHOTS, _('Snapshots'),
icon.SNAPSHOTS, _('Compare snapshots…'),
self.btnSnapshotsClicked, None, None),
}

Expand Down Expand Up @@ -590,22 +591,20 @@ def _create_menubar(self):
"""Create the menubar and connect it to actions."""

menu_dict = {
_('&Snapshot'): (
'Back In &Time': (
self.act_shutdown,
self.act_quit,
),
_('&Backup'): (
self.act_take_snapshot,
self.act_take_snapshot_checksum,
self.act_update_snapshots,
self.act_settings,
self.act_snapshots_dialog,
self.act_name_snapshot,
self.act_remove_snapshot,
self.act_settings,
self.act_shutdown,
self.act_quit,
),
_('&View'): (
self.act_folder_up,
self.act_show_hidden,
self.act_snapshot_logview,
self.act_last_logview,
self.act_snapshots_dialog,
self.act_update_snapshots,
),
_('&Restore'): (
self.act_restore,
Expand All @@ -628,6 +627,7 @@ def _create_menubar(self):
for key in menu_dict:
menu = self.menuBar().addMenu(key)
menu.addActions(menu_dict[key])
menu.setToolTipsVisible(True)

# The action of the restore menu. It is used by the menuBar and by the
# files toolbar.
Expand All @@ -638,12 +638,9 @@ def _create_menubar(self):
# fine tuning.
# Attention: Take care of the actions() index here when modifying the
# main menu!
snapshot = self.menuBar().actions()[0].menu()
snapshot.insertSeparator(self.act_settings)
snapshot.insertSeparator(self.act_shutdown)
view = self.menuBar().actions()[1].menu()
view.insertSeparator(self.act_snapshot_logview)
view.insertSeparator(self.act_snapshots_dialog)
backup = self.menuBar().actions()[1].menu()
backup.insertSeparator(self.act_settings)
backup.insertSeparator(self.act_snapshot_logview)
help = self.menuBar().actions()[-1].menu()
help.insertSeparator(self.act_help_website)
help.insertSeparator(self.act_help_about)
Expand Down