RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 11:47:45 +00:00
Code Issues Activity Actions

PixelPaint: Propagate errors from menu initialization

Browse source
This commit is contained in:
Tim Ledbetter 2023-03-08 18:55:56 +00:00 • committed by Andreas Kling
parent b170b46aa5
commit 4accc6a61f
1 changed files with 160 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

320
Userland/Applications/PixelPaint/MainWidget.cpp
View file

@ -148,7 +148,7 @@ static constexpr int s_zoom_level_fit_image = 10;
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
{
auto& file_menu = window.add_menu("&File");
auto file_menu = TRY(window.try_add_menu("&File"));
m_new_image_action = GUI::Action::create(
"&New Image...", { Mod_Ctrl, Key_N }, g_icon_bag.filetype_pixelpaint, [&](auto&) {
@ -210,15 +210,15 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->save_project();
});
file_menu.add_action(*m_new_image_action);
file_menu.add_action(*m_new_image_from_clipboard_action);
file_menu.add_action(*m_open_image_action);
file_menu.add_action(*m_save_image_action);
file_menu.add_action(*m_save_image_as_action);
TRY(file_menu->try_add_action(*m_new_image_action));
TRY(file_menu->try_add_action(*m_new_image_from_clipboard_action));
TRY(file_menu->try_add_action(*m_open_image_action));
TRY(file_menu->try_add_action(*m_save_image_action));
TRY(file_menu->try_add_action(*m_save_image_as_action));
m_export_submenu = file_menu.add_submenu("&Export");
m_export_submenu = TRY(file_menu->try_add_submenu("&Export"));
m_export_submenu->add_action(
TRY(m_export_submenu->try_add_action(
GUI::Action::create(
"As &BMP", [&](auto&) {
auto* editor = current_image_editor();
@ -230,9 +230,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = editor->image().export_bmp_to_file(response.value().release_stream(), preserve_alpha_channel == GUI::MessageBox::ExecResult::Yes);
if (result.is_error())
GUI::MessageBox::show_error(&window, DeprecatedString::formatted("Export to BMP failed: {}", result.error()));
}));
})));
m_export_submenu->add_action(
TRY(m_export_submenu->try_add_action(
GUI::Action::create(
"As &PNG", [&](auto&) {
auto* editor = current_image_editor();
@ -245,9 +245,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = editor->image().export_png_to_file(response.value().release_stream(), preserve_alpha_channel == GUI::MessageBox::ExecResult::Yes);
if (result.is_error())
GUI::MessageBox::show_error(&window, DeprecatedString::formatted("Export to PNG failed: {}", result.error()));
}));
})));
m_export_submenu->add_action(
TRY(m_export_submenu->try_add_action(
GUI::Action::create(
"As &QOI", [&](auto&) {
auto* editor = current_image_editor();
@ -258,11 +258,11 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = editor->image().export_qoi_to_file(response.value().release_stream());
if (result.is_error())
GUI::MessageBox::show_error(&window, DeprecatedString::formatted("Export to QOI failed: {}", result.error()));
}));
})));
m_export_submenu->set_icon(g_icon_bag.file_export);
file_menu.add_separator();
TRY(file_menu->try_add_separator());
m_close_image_action = GUI::Action::create("&Close Image", { Mod_Ctrl, Key_W }, g_icon_bag.close_image, [&](auto&) {
auto* active_widget = m_tab_widget->active_widget();
@ -270,14 +270,14 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_tab_widget->on_tab_close_click(*active_widget);
});
file_menu.add_action(*m_close_image_action);
TRY(file_menu->try_add_action(*m_close_image_action));
file_menu.add_action(GUI::CommonActions::make_quit_action([this](auto&) {
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([this](auto&) {
if (request_close())
GUI::Application::the()->quit();
}));
})));
m_edit_menu = window.add_menu("&Edit");
m_edit_menu = TRY(window.try_add_menu("&Edit"));
m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) {
auto* editor = current_image_editor();
@ -392,55 +392,55 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->redo();
});
m_edit_menu->add_action(*m_undo_action);
m_edit_menu->add_action(*m_redo_action);
m_edit_menu->add_separator();
m_edit_menu->add_action(*m_cut_action);
m_edit_menu->add_action(*m_copy_action);
m_edit_menu->add_action(*m_copy_merged_action);
m_edit_menu->add_action(*m_paste_action);
m_edit_menu->add_separator();
TRY(m_edit_menu->try_add_action(*m_undo_action));
TRY(m_edit_menu->try_add_action(*m_redo_action));
TRY(m_edit_menu->try_add_separator());
TRY(m_edit_menu->try_add_action(*m_cut_action));
TRY(m_edit_menu->try_add_action(*m_copy_action));
TRY(m_edit_menu->try_add_action(*m_copy_merged_action));
TRY(m_edit_menu->try_add_action(*m_paste_action));
TRY(m_edit_menu->try_add_separator());
m_edit_menu->add_action(GUI::CommonActions::make_select_all_action([&](auto&) {
TRY(m_edit_menu->try_add_action(GUI::CommonActions::make_select_all_action([&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
if (!editor->active_layer())
return;
editor->image().selection().merge(editor->active_layer()->relative_rect(), PixelPaint::Selection::MergeMode::Set);
editor->did_complete_action("Select All"sv);
}));
m_edit_menu->add_action(GUI::Action::create(
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
"Clear &Selection", g_icon_bag.clear_selection, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->image().selection().clear();
editor->did_complete_action("Clear Selection"sv);
}));
m_edit_menu->add_action(GUI::Action::create(
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
"&Invert Selection", g_icon_bag.invert_selection, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->image().selection().invert();
editor->did_complete_action("Invert Selection"sv);
}));
})));
m_edit_menu->add_separator();
m_edit_menu->add_action(GUI::Action::create(
TRY(m_edit_menu->try_add_separator());
TRY(m_edit_menu->try_add_action(GUI::Action::create(
"S&wap Colors", { Mod_None, Key_X }, g_icon_bag.swap_colors, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
auto old_primary_color = editor->primary_color();
editor->set_primary_color(editor->secondary_color());
editor->set_secondary_color(old_primary_color);
}));
m_edit_menu->add_action(GUI::Action::create(
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
"&Default Colors", { Mod_None, Key_D }, g_icon_bag.default_colors, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->set_primary_color(Color::Black);
editor->set_secondary_color(Color::White);
}));
m_edit_menu->add_action(GUI::Action::create(
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
"&Load Color Palette", g_icon_bag.load_color_palette, [&](auto&) {
auto response = FileSystemAccessClient::Client::the().open_file(&window, "Load Color Palette");
if (response.is_error())
@ -453,8 +453,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
m_palette_widget->display_color_list(result.value());
}));
m_edit_menu->add_action(GUI::Action::create(
})));
TRY(m_edit_menu->try_add_action(GUI::Action::create(
"Sa&ve Color Palette", g_icon_bag.save_color_palette, [&](auto&) {
auto response = FileSystemAccessClient::Client::the().save_file(&window, "untitled", "palette");
if (response.is_error())
@ -463,9 +463,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto result = PixelPaint::PaletteWidget::save_palette_file(m_palette_widget->colors(), response.release_value().release_stream());
if (result.is_error())
GUI::MessageBox::show_error(&window, DeprecatedString::formatted("Writing color palette failed: {}", result.error()));
}));
})));
m_view_menu = window.add_menu("&View");
m_view_menu = TRY(window.try_add_menu("&View"));
m_zoom_in_action = GUI::CommonActions::make_zoom_in_action(
[&](auto&) {
@ -510,26 +510,26 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
});
m_show_guides_action->set_checked(Config::read_bool("PixelPaint"sv, "Guides"sv, "Show"sv, true));
m_view_menu->add_action(*m_zoom_in_action);
m_view_menu->add_action(*m_zoom_out_action);
m_view_menu->add_action(*m_reset_zoom_action);
m_view_menu->add_action(GUI::Action::create(
TRY(m_view_menu->try_add_action(*m_zoom_in_action));
TRY(m_view_menu->try_add_action(*m_zoom_out_action));
TRY(m_view_menu->try_add_action(*m_reset_zoom_action));
TRY(m_view_menu->try_add_action(GUI::Action::create(
"Fit Image To &View", g_icon_bag.fit_image_to_view, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->fit_image_to_view();
}));
m_view_menu->add_separator();
m_view_menu->add_action(*m_add_guide_action);
m_view_menu->add_action(*m_show_guides_action);
})));
TRY(m_view_menu->try_add_separator());
TRY(m_view_menu->try_add_action(*m_add_guide_action));
TRY(m_view_menu->try_add_action(*m_show_guides_action));
m_view_menu->add_action(GUI::Action::create(
TRY(m_view_menu->try_add_action(GUI::Action::create(
"&Clear Guides", g_icon_bag.clear_guides, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
editor->clear_guides();
}));
m_view_menu->add_separator();
})));
TRY(m_view_menu->try_add_separator());
auto show_pixel_grid_action = GUI::Action::create_checkable(
"Show &Pixel Grid", [&](auto& action) {
@ -539,17 +539,17 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->set_pixel_grid_visibility(action.is_checked());
});
show_pixel_grid_action->set_checked(Config::read_bool("PixelPaint"sv, "PixelGrid"sv, "Show"sv, true));
m_view_menu->add_action(*show_pixel_grid_action);
TRY(m_view_menu->try_add_action(*show_pixel_grid_action));
m_show_rulers_action = GUI::Action::create_checkable(
m_show_rulers_action = TRY(GUI::Action::try_create_checkable(
"Show R&ulers", { Mod_Ctrl, Key_R }, [&](auto& action) {
Config::write_bool("PixelPaint"sv, "Rulers"sv, "Show"sv, action.is_checked());
auto* editor = current_image_editor();
VERIFY(editor);
editor->set_ruler_visibility(action.is_checked());
});
}));
m_show_rulers_action->set_checked(Config::read_bool("PixelPaint"sv, "Rulers"sv, "Show"sv, true));
m_view_menu->add_action(*m_show_rulers_action);
TRY(m_view_menu->try_add_action(*m_show_rulers_action));
m_show_active_layer_boundary_action = GUI::Action::create_checkable(
"Show Active Layer &Boundary", [&](auto& action) {
@ -559,9 +559,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->set_show_active_layer_boundary(action.is_checked());
});
m_show_active_layer_boundary_action->set_checked(Config::read_bool("PixelPaint"sv, "ImageEditor"sv, "ShowActiveLayerBoundary"sv, true));
m_view_menu->add_action(*m_show_active_layer_boundary_action);
TRY(m_view_menu->try_add_action(*m_show_active_layer_boundary_action));
m_view_menu->add_separator();
TRY(m_view_menu->try_add_separator());
auto histogram_action = GUI::Action::create_checkable("&Histogram", [&](auto& action) {
Config::write_bool("PixelPaint"sv, "Scopes"sv, "ShowHistogram"sv, action.is_checked());
@ -577,19 +577,19 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
vectorscope_action->set_checked(Config::read_bool("PixelPaint"sv, "Scopes"sv, "ShowVectorscope"sv, false));
m_vectorscope_widget->parent_widget()->set_visible(vectorscope_action->is_checked());
auto& scopes_menu = m_view_menu->add_submenu("&Scopes");
scopes_menu.add_action(histogram_action);
scopes_menu.add_action(vectorscope_action);
auto scopes_menu = TRY(m_view_menu->try_add_submenu("&Scopes"));
TRY(scopes_menu->try_add_action(histogram_action));
TRY(scopes_menu->try_add_action(vectorscope_action));
m_tool_menu = window.add_menu("&Tool");
m_tool_menu = TRY(window.try_add_menu("&Tool"));
m_toolbox->for_each_tool([&](auto& tool) {
if (tool.action())
m_tool_menu->add_action(*tool.action());
return IterationDecision::Continue;
});
m_image_menu = window.add_menu("&Image");
m_image_menu->add_action(GUI::Action::create(
m_image_menu = TRY(window.try_add_menu("&Image"));
TRY(m_image_menu->try_add_action(GUI::Action::create(
"Flip Image &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -599,8 +599,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Image Vertically"sv);
}));
m_image_menu->add_action(GUI::Action::create(
})));
TRY(m_image_menu->try_add_action(GUI::Action::create(
"Flip Image &Horizontally", g_icon_bag.edit_flip_horizontal, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -610,10 +610,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Image Horizontally"sv);
}));
m_image_menu->add_separator();
})));
TRY(m_image_menu->try_add_separator());
m_image_menu->add_action(GUI::Action::create("Rotate Image &Counterclockwise", { Mod_Ctrl | Mod_Shift, Key_LessThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
TRY(m_image_menu->try_add_action(GUI::Action::create("Rotate Image &Counterclockwise", { Mod_Ctrl | Mod_Shift, Key_LessThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -623,9 +623,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Image Counterclockwise"sv);
}));
})));
m_image_menu->add_action(GUI::Action::create("Rotate Image Clock&wise", { Mod_Ctrl | Mod_Shift, Key_GreaterThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
TRY(m_image_menu->try_add_action(GUI::Action::create("Rotate Image Clock&wise", { Mod_Ctrl | Mod_Shift, Key_GreaterThan }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -635,9 +635,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Image Clockwise"sv);
}));
m_image_menu->add_separator();
m_image_menu->add_action(GUI::Action::create(
})));
TRY(m_image_menu->try_add_separator());
TRY(m_image_menu->try_add_action(GUI::Action::create(
"&Resize Image...", { Mod_Ctrl | Mod_Shift, Key_R }, g_icon_bag.resize_image, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -650,8 +650,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
editor->did_complete_action("Resize Image"sv);
}
}));
m_image_menu->add_action(GUI::Action::create(
})));
TRY(m_image_menu->try_add_action(GUI::Action::create(
"&Crop Image to Selection", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -666,9 +666,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
editor->image().selection().clear();
editor->did_complete_action("Crop Image to Selection"sv);
}));
})));
m_image_menu->add_action(GUI::Action::create(
TRY(m_image_menu->try_add_action(GUI::Action::create(
"&Crop Image to Content", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -683,9 +683,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Crop Image to Content"sv);
}));
})));
m_layer_menu = window.add_menu("&Layer");
m_layer_menu = TRY(window.try_add_menu("&Layer"));
m_layer_menu->on_visibility_change = [this](bool visible) {
if (!visible)
@ -698,7 +698,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_layer_via_cut->set_enabled(image_has_selection);
};
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"New &Layer...", { Mod_Ctrl | Mod_Shift, Key_N }, g_icon_bag.new_layer, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -714,7 +714,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->did_complete_action("New Layer"sv);
m_layer_list_widget->select_top_layer();
}
}));
})));
m_layer_via_copy = GUI::Action::create(
"Layer via Copy", { Mod_Ctrl | Mod_Shift, Key_C }, g_icon_bag.new_layer, [&](auto&) {
@ -726,7 +726,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
current_image_editor()->did_complete_action("New Layer via Copy"sv);
m_layer_list_widget->select_top_layer();
});
m_layer_menu->add_action(*m_layer_via_copy);
TRY(m_layer_menu->try_add_action(*m_layer_via_copy));
m_layer_via_cut = GUI::Action::create(
"Layer via Cut", { Mod_Ctrl | Mod_Shift, Key_X }, g_icon_bag.new_layer, [&](auto&) {
@ -739,9 +739,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
current_image_editor()->did_complete_action("New Layer via Cut"sv);
m_layer_list_widget->select_top_layer();
});
m_layer_menu->add_action(*m_layer_via_cut);
TRY(m_layer_menu->try_add_action(*m_layer_via_cut));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_separator());
auto create_layer_mask_callback = [&](auto const& action_name, Function<void(Layer*)> mask_function) {
return [&, mask_function = move(mask_function)](GUI::Action&) {
@ -766,42 +766,42 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
if (auto maybe_error = active_layer->create_mask(); maybe_error.is_error())
GUI::MessageBox::show_error(&window, DeprecatedString::formatted("Failed to create layer mask: {}", maybe_error.release_error()));
}));
m_layer_menu->add_action(*m_add_mask_action);
TRY(m_layer_menu->try_add_action(*m_add_mask_action));
m_delete_mask_action = GUI::Action::create(
"Delete Mask", create_layer_mask_callback("Delete Mask", [&](Layer* active_layer) {
VERIFY(active_layer->is_masked());
active_layer->delete_mask();
}));
m_layer_menu->add_action(*m_delete_mask_action);
TRY(m_layer_menu->try_add_action(*m_delete_mask_action));
m_apply_mask_action = GUI::Action::create(
"Apply Mask", create_layer_mask_callback("Apply Mask", [&](Layer* active_layer) {
VERIFY(active_layer->is_masked());
active_layer->apply_mask();
}));
m_layer_menu->add_action(*m_apply_mask_action);
TRY(m_layer_menu->try_add_action(*m_apply_mask_action));
m_layer_menu->add_separator();
TRY(m_layer_menu->try_add_separator());
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Select &Previous Layer", { 0, Key_PageUp }, g_icon_bag.previous_layer, [&](auto&) {
m_layer_list_widget->cycle_through_selection(1);
}));
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Select &Next Layer", { 0, Key_PageDown }, g_icon_bag.next_layer, [&](auto&) {
m_layer_list_widget->cycle_through_selection(-1);
}));
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Select &Top Layer", { 0, Key_Home }, g_icon_bag.top_layer, [&](auto&) {
m_layer_list_widget->select_top_layer();
}));
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Select B&ottom Layer", { 0, Key_End }, g_icon_bag.bottom_layer, [&](auto&) {
m_layer_list_widget->select_bottom_layer();
}));
m_layer_menu->add_separator();
m_layer_menu->add_action(GUI::CommonActions::make_move_to_front_action(
})));
TRY(m_layer_menu->try_add_separator());
TRY(m_layer_menu->try_add_action(GUI::CommonActions::make_move_to_front_action(
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -810,8 +810,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
editor->image().move_layer_to_front(*active_layer);
editor->layers_did_change();
}));
m_layer_menu->add_action(GUI::CommonActions::make_move_to_back_action(
})));
TRY(m_layer_menu->try_add_action(GUI::CommonActions::make_move_to_back_action(
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -820,9 +820,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
editor->image().move_layer_to_back(*active_layer);
editor->layers_did_change();
}));
m_layer_menu->add_separator();
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_separator());
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Move Active Layer &Up", { Mod_Ctrl, Key_PageUp }, g_icon_bag.active_layer_up, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -830,8 +830,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
if (!active_layer)
return;
editor->image().move_layer_up(*active_layer);
}));
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Move Active Layer &Down", { Mod_Ctrl, Key_PageDown }, g_icon_bag.active_layer_down, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -839,9 +839,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
if (!active_layer)
return;
editor->image().move_layer_down(*active_layer);
}));
m_layer_menu->add_separator();
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_separator());
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"&Remove Active Layer", { Mod_Ctrl, Key_D }, g_icon_bag.delete_layer, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -866,13 +866,13 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->layers_did_change();
m_layer_list_widget->select_top_layer();
}
}));
})));
m_layer_list_widget->on_context_menu_request = [&](auto& event) {
m_layer_menu->popup(event.screen_position());
};
m_layer_menu->add_separator();
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_separator());
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Fl&atten Image", { Mod_Ctrl, Key_F }, g_icon_bag.flatten_image, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -881,9 +881,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flatten Image"sv);
}));
})));
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"&Merge Visible", { Mod_Ctrl, Key_M }, g_icon_bag.merge_visible, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -892,9 +892,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Merge Visible"sv);
}));
})));
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Merge &Active Layer Up", g_icon_bag.merge_active_layer_up, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -907,9 +907,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Merge Active Layer Up"sv);
}));
})));
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"M&erge Active Layer Down", { Mod_Ctrl, Key_E }, g_icon_bag.merge_active_layer_down, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -922,10 +922,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Merge Active Layer Down"sv);
}));
})));
m_layer_menu->add_separator();
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_separator());
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Flip Layer &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -938,8 +938,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Layer Vertically"sv);
}));
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"Flip Layer &Horizontally", g_icon_bag.edit_flip_horizontal, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -952,10 +952,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Flip Layer Horizontally"sv);
}));
m_layer_menu->add_separator();
})));
TRY(m_layer_menu->try_add_separator());
m_layer_menu->add_action(GUI::Action::create("Rotate Layer &Counterclockwise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
TRY(m_layer_menu->try_add_action(GUI::Action::create("Rotate Layer &Counterclockwise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-ccw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -968,9 +968,9 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Layer Counterclockwise"sv);
}));
})));
m_layer_menu->add_action(GUI::Action::create("Rotate Layer Clock&wise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
TRY(m_layer_menu->try_add_action(GUI::Action::create("Rotate Layer Clock&wise", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-rotate-cw.png"sv)),
[&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -983,10 +983,10 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
return;
}
editor->did_complete_action("Rotate Layer Clockwise"sv);
}));
})));
m_layer_menu->add_separator();
m_layer_menu->add_action(GUI::Action::create(
TRY(m_layer_menu->try_add_separator());
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"&Crop Layer to Selection", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1004,8 +1004,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
active_layer->set_location(intersection.location());
editor->image().selection().clear();
editor->did_complete_action("Crop Layer to Selection"sv);
}));
m_layer_menu->add_action(GUI::Action::create(
})));
TRY(m_layer_menu->try_add_action(GUI::Action::create(
"&Crop Layer to Content", g_icon_bag.crop, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
@ -1022,20 +1022,20 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
active_layer->set_location(content_bounding_rect->location());
editor->did_complete_action("Crop Layer to Content"sv);
}));
})));
m_filter_menu = window.add_menu("&Filter");
m_filter_menu = TRY(window.try_add_menu("&Filter"));
m_filter_menu->add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
TRY(m_filter_menu->try_add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
auto dialog = PixelPaint::FilterGallery::construct(&window, editor);
if (dialog->exec() != GUI::Dialog::ExecResult::OK)
return;
}));
})));
m_filter_menu->add_separator();
m_filter_menu->add_action(GUI::Action::create("Generic 5x5 &Convolution", g_icon_bag.generic_5x5_convolution, [&](auto&) {
TRY(m_filter_menu->try_add_separator());
TRY(m_filter_menu->try_add_action(GUI::Action::create("Generic 5x5 &Convolution", g_icon_bag.generic_5x5_convolution, [&](auto&) {
auto* editor = current_image_editor();
VERIFY(editor);
if (auto* layer = editor->active_layer()) {
@ -1046,11 +1046,11 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
editor->did_complete_action("Generic 5x5 Convolution"sv);
}
}
}));
})));
auto& help_menu = window.add_menu("&Help");
help_menu.add_action(GUI::CommonActions::make_command_palette_action(&window));
help_menu.add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window));
auto help_menu = TRY(window.try_add_menu("&Help"));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window)));
m_levels_dialog_action = GUI::Action::create(
"Change &Levels...", { Mod_Ctrl, Key_L }, g_icon_bag.levels, [&](auto&) {
@ -1062,21 +1062,21 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
});
auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
toolbar.add_action(*m_new_image_action);
toolbar.add_action(*m_open_image_action);
toolbar.add_action(*m_save_image_action);
toolbar.add_separator();
toolbar.add_action(*m_cut_action);
toolbar.add_action(*m_copy_action);
toolbar.add_action(*m_paste_action);
toolbar.add_action(*m_undo_action);
toolbar.add_action(*m_redo_action);
toolbar.add_separator();
toolbar.add_action(*m_zoom_in_action);
toolbar.add_action(*m_zoom_out_action);
toolbar.add_action(*m_reset_zoom_action);
(void)TRY(toolbar.try_add_action(*m_new_image_action));
(void)TRY(toolbar.try_add_action(*m_open_image_action));
(void)TRY(toolbar.try_add_action(*m_save_image_action));
TRY(toolbar.try_add_separator());
(void)TRY(toolbar.try_add_action(*m_cut_action));
(void)TRY(toolbar.try_add_action(*m_copy_action));
(void)TRY(toolbar.try_add_action(*m_paste_action));
(void)TRY(toolbar.try_add_action(*m_undo_action));
(void)TRY(toolbar.try_add_action(*m_redo_action));
TRY(toolbar.try_add_separator());
(void)TRY(toolbar.try_add_action(*m_zoom_in_action));
(void)TRY(toolbar.try_add_action(*m_zoom_out_action));
(void)TRY(toolbar.try_add_action(*m_reset_zoom_action));
m_zoom_combobox = toolbar.add<GUI::ComboBox>();
m_zoom_combobox = TRY(toolbar.try_add<GUI::ComboBox>());
m_zoom_combobox->set_max_width(75);
m_zoom_combobox->set_model(*GUI::ItemListModel<DeprecatedString>::create(s_suggested_zoom_levels));
m_zoom_combobox->on_change = [this](DeprecatedString const& value, GUI::ModelIndex const& index) {
@ -1114,8 +1114,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_zoom_combobox->on_change(m_zoom_combobox->text(), GUI::ModelIndex());
};
toolbar.add_separator();
toolbar.add_action(*m_levels_dialog_action);
TRY(toolbar.try_add_separator());
(void)TRY(toolbar.try_add_action(*m_levels_dialog_action));
return {};
}