From 91eda222087048fef131a1bc39bcda947bce2288 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Wed, 12 May 2021 18:09:42 +0100 Subject: [PATCH] Everywhere: Add Alt shortcuts to remaining top-level menus Not sure why some menus did have one and others didn't, even in the same application - now they all do. :^) I added character shortcuts to some menu actions as well. --- Userland/Applications/DisplaySettings/main.cpp | 4 ++-- Userland/Applications/Help/main.cpp | 2 +- Userland/Applications/IRCClient/IRCAppWindow.cpp | 2 +- Userland/Applications/KeyboardMapper/main.cpp | 2 +- Userland/Applications/KeyboardSettings/main.cpp | 4 ++-- Userland/Applications/MouseSettings/main.cpp | 5 +++-- Userland/Applications/Piano/main.cpp | 6 +++--- Userland/Applications/SoundPlayer/main.cpp | 8 ++++---- Userland/Applications/SpaceAnalyzer/main.cpp | 6 ++++-- Userland/Applications/Spreadsheet/main.cpp | 4 ++-- Userland/Demos/CatDog/main.cpp | 7 +++++-- Userland/Demos/Cube/Cube.cpp | 4 ++-- Userland/Demos/Eyes/main.cpp | 2 +- Userland/Demos/Fire/Fire.cpp | 2 +- Userland/Demos/LibGfxDemo/main.cpp | 2 +- Userland/Demos/LibGfxScaleDemo/main.cpp | 2 +- Userland/Demos/Mouse/main.cpp | 2 +- Userland/DevTools/HackStudio/HackStudioWidget.cpp | 2 +- Userland/DevTools/Inspector/main.cpp | 3 ++- Userland/Games/Breakout/main.cpp | 2 +- Userland/Games/Conway/main.cpp | 6 +++--- Userland/Games/Minesweeper/main.cpp | 12 ++++++------ Userland/Games/Solitaire/main.cpp | 2 +- 23 files changed, 49 insertions(+), 42 deletions(-) diff --git a/Userland/Applications/DisplaySettings/main.cpp b/Userland/Applications/DisplaySettings/main.cpp index 9ac238066b..66e0df7554 100644 --- a/Userland/Applications/DisplaySettings/main.cpp +++ b/Userland/Applications/DisplaySettings/main.cpp @@ -48,12 +48,12 @@ int main(int argc, char** argv) auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](const GUI::Action&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Display Settings", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Applications/Help/main.cpp b/Userland/Applications/Help/main.cpp index 9c046061fd..a3d01ba6bf 100644 --- a/Userland/Applications/Help/main.cpp +++ b/Userland/Applications/Help/main.cpp @@ -261,7 +261,7 @@ int main(int argc, char* argv[]) GUI::Application::the()->quit(); })); - auto& go_menu = menubar->add_menu("Go"); + auto& go_menu = menubar->add_menu("&Go"); go_menu.add_action(*go_back_action); go_menu.add_action(*go_forward_action); go_menu.add_action(*go_home_action); diff --git a/Userland/Applications/IRCClient/IRCAppWindow.cpp b/Userland/Applications/IRCClient/IRCAppWindow.cpp index 49fa211f2a..5d84b37ab1 100644 --- a/Userland/Applications/IRCClient/IRCAppWindow.cpp +++ b/Userland/Applications/IRCClient/IRCAppWindow.cpp @@ -243,7 +243,7 @@ void IRCAppWindow::setup_menus() GUI::Application::the()->quit(); })); - auto& server_menu = menubar->add_menu("Server"); + auto& server_menu = menubar->add_menu("&Server"); server_menu.add_action(*m_change_nick_action); server_menu.add_separator(); server_menu.add_action(*m_join_action); diff --git a/Userland/Applications/KeyboardMapper/main.cpp b/Userland/Applications/KeyboardMapper/main.cpp index 086a5408b5..e5480a12df 100644 --- a/Userland/Applications/KeyboardMapper/main.cpp +++ b/Userland/Applications/KeyboardMapper/main.cpp @@ -93,7 +93,7 @@ int main(int argc, char** argv) file_menu.add_separator(); file_menu.add_action(quit_action); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Mapper", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Applications/KeyboardSettings/main.cpp b/Userland/Applications/KeyboardSettings/main.cpp index 41f74df61b..83a6ce297d 100644 --- a/Userland/Applications/KeyboardSettings/main.cpp +++ b/Userland/Applications/KeyboardSettings/main.cpp @@ -168,10 +168,10 @@ int main(int argc, char** argv) auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(quit_action); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Settings", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Applications/MouseSettings/main.cpp b/Userland/Applications/MouseSettings/main.cpp index 9af79afc6a..ffea258b4d 100644 --- a/Userland/Applications/MouseSettings/main.cpp +++ b/Userland/Applications/MouseSettings/main.cpp @@ -37,13 +37,14 @@ int main(int argc, char** argv) window->set_icon(app_icon.bitmap_for_size(16)); auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Mouse Settings", app_icon, window)); + window->set_menubar(move(menubar)); window->show(); diff --git a/Userland/Applications/Piano/main.cpp b/Userland/Applications/Piano/main.cpp index b29a038765..a584d2331f 100644 --- a/Userland/Applications/Piano/main.cpp +++ b/Userland/Applications/Piano/main.cpp @@ -91,7 +91,7 @@ int main(int argc, char** argv) auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::Action::create("Export", { Mod_Ctrl, Key_E }, [&](const GUI::Action&) { save_path = GUI::FilePicker::get_save_filepath(window, "Untitled", "wav"); if (!save_path.has_value()) @@ -110,10 +110,10 @@ int main(int argc, char** argv) return; })); - auto& edit_menu = menubar->add_menu("Edit"); + auto& edit_menu = menubar->add_menu("&Edit"); main_widget.add_actions(edit_menu); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Piano", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Applications/SoundPlayer/main.cpp b/Userland/Applications/SoundPlayer/main.cpp index ce95f7c125..e4f56f133d 100644 --- a/Userland/Applications/SoundPlayer/main.cpp +++ b/Userland/Applications/SoundPlayer/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char** argv) auto& file_menu = menubar->add_menu("&File"); - auto& playlist_menu = menubar->add_menu("Playlist"); + auto& playlist_menu = menubar->add_menu("Play&list"); String path = argv[1]; // start in advanced view by default @@ -101,7 +101,7 @@ int main(int argc, char** argv) app->quit(); })); - auto& playback_menu = menubar->add_menu("Playback"); + auto& playback_menu = menubar->add_menu("&Playback"); auto loop = GUI::Action::create_checkable("Loop", { Mod_Ctrl, Key_R }, [&](auto& action) { player->set_looping_file(action.is_checked()); @@ -109,7 +109,7 @@ int main(int argc, char** argv) playback_menu.add_action(move(loop)); - auto& visualization_menu = menubar->add_menu("Visualization"); + auto& visualization_menu = menubar->add_menu("&Visualization"); Vector> visualization_checkmarks; GUI::Action* checked_vis = nullptr; auto uncheck_all_but = [&](GUI::Action& one) {for (auto& a : visualization_checkmarks) if (a != &one) a->set_checked(false); }; @@ -154,7 +154,7 @@ int main(int argc, char** argv) visualization_menu.add_action(none); visualization_checkmarks.append(none); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Applications/SpaceAnalyzer/main.cpp b/Userland/Applications/SpaceAnalyzer/main.cpp index c5d052f477..899bc07a08 100644 --- a/Userland/Applications/SpaceAnalyzer/main.cpp +++ b/Userland/Applications/SpaceAnalyzer/main.cpp @@ -269,8 +269,8 @@ int main(int argc, char* argv[]) auto& treemapwidget = *mainwidget.find_descendant_of_type_named("tree_map"); auto& statusbar = *mainwidget.find_descendant_of_type_named("statusbar"); - // Configure the menubar. auto menubar = GUI::Menubar::construct(); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::Action::create("&Analyze", [&](auto&) { analyze(tree, treemapwidget, statusbar); @@ -278,8 +278,10 @@ int main(int argc, char* argv[]) file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action(APP_NAME, app_icon, window)); + window->set_menubar(move(menubar)); // Configure the nodes context menu. diff --git a/Userland/Applications/Spreadsheet/main.cpp b/Userland/Applications/Spreadsheet/main.cpp index 00a546b5a0..b92e05241b 100644 --- a/Userland/Applications/Spreadsheet/main.cpp +++ b/Userland/Applications/Spreadsheet/main.cpp @@ -143,7 +143,7 @@ int main(int argc, char* argv[]) return GUI::Window::CloseRequestDecision::StayOpen; }; - auto& edit_menu = menubar->add_menu("Edit"); + auto& edit_menu = menubar->add_menu("&Edit"); auto clipboard_action = [&](bool is_cut) { /// text/x-spreadsheet-data: @@ -233,7 +233,7 @@ int main(int argc, char* argv[]) }, window)); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::Action::create( "Functions Help", [&](auto&) { diff --git a/Userland/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp index 302a285eba..5567317837 100644 --- a/Userland/Demos/CatDog/main.cpp +++ b/Userland/Demos/CatDog/main.cpp @@ -54,10 +54,13 @@ int main(int argc, char** argv) catdog_widget.layout()->set_spacing(0); auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("CatDog Demo", app_icon, window)); + window->set_menubar(move(menubar)); window->show(); diff --git a/Userland/Demos/Cube/Cube.cpp b/Userland/Demos/Cube/Cube.cpp index cc64e3e81f..b3afab088a 100644 --- a/Userland/Demos/Cube/Cube.cpp +++ b/Userland/Demos/Cube/Cube.cpp @@ -243,7 +243,7 @@ int main(int argc, char** argv) auto menubar = GUI::Menubar::construct(); auto& file_menu = menubar->add_menu("&File"); - auto show_window_frame_action = GUI::Action::create_checkable("Show window frame", [&](auto& action) { + auto show_window_frame_action = GUI::Action::create_checkable("Show Window &Frame", [&](auto& action) { cube.set_show_window_frame(action.is_checked()); }); @@ -252,7 +252,7 @@ int main(int argc, char** argv) file_menu.add_action(move(show_window_frame_action)); file_menu.add_separator(); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Cube Demo", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Demos/Eyes/main.cpp b/Userland/Demos/Eyes/main.cpp index 5932731be6..f54ada300a 100644 --- a/Userland/Demos/Eyes/main.cpp +++ b/Userland/Demos/Eyes/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Eyes Demo", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Demos/Fire/Fire.cpp b/Userland/Demos/Fire/Fire.cpp index 05aba6395d..5d5898cfe1 100644 --- a/Userland/Demos/Fire/Fire.cpp +++ b/Userland/Demos/Fire/Fire.cpp @@ -220,7 +220,7 @@ int main(int argc, char** argv) window->resize(640, 400); auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); window->set_menubar(move(menubar)); diff --git a/Userland/Demos/LibGfxDemo/main.cpp b/Userland/Demos/LibGfxDemo/main.cpp index d1fbe9e24c..30dcefcb59 100644 --- a/Userland/Demos/LibGfxDemo/main.cpp +++ b/Userland/Demos/LibGfxDemo/main.cpp @@ -206,7 +206,7 @@ int main(int argc, char** argv) window->resize(WIDTH, HEIGHT); auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); window->set_menubar(move(menubar)); diff --git a/Userland/Demos/LibGfxScaleDemo/main.cpp b/Userland/Demos/LibGfxScaleDemo/main.cpp index 913e0b33c0..11aa014aed 100644 --- a/Userland/Demos/LibGfxScaleDemo/main.cpp +++ b/Userland/Demos/LibGfxScaleDemo/main.cpp @@ -127,7 +127,7 @@ int main(int argc, char** argv) window->resize(WIDTH * 2, HEIGHT * 3); auto menubar = GUI::Menubar::construct(); - auto& file_menu = menubar->add_menu("File"); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); window->set_menubar(move(menubar)); diff --git a/Userland/Demos/Mouse/main.cpp b/Userland/Demos/Mouse/main.cpp index d4e682ee8e..ec3a8c8216 100644 --- a/Userland/Demos/Mouse/main.cpp +++ b/Userland/Demos/Mouse/main.cpp @@ -182,7 +182,7 @@ int main(int argc, char** argv) auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Mouse Demo", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp index 07f7569940..d71c7cdae4 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp +++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp @@ -968,7 +968,7 @@ void HackStudioWidget::create_view_menubar(GUI::Menubar& menubar) void HackStudioWidget::create_help_menubar(GUI::Menubar& menubar) { - auto& help_menu = menubar.add_menu("Help"); + auto& help_menu = menubar.add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Hack Studio", GUI::Icon::default_icon("app-hack-studio"), window())); } diff --git a/Userland/DevTools/Inspector/main.cpp b/Userland/DevTools/Inspector/main.cpp index 2b25fabbf9..d3c7962036 100644 --- a/Userland/DevTools/Inspector/main.cpp +++ b/Userland/DevTools/Inspector/main.cpp @@ -115,10 +115,11 @@ int main(int argc, char** argv) window->set_icon(app_icon.bitmap_for_size(16)); auto menubar = GUI::Menubar::construct(); + auto& file_menu = menubar->add_menu("&File"); file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) { Desktop::Launcher::open(URL::create_with_file_protocol("/usr/share/man/man1/Inspector.md"), "/bin/Help"); })); diff --git a/Userland/Games/Breakout/main.cpp b/Userland/Games/Breakout/main.cpp index 8ccd78cecb..38e3cbf9fc 100644 --- a/Userland/Games/Breakout/main.cpp +++ b/Userland/Games/Breakout/main.cpp @@ -60,7 +60,7 @@ int main(int argc, char** argv) GUI::Application::the()->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Breakout", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Games/Conway/main.cpp b/Userland/Games/Conway/main.cpp index 2930def217..77d84c8382 100644 --- a/Userland/Games/Conway/main.cpp +++ b/Userland/Games/Conway/main.cpp @@ -51,9 +51,9 @@ int main(int argc, char** argv) auto menubar = GUI::Menubar::construct(); - auto& game_menu = menubar->add_menu("Game"); + auto& game_menu = menubar->add_menu("&Game"); - game_menu.add_action(GUI::Action::create("Reset", { Mod_None, Key_F2 }, [&](auto&) { + game_menu.add_action(GUI::Action::create("&Reset", { Mod_None, Key_F2 }, [&](auto&) { game.reset(); })); game_menu.add_separator(); @@ -61,7 +61,7 @@ int main(int argc, char** argv) GUI::Application::the()->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Conway", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp index e08a898b4d..8b6d9084a9 100644 --- a/Userland/Games/Minesweeper/main.cpp +++ b/Userland/Games/Minesweeper/main.cpp @@ -125,21 +125,21 @@ int main(int argc, char** argv) GUI::Application::the()->quit(); })); - auto& difficulty_menu = menubar->add_menu("Difficulty"); - difficulty_menu.add_action(GUI::Action::create("Beginner", { Mod_Ctrl, Key_B }, [&](auto&) { + auto& difficulty_menu = menubar->add_menu("&Difficulty"); + difficulty_menu.add_action(GUI::Action::create("&Beginner", { Mod_Ctrl, Key_B }, [&](auto&) { field.set_field_size(9, 9, 10); })); - difficulty_menu.add_action(GUI::Action::create("Intermediate", { Mod_Ctrl, Key_I }, [&](auto&) { + difficulty_menu.add_action(GUI::Action::create("&Intermediate", { Mod_Ctrl, Key_I }, [&](auto&) { field.set_field_size(16, 16, 40); })); - difficulty_menu.add_action(GUI::Action::create("Expert", { Mod_Ctrl, Key_E }, [&](auto&) { + difficulty_menu.add_action(GUI::Action::create("&Expert", { Mod_Ctrl, Key_E }, [&](auto&) { field.set_field_size(16, 30, 99); })); - difficulty_menu.add_action(GUI::Action::create("Madwoman", { Mod_Ctrl, Key_M }, [&](auto&) { + difficulty_menu.add_action(GUI::Action::create("&Madwoman", { Mod_Ctrl, Key_M }, [&](auto&) { field.set_field_size(32, 60, 350); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Minesweeper", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp index 76d3679844..5a34ac1a64 100644 --- a/Userland/Games/Solitaire/main.cpp +++ b/Userland/Games/Solitaire/main.cpp @@ -95,7 +95,7 @@ int main(int argc, char** argv) game_menu.add_separator(); game_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); - auto& help_menu = menubar->add_menu("Help"); + auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window)); window->set_resizable(false);