RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:17:35 +00:00
Code Issues Activity Actions

Userland: Add GUI::Window::add_menu() and use it everywhere

Browse source 
Applications previously had to create a GUI::Menubar object, add menus
to it, and then call GUI::Window::set_menubar().

This patch introduces GUI::Window::add_menu() which creates the menubar
automatically and adds items to it. Application code becomes slightly
simpler as a result. :^)
This commit is contained in:
Andreas Kling 2021-07-21 21:21:03 +02:00
parent a4fdb7f029
commit 687a12d7fb
58 changed files with 187 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Applications/SoundPlayer/main.cpp
View file

@ -51,11 +51,9 @@ int main(int argc, char** argv)
window->set_title("Sound Player");
window->set_icon(app_icon.bitmap_for_size(16));
auto menubar = GUI::Menubar::construct();
auto& file_menu = window->add_menu("&File");
auto& file_menu = menubar->add_menu("&File");
auto& playlist_menu = menubar->add_menu("Play&list");
auto& playlist_menu = window->add_menu("Play&list");
String path = argv[1];
// start in advanced view by default
@ -94,7 +92,7 @@ int main(int argc, char** argv)
app->quit();
}));
auto& playback_menu = menubar->add_menu("&Playback");
auto& playback_menu = window->add_menu("&Playback");
auto loop = GUI::Action::create_checkable("&Loop", { Mod_Ctrl, Key_R }, [&](auto& action) {
player->set_looping_file(action.is_checked());
@ -102,7 +100,7 @@ int main(int argc, char** argv)
playback_menu.add_action(move(loop));
auto& visualization_menu = menubar->add_menu("&Visualization");
auto& visualization_menu = window->add_menu("&Visualization");
Vector<NonnullRefPtr<GUI::Action>> 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); };
@ -147,11 +145,9 @@ 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 = window->add_menu("&Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window));
window->set_menubar(move(menubar));
window->show();
return app->exec();
}