diff --git a/Demos/Cube/Cube.cpp b/Demos/Cube/Cube.cpp index 253e37ff97..cdb2f6c484 100644 --- a/Demos/Cube/Cube.cpp +++ b/Demos/Cube/Cube.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -206,7 +207,9 @@ int main(int argc, char** argv) cube.set_stat_label(time); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-cube.png")); + + auto app_icon = GUI::Icon::default_icon("app-cube"); + window->set_icon(app_icon.bitmap_for_size(16)); return app->exec(); } diff --git a/Demos/Eyes/main.cpp b/Demos/Eyes/main.cpp index f9d9a19392..35fcf28331 100644 --- a/Demos/Eyes/main.cpp +++ b/Demos/Eyes/main.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -78,9 +79,11 @@ int main(int argc, char* argv[]) extra_columns = num_eyes % max_in_row; } + auto app_icon = GUI::Icon::default_icon("app-eyes"); + auto window = GUI::Window::construct(); window->set_title("Eyes"); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-eyes.png")); + window->set_icon(app_icon.bitmap_for_size(16)); window->resize(75 * (full_rows > 0 ? max_in_row : extra_columns), 100 * (full_rows + (extra_columns > 0 ? 1 : 0))); window->set_has_alpha_channel(true); @@ -92,7 +95,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("Mouse Demo", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-eyes.png"), window); + GUI::AboutDialog::show("Eyes Demo", app_icon.bitmap_for_size(32), window); })); app->set_menubar(move(menubar)); diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp index 3d1c486cc7..52b4d2167b 100644 --- a/Demos/Fire/Fire.cpp +++ b/Demos/Fire/Fire.cpp @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -229,7 +230,9 @@ int main(int argc, char** argv) fire.set_stat_label(time); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-fire.png")); + + auto app_icon = GUI::Icon::default_icon("app-fire"); + window->set_icon(app_icon.bitmap_for_size(16)); return app->exec(); } diff --git a/Demos/HelloWorld/main.cpp b/Demos/HelloWorld/main.cpp index 34fe2be132..6097ca7169 100644 --- a/Demos/HelloWorld/main.cpp +++ b/Demos/HelloWorld/main.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -34,11 +35,12 @@ int main(int argc, char** argv) { auto app = GUI::Application::construct(argc, argv); + auto app_icon = GUI::Icon::default_icon("app-hello-world"); auto window = GUI::Window::construct(); window->resize(240, 160); window->set_title("Hello World!"); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-hello-world.png")); + window->set_icon(app_icon.bitmap_for_size(16)); auto& main_widget = window->set_main_widget(); main_widget.set_fill_with_background_color(true); diff --git a/Demos/LibGfxDemo/main.cpp b/Demos/LibGfxDemo/main.cpp index 07c6bc330a..d9ce949652 100644 --- a/Demos/LibGfxDemo/main.cpp +++ b/Demos/LibGfxDemo/main.cpp @@ -25,6 +25,7 @@ */ #include +#include #include #include #include @@ -203,7 +204,9 @@ int main(int argc, char** argv) window->set_title("LibGfx Demo"); window->set_resizable(false); window->resize(WIDTH, HEIGHT); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-libgfx-demo.png")); + + auto app_icon = GUI::Icon::default_icon("app-libgfx-demo"); + window->set_icon(app_icon.bitmap_for_size(16)); window->set_main_widget(); window->show(); diff --git a/Demos/Mouse/main.cpp b/Demos/Mouse/main.cpp index 2e6d5cc89b..0146cf376b 100644 --- a/Demos/Mouse/main.cpp +++ b/Demos/Mouse/main.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -172,9 +173,11 @@ private: int main(int argc, char** argv) { auto app = GUI::Application::construct(argc, argv); + auto app_icon = GUI::Icon::default_icon("app-mouse"); + auto window = GUI::Window::construct(); window->set_title("Mouse button demo"); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-mouse.png")); + window->set_icon(app_icon.bitmap_for_size(16)); window->resize(160, 155); auto& main_widget = window->set_main_widget(); @@ -186,7 +189,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("Mouse Demo", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-mouse.png"), window); + GUI::AboutDialog::show("Mouse Demo", app_icon.bitmap_for_size(32), window); })); app->set_menubar(move(menubar)); diff --git a/Demos/Screensaver/Screensaver.cpp b/Demos/Screensaver/Screensaver.cpp index 4af86a7810..593c80958a 100644 --- a/Demos/Screensaver/Screensaver.cpp +++ b/Demos/Screensaver/Screensaver.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -145,7 +146,9 @@ int main(int argc, char** argv) screensaver_window.update(); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-screensaver.png")); + + auto app_icon = GUI::Icon::default_icon("app-screensaver"); + window->set_icon(app_icon.bitmap_for_size(16)); return app->exec(); }