From 7c5e488de2802b331b632c844e3dc3758fc388da Mon Sep 17 00:00:00 2001 From: Brendan Coles Date: Sat, 31 Oct 2020 21:58:52 +0000 Subject: [PATCH] Games: Use GUI::Icon::default_icon to set application icon --- Games/2048/main.cpp | 6 ++++-- Games/Chess/main.cpp | 9 +++++---- Games/Minesweeper/main.cpp | 7 +++++-- Games/Snake/main.cpp | 7 +++++-- Games/Solitaire/main.cpp | 6 ++++-- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Games/2048/main.cpp b/Games/2048/main.cpp index 929f8b59d7..3a6615f9e3 100644 --- a/Games/2048/main.cpp +++ b/Games/2048/main.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,7 @@ int main(int argc, char** argv) srand(time(nullptr)); auto app = GUI::Application::construct(argc, argv); + auto app_icon = GUI::Icon::default_icon("app-2048"); auto window = GUI::Window::construct(); @@ -203,14 +205,14 @@ int main(int argc, char** argv) auto& help_menu = menubar->add_menu("Help"); help_menu.add_action(GUI::Action::create("About", [&](auto&) { - GUI::AboutDialog::show("2048", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-2048.png"), window); + GUI::AboutDialog::show("2048", app_icon.bitmap_for_size(32), window); })); app->set_menubar(move(menubar)); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-2048.png")); + window->set_icon(app_icon.bitmap_for_size(16)); return app->exec(); } diff --git a/Games/Chess/main.cpp b/Games/Chess/main.cpp index 3f37928a90..5f2d7c6f41 100644 --- a/Games/Chess/main.cpp +++ b/Games/Chess/main.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,7 @@ int main(int argc, char** argv) { auto app = GUI::Application::construct(argc, argv); + auto app_icon = GUI::Icon::default_icon("app-chess"); auto window = GUI::Window::construct(); auto& widget = window->set_main_widget(); @@ -49,8 +51,7 @@ int main(int argc, char** argv) window->set_size_increment({ 8, 8 }); window->set_resize_aspect_ratio(1, 1); - auto icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/app-chess.png"); - window->set_icon(icon); + window->set_icon(app_icon.bitmap_for_size(16)); widget.set_piece_set(config->read_entry("Style", "PieceSet", "test")); widget.set_board_theme(config->read_entry("Style", "BoardTheme", "Beige")); @@ -71,7 +72,7 @@ int main(int argc, char** argv) GUI::ActionGroup piece_set_action_group; piece_set_action_group.set_exclusive(true); auto& piece_set_menu = style_menu.add_submenu("Piece Set"); - piece_set_menu.set_icon(icon); + piece_set_menu.set_icon(app_icon.bitmap_for_size(16)); Core::DirIterator di("/res/icons/chess/sets/", Core::DirIterator::SkipParentAndBaseDir); while (di.has_next()) { @@ -139,7 +140,7 @@ int main(int argc, char** argv) auto& help_menu = menubar->add_menu("Help"); help_menu.add_action(GUI::Action::create("About", [&](auto&) { - GUI::AboutDialog::show("Chess", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-chess.png"), window); + GUI::AboutDialog::show("Chess", app_icon.bitmap_for_size(32), window); })); app->set_menubar(move(menubar)); diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp index c9b1a6968f..386e94c329 100644 --- a/Games/Minesweeper/main.cpp +++ b/Games/Minesweeper/main.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +53,8 @@ int main(int argc, char** argv) return 1; } + auto app_icon = GUI::Icon::default_icon("app-minesweeper"); + auto window = GUI::Window::construct(); window->set_resizable(false); window->set_title("Minesweeper"); @@ -124,14 +127,14 @@ int main(int argc, char** argv) auto& help_menu = menubar->add_menu("Help"); help_menu.add_action(GUI::Action::create("About", [&](auto&) { - GUI::AboutDialog::show("Minesweeper", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-minesweeper.png"), window); + GUI::AboutDialog::show("Minesweeper", app_icon.bitmap_for_size(32), window); })); app->set_menubar(move(menubar)); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/minesweeper/mine.png")); + window->set_icon(app_icon.bitmap_for_size(16)); return app->exec(); } diff --git a/Games/Snake/main.cpp b/Games/Snake/main.cpp index e0f0aca8c9..26b01aab28 100644 --- a/Games/Snake/main.cpp +++ b/Games/Snake/main.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -49,6 +50,8 @@ int main(int argc, char** argv) return 1; } + auto app_icon = GUI::Icon::default_icon("app-snake"); + auto window = GUI::Window::construct(); window->set_double_buffering_enabled(false); @@ -71,14 +74,14 @@ int main(int argc, char** argv) auto& help_menu = menubar->add_menu("Help"); help_menu.add_action(GUI::Action::create("About", [&](auto&) { - GUI::AboutDialog::show("Snake", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-snake.png"), window); + GUI::AboutDialog::show("Snake", app_icon.bitmap_for_size(32), window); })); app->set_menubar(move(menubar)); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-snake.png")); + window->set_icon(app_icon.bitmap_for_size(16)); return app->exec(); } diff --git a/Games/Solitaire/main.cpp b/Games/Solitaire/main.cpp index ea46bf41ea..9f809ed0b7 100644 --- a/Games/Solitaire/main.cpp +++ b/Games/Solitaire/main.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,7 @@ int main(int argc, char** argv) { auto app = GUI::Application::construct(argc, argv); + auto app_icon = GUI::Icon::default_icon("app-solitaire"); if (pledge("stdio rpath shared_buffer", nullptr) < 0) { perror("pledge"); @@ -63,12 +65,12 @@ int main(int argc, char** argv) auto& help_menu = menubar->add_menu("Help"); help_menu.add_action(GUI::Action::create("About", [&](auto&) { - GUI::AboutDialog::show("Solitaire", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-solitaire.png"), window); + GUI::AboutDialog::show("Solitaire", app_icon.bitmap_for_size(32), window); })); app->set_menubar(move(menubar)); window->set_main_widget(widget); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-solitaire.png")); + window->set_icon(app_icon.bitmap_for_size(16)); window->show(); widget->setup();