diff --git a/Applications/Calculator/main.cpp b/Applications/Calculator/main.cpp index 85dd112d86c..f38251eb42e 100644 --- a/Applications/Calculator/main.cpp +++ b/Applications/Calculator/main.cpp @@ -1,5 +1,9 @@ #include "CalculatorWidget.h" +#include +#include +#include #include +#include #include int main(int argc, char** argv) @@ -16,5 +20,23 @@ int main(int argc, char** argv) window->show(); window->set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/app-calculator.png")); + + auto menubar = make(); + + auto app_menu = GMenu::construct("Calculator"); + app_menu->add_action(GCommonActions::make_quit_action([](auto&) { + GApplication::the().quit(0); + return; + })); + menubar->add_menu(move(app_menu)); + + auto help_menu = GMenu::construct("Help"); + help_menu->add_action(GAction::create("About", [&](const GAction&) { + GAboutDialog::show("Calculator", load_png("/res/icons/16x16/app-calculator.png"), window); + })); + menubar->add_menu(move(help_menu)); + + app.set_menubar(move(menubar)); + return app.exec(); } diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp index e84fd063682..7b977fdddfa 100644 --- a/Applications/ChanViewer/main.cpp +++ b/Applications/ChanViewer/main.cpp @@ -1,9 +1,12 @@ #include "BoardListModel.h" #include "ThreadCatalogModel.h" #include +#include +#include #include #include #include +#include #include #include #include @@ -53,5 +56,22 @@ int main(int argc, char** argv) window->show(); + auto menubar = make(); + + auto app_menu = GMenu::construct("ChanViewer"); + app_menu->add_action(GCommonActions::make_quit_action([](auto&) { + GApplication::the().quit(0); + return; + })); + menubar->add_menu(move(app_menu)); + + auto help_menu = GMenu::construct("Help"); + help_menu->add_action(GAction::create("About", [&](const GAction&) { + GAboutDialog::show("ChanViewer", load_png("/res/icons/32x32/app-chanviewer.png"), window); + })); + menubar->add_menu(move(help_menu)); + + app.set_menubar(move(menubar)); + return app.exec(); } diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index 100ee3e9299..2fa94cbcd2f 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -383,8 +384,8 @@ int main(int argc, char** argv) menubar->add_menu(move(go_menu)); auto help_menu = GMenu::construct("Help"); - help_menu->add_action(GAction::create("About", [](const GAction&) { - dbgprintf("FIXME: Implement Help/About\n"); + help_menu->add_action(GAction::create("About", [&](const GAction&) { + GAboutDialog::show("File Manager", load_png("/res/icons/32x32/filetype-folder.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp index 109e4a1151b..110c37b35e3 100644 --- a/Applications/FontEditor/main.cpp +++ b/Applications/FontEditor/main.cpp @@ -1,6 +1,9 @@ #include "FontEditor.h" #include +#include +#include #include +#include #include #include @@ -28,9 +31,28 @@ int main(int argc, char** argv) auto window = GWindow::construct(); window->set_title("Font Editor"); window->set_rect({ 50, 50, 390, 342 }); + auto font_editor = FontEditorWidget::construct(path, move(edited_font)); window->set_main_widget(font_editor); window->show(); window->set_icon(load_png("/res/icons/16x16/app-font-editor.png")); + + auto menubar = make(); + + auto app_menu = GMenu::construct("Font Editor"); + app_menu->add_action(GCommonActions::make_quit_action([](auto&) { + GApplication::the().quit(0); + return; + })); + menubar->add_menu(move(app_menu)); + + auto help_menu = GMenu::construct("Help"); + help_menu->add_action(GAction::create("About", [&](const GAction&) { + GAboutDialog::show("Font Editor", load_png("/res/icons/FontEditor.png"), window); + })); + menubar->add_menu(move(help_menu)); + + app.set_menubar(move(menubar)); + return app.exec(); } diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp index 15517403a38..97ed3b0b505 100644 --- a/Applications/Piano/main.cpp +++ b/Applications/Piano/main.cpp @@ -3,9 +3,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -51,6 +51,12 @@ int main(int argc, char** argv) })); menubar->add_menu(move(app_menu)); + auto help_menu = GMenu::construct("Help"); + help_menu->add_action(GAction::create("About", [&](const GAction&) { + GAboutDialog::show("Piano", load_png("/res/icons/32x32/app-piano.png"), window); + })); + menubar->add_menu(move(help_menu)); + app.set_menubar(move(menubar)); return app.exec(); diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp index 80f4ad71c69..c0bc6da9982 100644 --- a/Games/Minesweeper/main.cpp +++ b/Games/Minesweeper/main.cpp @@ -1,6 +1,7 @@ #include "Field.h" #include #include +#include #include #include #include @@ -89,8 +90,8 @@ int main(int argc, char** argv) menubar->add_menu(move(difficulty_menu)); auto help_menu = GMenu::construct("Help"); - help_menu->add_action(GAction::create("About", [](const GAction&) { - dbgprintf("FIXME: Implement Help/About\n"); + help_menu->add_action(GAction::create("About", [&](const GAction&) { + GAboutDialog::show("Minesweeper", load_png("/res/icons/32x32/app-minesweeper.png"), window); })); menubar->add_menu(move(help_menu)); diff --git a/Games/Snake/main.cpp b/Games/Snake/main.cpp index e5b75c86b3b..70290b2dca7 100644 --- a/Games/Snake/main.cpp +++ b/Games/Snake/main.cpp @@ -1,5 +1,6 @@ #include "SnakeGame.h" #include +#include #include #include #include @@ -35,8 +36,8 @@ int main(int argc, char** argv) menubar->add_menu(move(app_menu)); auto help_menu = GMenu::construct("Help"); - help_menu->add_action(GAction::create("About", [](const GAction&) { - dbgprintf("FIXME: Implement Help/About\n"); + help_menu->add_action(GAction::create("About", [&](const GAction&) { + GAboutDialog::show("Snake", load_png("/res/icons/32x32/app-snake.png"), window); })); menubar->add_menu(move(help_menu));