RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 18:57:36 +00:00
Code Issues Activity Actions

Userland: Turn all application menus into window menus :^)

Browse source
This commit is contained in:
Andreas Kling 2021-03-25 21:41:39 +01:00
parent fcc8e3484f
commit 78b12e1521
47 changed files with 100 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/2048/main.cpp
View file

@ -180,7 +180,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("2048");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::Action::create("New game", { Mod_None, Key_F2 }, [&](auto&) {
start_a_new_game();
@ -206,7 +206,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("2048", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();

6
Userland/Games/Breakout/main.cpp
View file

@ -69,23 +69,21 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Breakout");
auto& app_menu = menubar->add_menu("Game");
app_menu.add_action(GUI::Action::create_checkable("Pause", { {}, Key_P }, [&](auto& action) {
game.set_paused(action.is_checked());
return;
}));
app_menu.add_separator();
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
GUI::Application::the()->quit();
return;
}));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Breakout", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
return app->exec();
}

4
Userland/Games/Chess/main.cpp
View file

@ -96,7 +96,7 @@ int main(int argc, char** argv)
widget.set_coordinates(config->read_bool_entry("Style", "Coordinates", true));
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Chess");
auto& app_menu = menubar->add_menu("Game");
app_menu.add_action(GUI::Action::create("Resign", { Mod_None, Key_F3 }, [&](auto&) {
widget.resign();
@ -223,7 +223,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Chess", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
widget.reset();

4
Userland/Games/Conway/main.cpp
View file

@ -71,7 +71,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Conway");
auto& app_menu = menubar->add_menu("Game");
app_menu.add_action(GUI::Action::create("Reset", { Mod_None, Key_F2 }, [&](auto&) {
game.reset();
@ -84,7 +84,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Conway", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();

4
Userland/Games/Minesweeper/main.cpp
View file

@ -105,7 +105,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Minesweeper");
auto& app_menu = menubar->add_menu("Game");
app_menu.add_action(GUI::Action::create("New game", { Mod_None, Key_F2 }, [&](auto&) {
field.reset();
@ -143,7 +143,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Minesweeper", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();

5
Userland/Games/Pong/main.cpp
View file

@ -76,16 +76,15 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Pong");
auto& app_menu = menubar->add_menu("Game");
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
GUI::Application::the()->quit();
return;
}));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Pong", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
return app->exec();
}

4
Userland/Games/Snake/main.cpp
View file

@ -80,7 +80,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Snake");
auto& app_menu = menubar->add_menu("Game");
app_menu.add_action(GUI::Action::create("New game", { Mod_None, Key_F2 }, [&](auto&) {
game.reset();
@ -93,7 +93,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Snake", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();

4
Userland/Games/Solitaire/main.cpp
View file

@ -64,7 +64,7 @@ int main(int argc, char** argv)
});
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Solitaire");
auto& app_menu = menubar->add_menu("Game");
app_menu.add_action(GUI::Action::create("New game", { Mod_None, Key_F2 }, [&](auto&) {
widget->setup();
@ -75,7 +75,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->set_main_widget(widget);
window->set_icon(app_icon.bitmap_for_size(16));
window->show();