Skip to content

Commit

Permalink
Shortcuts for Layouts and Help menu actions
Browse files Browse the repository at this point in the history
They were missing. This should really be all actions now, there's none
left without shortcut assignability as far as I can tell. The Layouts
shortcut is F8 by default.
  • Loading branch information
askmeaboutlo0m committed Aug 23, 2023
1 parent 6145a61 commit 4f72944
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Unreleased Version 2.2.0-pre
* Fix: Don't tabify the now invisible-by-default timeline and onion skins by default. Thanks Ben for finding.
* Fix: Make the flipbook remember your last crop, frame range and playback speed for the current window. Thanks Ben for finding.
* Fix: Don't mark guests as registered. Thanks to xxxx for reporting.
* Fix: Allow assigning a shortcut to open the Layouts dialog (F9 by default) and to the entries in the Help menu (nothing by default.)

2023-07-31 Version 2.2.0-beta.6
* Fix: Don't forget account password when entering a wrong session password.
Expand Down
14 changes: 7 additions & 7 deletions src/desktop/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3196,7 +3196,7 @@ void MainWindow::setupActions()
//
// View menu
//
QAction *layoutsAction = makeAction("layouts", tr("&Layouts...")).icon("window_");
QAction *layoutsAction = makeAction("layouts", tr("&Layouts...")).icon("window_").shortcut("F9");

QAction *toolbartoggles = new QAction(tr("&Toolbars"), this);
toolbartoggles->setMenu(toggletoolbarmenu);
Expand Down Expand Up @@ -3677,12 +3677,12 @@ void MainWindow::setupActions()
//
// Help menu
//
QAction *homepage = makeAction("dphomepage", tr("&Homepage")).statusTip(cmake_config::website());
QAction *tablettester = makeAction("tablettester", tr("Tablet Tester"));
QAction *showlogfile = makeAction("showlogfile", tr("Log File"));
QAction *about = makeAction("dpabout", tr("&About Drawpile")).menuRole(QAction::AboutRole);
QAction *aboutqt = makeAction("aboutqt", tr("About &Qt")).menuRole(QAction::AboutQtRole);
QAction *versioncheck = makeAction("versioncheck", tr("Check For Updates"));
QAction *homepage = makeAction("dphomepage", tr("&Homepage")).statusTip(cmake_config::website()).noDefaultShortcut();
QAction *tablettester = makeAction("tablettester", tr("Tablet Tester")).noDefaultShortcut();
QAction *showlogfile = makeAction("showlogfile", tr("Log File")).noDefaultShortcut();
QAction *about = makeAction("dpabout", tr("&About Drawpile")).menuRole(QAction::AboutRole).noDefaultShortcut();
QAction *aboutqt = makeAction("aboutqt", tr("About &Qt")).menuRole(QAction::AboutQtRole).noDefaultShortcut();
QAction *versioncheck = makeAction("versioncheck", tr("Check For Updates")).noDefaultShortcut();

connect(homepage, &QAction::triggered, &MainWindow::homepage);
connect(about, &QAction::triggered, &MainWindow::about);
Expand Down

0 comments on commit 4f72944

Please sign in to comment.