RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:57:45 +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

22
Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp
View file

@ -383,7 +383,7 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
{
// File menu
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&) {
FileSystemAccessClient::OpenFileOptions options {
.allowed_file_types = { { GUI::FileTypeFilter { "Video Files", { { "mkv", "webm" } } }, GUI::FileTypeFilter::all_files() } },
};
@ -392,11 +392,11 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
return;
open_file(response.release_value());
})));
}));
file_menu->add_separator();
TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) {
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
window.close();
})));
}));
// Playback menu
auto playback_menu = TRY(window.try_add_menu("&Playback"_string));
@ -404,12 +404,12 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
// FIXME: Maybe seek mode should be in an options dialog instead. The playback menu may get crowded.
// For now, leave it here for convenience.
m_use_fast_seeking = GUI::Action::create_checkable("&Fast Seeking", [&](auto&) {});
TRY(playback_menu->try_add_action(*m_use_fast_seeking));
playback_menu->add_action(*m_use_fast_seeking);
set_seek_mode(Video::PlaybackManager::DEFAULT_SEEK_MODE);
// View menu
auto view_menu = TRY(window.try_add_menu("&View"_string));
TRY(view_menu->try_add_action(*m_toggle_fullscreen_action));
view_menu->add_action(*m_toggle_fullscreen_action);
auto sizing_mode_menu = view_menu->add_submenu("&Sizing Mode"_string);
sizing_mode_menu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fit-image-to-view.png"sv)));
@ -421,14 +421,14 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
m_sizing_mode_group->add_action(*m_size_stretch_action);
m_sizing_mode_group->add_action(*m_size_fullsize_action);
TRY(sizing_mode_menu->try_add_action(*m_size_fit_action));
TRY(sizing_mode_menu->try_add_action(*m_size_fill_action));
TRY(sizing_mode_menu->try_add_action(*m_size_stretch_action));
TRY(sizing_mode_menu->try_add_action(*m_size_fullsize_action));
sizing_mode_menu->add_action(*m_size_fit_action);
sizing_mode_menu->add_action(*m_size_fill_action);
sizing_mode_menu->add_action(*m_size_stretch_action);
sizing_mode_menu->add_action(*m_size_fullsize_action);
// Help menu
auto help_menu = TRY(window.try_add_menu("&Help"_string));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Video Player", TRY(GUI::Icon::try_create_default_icon("app-video-player"sv)), &window)));
help_menu->add_action(GUI::CommonActions::make_about_action("Video Player", TRY(GUI::Icon::try_create_default_icon("app-video-player"sv)), &window));
return {};
}