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

LibGUI: Remove Menu::try_add_action()

Browse source 
And fall back to the infallible add_action().
This commit is contained in:
Andreas Kling 2023-08-14 10:14:27 +02:00
parent eec328e2ab
commit f2faf2767f
51 changed files with 758 additions and 769 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Applications/ThemeEditor/MainWidget.cpp
View file

@ -246,7 +246,7 @@ MainWidget::MainWidget(NonnullRefPtr<AlignmentModel> alignment_model)
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
{
auto file_menu = TRY(window.try_add_menu("&File"_string));
TRY(file_menu->try_add_action(GUI::CommonActions::make_open_action([&](auto&) {
file_menu->add_action(GUI::CommonActions::make_open_action([&](auto&) {
if (request_close() == GUI::Window::CloseRequestDecision::StayOpen)
return;
FileSystemAccessClient::OpenFileOptions options {
@ -262,7 +262,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
GUI::MessageBox::show_error(&window, DeprecatedString::formatted("Can't open file named {}: {}", response.value().filename(), load_from_file_result.error()));
return;
}
})));
}));
m_save_action = GUI::CommonActions::make_save_action([&](auto&) {
if (m_path.has_value()) {
@ -277,14 +277,14 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
save_to_file(result.value().filename(), result.value().release_stream());
}
});
TRY(file_menu->try_add_action(*m_save_action));
file_menu->add_action(*m_save_action);
TRY(file_menu->try_add_action(GUI::CommonActions::make_save_as_action([&](auto&) {
file_menu->add_action(GUI::CommonActions::make_save_as_action([&](auto&) {
auto result = FileSystemAccessClient::Client::the().save_file(&window, "Theme", "ini", Core::File::OpenMode::ReadWrite | Core::File::OpenMode::Truncate);
if (result.is_error())
return;
save_to_file(result.value().filename(), result.value().release_stream());
})));
}));
file_menu->add_separator();
TRY(file_menu->add_recent_files_list([&](auto& action) {
@ -300,16 +300,16 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}
}));
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) {
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
if (request_close() == GUI::Window::CloseRequestDecision::Close)
GUI::Application::the()->quit();
})));
}));
TRY(window.try_add_menu(TRY(GUI::CommonMenus::make_accessibility_menu(*m_preview_widget))));
auto help_menu = TRY(window.try_add_menu("&Help"_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Theme Editor", GUI::Icon::default_icon("app-theme-editor"sv), &window)));
help_menu->add_action(GUI::CommonActions::make_command_palette_action(&window));
help_menu->add_action(GUI::CommonActions::make_about_action("Theme Editor", GUI::Icon::default_icon("app-theme-editor"sv), &window));
return {};
}