Skip to content

Commit

Permalink
Base+Userland: Add various icons
Browse files Browse the repository at this point in the history
Add new icons to menus, add existing icons that could be used in menus.
  • Loading branch information
electrikmilk authored and linusg committed Jan 12, 2022
1 parent 64ae8ea commit 34c5d33
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Binary file added Base/res/icons/16x16/code.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Base/res/icons/16x16/inspect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Userland/Applications/Browser/BrowserWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void BrowserWindow::build_menus()
});

m_view_source_action = GUI::Action::create(
"View &Source", { Mod_Ctrl, Key_U }, [this](auto&) {
"View &Source", { Mod_Ctrl, Key_U }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/code.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) {
active_tab().m_web_content_view->get_source();
},
this);
Expand All @@ -211,7 +211,7 @@ void BrowserWindow::build_menus()
m_inspect_dom_tree_action->set_status_tip("Open inspector window for this page");

m_inspect_dom_node_action = GUI::Action::create(
"&Inspect Element", [this](auto&) {
"&Inspect Element", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/inspect.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) {
active_tab().show_inspector_window(Tab::InspectorTarget::HoveredElement);
},
this);
Expand All @@ -222,7 +222,7 @@ void BrowserWindow::build_menus()
inspect_menu.add_action(*m_inspect_dom_tree_action);

auto js_console_action = GUI::Action::create(
"Open &JS Console", { Mod_Ctrl, Key_I }, [this](auto&) {
"Open &JS Console", { Mod_Ctrl, Key_I }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-javascript.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) {
active_tab().show_console_window();
},
this);
Expand Down
2 changes: 1 addition & 1 deletion Userland/Applications/FileManager/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ ErrorOr<int> run_in_windowed_mode(String const& initial_location, String const&
TRY(view_menu->try_add_separator());
TRY(view_menu->try_add_action(action_show_dotfiles));

auto go_to_location_action = GUI::Action::create("Go to &Location...", { Mod_Ctrl, Key_L }, [&](auto&) {
auto go_to_location_action = GUI::Action::create("Go to &Location...", { Mod_Ctrl, Key_L }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-to.png").release_value_but_fixme_should_propagate_errors(), [&](auto&) {
toolbar_container.set_visible(true);
location_toolbar.set_visible(true);
breadcrumb_toolbar.set_visible(false);
Expand Down
6 changes: 3 additions & 3 deletions Userland/Applications/ImageViewer/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
widget->rotate(Gfx::RotationDirection::Clockwise);
});

auto vertical_flip_action = GUI::Action::create("Flip &Vertically", { Mod_None, Key_V },
auto vertical_flip_action = GUI::Action::create("Flip &Vertically", { Mod_None, Key_V }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-vertical.png")),
[&](auto&) {
widget->flip(Gfx::Orientation::Vertical);
});

auto horizontal_flip_action = GUI::Action::create("Flip &Horizontally", { Mod_None, Key_H },
auto horizontal_flip_action = GUI::Action::create("Flip &Horizontally", { Mod_None, Key_H }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-horizontal.png")),
[&](auto&) {
widget->flip(Gfx::Orientation::Horizontal);
});

auto desktop_wallpaper_action = GUI::Action::create("Set as Desktop &Wallpaper",
auto desktop_wallpaper_action = GUI::Action::create("Set as Desktop &Wallpaper", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-display-settings.png")),
[&](auto&) {
auto could_set_wallpaper = GUI::Desktop::the().set_wallpaper(widget->path());
if (!could_set_wallpaper) {
Expand Down

0 comments on commit 34c5d33

Please sign in to comment.