From 1525fa3b8fb73ff2aff08c28da17ac86d5fc8811 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 14 Aug 2023 07:19:40 +0200 Subject: [PATCH] LibGUI: Remove Menu::try_add_separator() And fall back to the infallible add_separator(). --- .../Applications/Calendar/CalendarWidget.cpp | 2 +- .../BackgroundSettingsWidget.cpp | 2 +- Userland/Applications/FileManager/main.cpp | 32 ++++++++-------- .../Applications/FontEditor/MainWidget.cpp | 14 +++---- Userland/Applications/Help/MainWidget.cpp | 2 +- .../HexEditor/HexEditorWidget.cpp | 12 +++--- Userland/Applications/ImageViewer/main.cpp | 10 ++--- Userland/Applications/Magnifier/main.cpp | 4 +- .../PDFViewer/PDFViewerWidget.cpp | 6 +-- Userland/Applications/Piano/main.cpp | 2 +- .../Applications/PixelPaint/MainWidget.cpp | 38 +++++++++---------- .../Presenter/PresenterWidget.cpp | 2 +- Userland/Applications/SoundPlayer/main.cpp | 6 +-- Userland/Applications/SpaceAnalyzer/main.cpp | 2 +- .../Spreadsheet/SpreadsheetWidget.cpp | 6 +-- Userland/Applications/SystemMonitor/main.cpp | 4 +- Userland/Applications/Terminal/main.cpp | 8 ++-- .../Applications/TextEditor/MainWidget.cpp | 22 +++++------ .../Applications/ThemeEditor/MainWidget.cpp | 2 +- .../VideoPlayer/VideoPlayerWidget.cpp | 2 +- Userland/Demos/CatDog/main.cpp | 2 +- Userland/Demos/Eyes/main.cpp | 2 +- Userland/Demos/Mandelbrot/Mandelbrot.cpp | 2 +- .../DevTools/GMLPlayground/MainWidget.cpp | 8 ++-- Userland/DevTools/SQLStudio/MainWidget.cpp | 6 +-- Userland/Games/2048/main.cpp | 4 +- Userland/Games/BrickGame/main.cpp | 2 +- Userland/Games/Chess/main.cpp | 8 ++-- Userland/Games/ColorLines/main.cpp | 2 +- Userland/Games/Flood/main.cpp | 4 +- Userland/Games/GameOfLife/main.cpp | 4 +- Userland/Games/Hearts/main.cpp | 4 +- Userland/Games/MasterWord/main.cpp | 2 +- Userland/Games/Minesweeper/main.cpp | 6 +-- Userland/Games/Snake/main.cpp | 2 +- Userland/Games/Solitaire/main.cpp | 8 ++-- Userland/Games/Spider/main.cpp | 6 +-- Userland/Libraries/LibGUI/LinkLabel.cpp | 2 +- Userland/Libraries/LibGUI/Menu.cpp | 19 +++------- Userland/Libraries/LibGUI/Menu.h | 1 - Userland/Libraries/LibGUI/Toolbar.cpp | 2 +- 41 files changed, 132 insertions(+), 142 deletions(-) diff --git a/Userland/Applications/Calendar/CalendarWidget.cpp b/Userland/Applications/Calendar/CalendarWidget.cpp index 3b4a3c7762..077ac4e5fa 100644 --- a/Userland/Applications/Calendar/CalendarWidget.cpp +++ b/Userland/Applications/Calendar/CalendarWidget.cpp @@ -90,7 +90,7 @@ ErrorOr> CalendarWidget::create(GUI::Window* paren file_menu.add_action(save_as_action); file_menu.add_action(save_action); - TRY(file_menu.try_add_separator()); + file_menu.add_separator(); TRY(file_menu.try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); diff --git a/Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp b/Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp index 0a13586ab3..9a40742bd1 100644 --- a/Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp +++ b/Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp @@ -83,7 +83,7 @@ ErrorOr BackgroundSettingsWidget::create_frame() }); m_context_menu->add_action(*m_show_in_file_manager_action); - TRY(m_context_menu->try_add_separator()); + m_context_menu->add_separator(); m_copy_action = GUI::CommonActions::make_copy_action( [this](auto&) { auto wallpaper = m_monitor_widget->wallpaper(); diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 8a1d274c3c..98fcd72b2f 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -512,23 +512,23 @@ ErrorOr run_in_desktop_mode() TRY(desktop_view_context_menu->try_add_action(directory_view->mkdir_action())); TRY(desktop_view_context_menu->try_add_action(directory_view->touch_action())); TRY(desktop_view_context_menu->try_add_action(paste_action)); - TRY(desktop_view_context_menu->try_add_separator()); + desktop_view_context_menu->add_separator(); TRY(desktop_view_context_menu->try_add_action(file_manager_action)); TRY(desktop_view_context_menu->try_add_action(open_terminal_action)); - TRY(desktop_view_context_menu->try_add_separator()); + desktop_view_context_menu->add_separator(); TRY(desktop_view_context_menu->try_add_action(display_properties_action)); auto desktop_context_menu = TRY(GUI::Menu::try_create("Directory View Directory"_string)); TRY(desktop_context_menu->try_add_action(file_manager_action)); TRY(desktop_context_menu->try_add_action(open_terminal_action)); - TRY(desktop_context_menu->try_add_separator()); + desktop_context_menu->add_separator(); TRY(desktop_context_menu->try_add_action(cut_action)); TRY(desktop_context_menu->try_add_action(copy_action)); TRY(desktop_context_menu->try_add_action(paste_action)); TRY(desktop_context_menu->try_add_action(directory_view->delete_action())); TRY(desktop_context_menu->try_add_action(directory_view->rename_action())); - TRY(desktop_context_menu->try_add_separator()); + desktop_context_menu->add_separator(); TRY(desktop_context_menu->try_add_action(properties_action)); RefPtr file_context_menu; @@ -1014,9 +1014,9 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(file_menu->try_add_action(touch_action)); TRY(file_menu->try_add_action(focus_dependent_delete_action)); TRY(file_menu->try_add_action(directory_view->rename_action())); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(properties_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); @@ -1025,7 +1025,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(edit_menu->try_add_action(cut_action)); TRY(edit_menu->try_add_action(copy_action)); TRY(edit_menu->try_add_action(paste_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(select_all_action)); auto show_dotfiles_in_view = [&](bool show_dotfiles) { @@ -1051,12 +1051,12 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(layout_menu->try_add_action(*layout_statusbar_action)); TRY(layout_menu->try_add_action(*layout_folderpane_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(directory_view->view_as_icons_action())); TRY(view_menu->try_add_action(directory_view->view_as_table_action())); TRY(view_menu->try_add_action(directory_view->view_as_columns_action())); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(show_dotfiles_action)); auto go_to_location_action = GUI::Action::create("Go to &Location...", { Mod_Ctrl, Key_L }, Key_F6, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-to.png"sv)), [&](auto&) { @@ -1072,7 +1072,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(go_menu->try_add_action(open_child_directory_action)); TRY(go_menu->try_add_action(go_home_action)); TRY(go_menu->try_add_action(go_to_location_action)); - TRY(go_menu->try_add_separator()); + go_menu->add_separator(); TRY(go_menu->try_add_action(directory_view->open_terminal_action())); auto help_menu = TRY(window->try_add_menu("&Help"_string)); @@ -1177,7 +1177,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(directory_context_menu->try_add_action(directory_open_action)); TRY(directory_context_menu->try_add_action(open_in_new_window_action)); TRY(directory_context_menu->try_add_action(open_in_new_terminal_action)); - TRY(directory_context_menu->try_add_separator()); + directory_context_menu->add_separator(); TRY(directory_context_menu->try_add_action(cut_action)); TRY(directory_context_menu->try_add_action(copy_action)); TRY(directory_context_menu->try_add_action(copy_path_action)); @@ -1186,21 +1186,21 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(directory_context_menu->try_add_action(directory_view->rename_action())); TRY(directory_context_menu->try_add_action(shortcut_action)); TRY(directory_context_menu->try_add_action(create_archive_action)); - TRY(directory_context_menu->try_add_separator()); + directory_context_menu->add_separator(); TRY(directory_context_menu->try_add_action(properties_action)); TRY(directory_view_context_menu->try_add_action(mkdir_action)); TRY(directory_view_context_menu->try_add_action(touch_action)); TRY(directory_view_context_menu->try_add_action(paste_action)); TRY(directory_view_context_menu->try_add_action(directory_view->open_terminal_action())); - TRY(directory_view_context_menu->try_add_separator()); + directory_view_context_menu->add_separator(); TRY(directory_view_context_menu->try_add_action(show_dotfiles_action)); - TRY(directory_view_context_menu->try_add_separator()); + directory_view_context_menu->add_separator(); TRY(directory_view_context_menu->try_add_action(properties_action)); TRY(tree_view_directory_context_menu->try_add_action(open_in_new_window_action)); TRY(tree_view_directory_context_menu->try_add_action(open_in_new_terminal_action)); - TRY(tree_view_directory_context_menu->try_add_separator()); + tree_view_directory_context_menu->add_separator(); TRY(tree_view_directory_context_menu->try_add_action(mkdir_action)); TRY(tree_view_directory_context_menu->try_add_action(touch_action)); TRY(tree_view_directory_context_menu->try_add_action(cut_action)); @@ -1208,7 +1208,7 @@ ErrorOr run_in_windowed_mode(DeprecatedString const& initial_location, Depr TRY(tree_view_directory_context_menu->try_add_action(copy_path_action)); TRY(tree_view_directory_context_menu->try_add_action(paste_action)); TRY(tree_view_directory_context_menu->try_add_action(tree_view_delete_action)); - TRY(tree_view_directory_context_menu->try_add_separator()); + tree_view_directory_context_menu->add_separator(); TRY(tree_view_directory_context_menu->try_add_action(properties_action)); RefPtr file_context_menu; diff --git a/Userland/Applications/FontEditor/MainWidget.cpp b/Userland/Applications/FontEditor/MainWidget.cpp index 28ca867925..0bff74159b 100644 --- a/Userland/Applications/FontEditor/MainWidget.cpp +++ b/Userland/Applications/FontEditor/MainWidget.cpp @@ -738,7 +738,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_as_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([this](auto& action) { if (!request_close()) return; @@ -758,14 +758,14 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(*m_undo_action)); TRY(edit_menu->try_add_action(*m_redo_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_cut_action)); TRY(edit_menu->try_add_action(*m_copy_action)); TRY(edit_menu->try_add_action(*m_paste_action)); TRY(edit_menu->try_add_action(*m_delete_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_select_all_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_copy_text_action)); m_context_menu = edit_menu; @@ -781,12 +781,12 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(layout_menu->try_add_action(*m_show_statusbar_action)); TRY(layout_menu->try_add_action(*m_show_metadata_action)); TRY(layout_menu->try_add_action(*m_show_unicode_blocks_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(*m_open_preview_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(*m_highlight_modifications_action)); TRY(view_menu->try_add_action(*m_show_system_emoji_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); auto scale_menu = TRY(view_menu->try_add_submenu("&Scale"_string)); scale_menu->set_icon(g_resources.scale_editor); TRY(scale_menu->try_add_action(*m_scale_five_action)); diff --git a/Userland/Applications/Help/MainWidget.cpp b/Userland/Applications/Help/MainWidget.cpp index d4a2443314..290af6d5a0 100644 --- a/Userland/Applications/Help/MainWidget.cpp +++ b/Userland/Applications/Help/MainWidget.cpp @@ -226,7 +226,7 @@ ErrorOr MainWidget::initialize_fallibles(GUI::Window& window) TRY(m_context_menu->try_add_action(*m_go_back_action)); TRY(m_context_menu->try_add_action(*m_go_forward_action)); TRY(m_context_menu->try_add_action(*m_go_home_action)); - TRY(m_context_menu->try_add_separator()); + m_context_menu->add_separator(); TRY(m_context_menu->try_add_action(*m_copy_action)); TRY(m_context_menu->try_add_action(*m_select_all_action)); diff --git a/Userland/Applications/HexEditor/HexEditorWidget.cpp b/Userland/Applications/HexEditor/HexEditorWidget.cpp index fdb8cd7e47..c576ffedfb 100644 --- a/Userland/Applications/HexEditor/HexEditorWidget.cpp +++ b/Userland/Applications/HexEditor/HexEditorWidget.cpp @@ -417,7 +417,7 @@ ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_as_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { auto path = action.text(); auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(&window, path); @@ -436,17 +436,17 @@ ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(*m_undo_action)); TRY(edit_menu->try_add_action(*m_redo_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(GUI::CommonActions::make_select_all_action([this](auto&) { m_editor->select_all(); m_editor->update(); }))); TRY(edit_menu->try_add_action(*m_fill_selection_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_copy_hex_action)); TRY(edit_menu->try_add_action(*m_copy_text_action)); TRY(edit_menu->try_add_action(*m_copy_as_c_code_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_find_action)); TRY(edit_menu->try_add_action(GUI::Action::create("Find &Next", { Mod_None, Key_F3 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/find-next.png"sv)), [&](const GUI::Action&) { if (m_search_text.is_empty() || m_search_buffer.is_empty()) { @@ -477,7 +477,7 @@ ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) set_search_results_visible(true); m_editor->update(); }))); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_goto_offset_action)); auto view_menu = TRY(window.try_add_menu("&View"_string)); @@ -495,7 +495,7 @@ ErrorOr HexEditorWidget::initialize_menubar(GUI::Window& window) TRY(view_menu->try_add_action(*m_layout_toolbar_action)); TRY(view_menu->try_add_action(*m_layout_search_results_action)); TRY(view_menu->try_add_action(*m_layout_value_inspector_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); auto bytes_per_row = Config::read_i32("HexEditor"sv, "Layout"sv, "BytesPerRow"sv, 16); m_editor->set_bytes_per_row(bytes_per_row); diff --git a/Userland/Applications/ImageViewer/main.cpp b/Userland/Applications/ImageViewer/main.cpp index 350568e8ed..261eeb52d7 100644 --- a/Userland/Applications/ImageViewer/main.cpp +++ b/Userland/Applications/ImageViewer/main.cpp @@ -309,7 +309,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(open_action)); TRY(file_menu->try_add_action(delete_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { auto path = action.text(); @@ -328,7 +328,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(image_menu->try_add_action(rotate_clockwise_action)); TRY(image_menu->try_add_action(vertical_flip_action)); TRY(image_menu->try_add_action(horizontal_flip_action)); - TRY(image_menu->try_add_separator()); + image_menu->add_separator(); TRY(image_menu->try_add_action(desktop_wallpaper_action)); auto navigate_menu = TRY(window->try_add_menu("&Navigate"_string)); @@ -339,12 +339,12 @@ ErrorOr serenity_main(Main::Arguments arguments) auto view_menu = TRY(window->try_add_menu("&View"_string)); TRY(view_menu->try_add_action(full_screen_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(zoom_in_action)); TRY(view_menu->try_add_action(reset_zoom_action)); TRY(view_menu->try_add_action(fit_image_to_view_action)); TRY(view_menu->try_add_action(zoom_out_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); auto scaling_mode_menu = TRY(view_menu->try_add_submenu("&Scaling Mode"_string)); scaling_mode_menu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/scale.png"sv))); @@ -361,7 +361,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(scaling_mode_menu->try_add_action(bilinear_action)); TRY(scaling_mode_menu->try_add_action(box_sampling_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(hide_show_toolbar_action)); auto help_menu = TRY(window->try_add_menu("&Help"_string)); diff --git a/Userland/Applications/Magnifier/main.cpp b/Userland/Applications/Magnifier/main.cpp index 0400c7d10c..1f4c7f2ca6 100644 --- a/Userland/Applications/Magnifier/main.cpp +++ b/Userland/Applications/Magnifier/main.cpp @@ -83,7 +83,7 @@ ErrorOr serenity_main(Main::Arguments arguments) warnln("Error saving bitmap to {}: {}", filename, result.error().string_literal()); } }))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); @@ -148,7 +148,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(view_menu->try_add_action(eight_x_action)); two_x_action->set_checked(true); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(pause_action)); TRY(view_menu->try_add_action(lock_location_action)); TRY(view_menu->try_add_action(show_grid_action)); diff --git a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp index 0ce5e73efb..fa1a24764c 100644 --- a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp +++ b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp @@ -220,7 +220,7 @@ ErrorOr PDFViewerWidget::initialize_menubar(GUI::Window& window) if (!response.is_error()) open_file(response.value().filename(), response.value().release_stream()); }))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(&window, action.text()); if (!response.is_error()) @@ -232,11 +232,11 @@ ErrorOr PDFViewerWidget::initialize_menubar(GUI::Window& window) auto view_menu = TRY(window.try_add_menu("&View"_string)); TRY(view_menu->try_add_action(*m_toggle_sidebar_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); auto view_mode_menu = TRY(view_menu->try_add_submenu("View &Mode"_string)); TRY(view_mode_menu->try_add_action(*m_page_view_mode_single)); TRY(view_mode_menu->try_add_action(*m_page_view_mode_multiple)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(*m_zoom_in_action)); TRY(view_menu->try_add_action(*m_zoom_out_action)); TRY(view_menu->try_add_action(*m_reset_zoom_action)); diff --git a/Userland/Applications/Piano/main.cpp b/Userland/Applications/Piano/main.cpp index c139090d5a..4c418f535a 100644 --- a/Userland/Applications/Piano/main.cpp +++ b/Userland/Applications/Piano/main.cpp @@ -77,7 +77,7 @@ ErrorOr serenity_main(Main::Arguments arguments) wav_progress_window->set_filename(save_path.value()); wav_progress_window->show(); }))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); return; diff --git a/Userland/Applications/PixelPaint/MainWidget.cpp b/Userland/Applications/PixelPaint/MainWidget.cpp index 4f8a2e37fb..b18523409b 100644 --- a/Userland/Applications/PixelPaint/MainWidget.cpp +++ b/Userland/Applications/PixelPaint/MainWidget.cpp @@ -269,7 +269,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) m_export_submenu->set_icon(g_icon_bag.file_export); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { auto path = action.text(); @@ -409,12 +409,12 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) 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()); + m_edit_menu->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_separator(); TRY(m_edit_menu->try_add_action(GUI::CommonActions::make_select_all_action([&](auto&) { auto* editor = current_image_editor(); @@ -440,7 +440,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) editor->did_complete_action("Invert Selection"sv); }))); - TRY(m_edit_menu->try_add_separator()); + m_edit_menu->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(); @@ -542,7 +542,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) VERIFY(editor); editor->fit_image_to_view(); }))); - TRY(m_view_menu->try_add_separator()); + m_view_menu->add_separator(); TRY(m_view_menu->try_add_action(*m_add_guide_action)); TRY(m_view_menu->try_add_action(*m_show_guides_action)); @@ -552,7 +552,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) VERIFY(editor); editor->clear_guides(); }))); - TRY(m_view_menu->try_add_separator()); + m_view_menu->add_separator(); auto show_pixel_grid_action = GUI::Action::create_checkable( "Show &Pixel Grid", [&](auto& action) { @@ -584,7 +584,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) m_show_active_layer_boundary_action->set_checked(Config::read_bool("PixelPaint"sv, "ImageEditor"sv, "ShowActiveLayerBoundary"sv, true)); TRY(m_view_menu->try_add_action(*m_show_active_layer_boundary_action)); - TRY(m_view_menu->try_add_separator()); + m_view_menu->add_separator(); auto histogram_action = GUI::Action::create_checkable("&Histogram", [&](auto& action) { Config::write_bool("PixelPaint"sv, "Scopes"sv, "ShowHistogram"sv, action.is_checked()); @@ -634,7 +634,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) } editor->did_complete_action("Flip Image Horizontally"sv); }))); - TRY(m_image_menu->try_add_separator()); + m_image_menu->add_separator(); 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&) { @@ -659,7 +659,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) } editor->did_complete_action("Rotate Image Clockwise"sv); }))); - TRY(m_image_menu->try_add_separator()); + m_image_menu->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(); @@ -791,7 +791,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) }); TRY(m_layer_menu->try_add_action(*m_layer_via_cut)); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->add_separator(); auto create_layer_mask_callback = [&](auto const& action_name, Function mask_function) { return [&, mask_function = move(mask_function)](GUI::Action&) { @@ -898,7 +898,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(mask_submenu->try_add_action(*m_open_color_masking_action)); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->add_separator(); TRY(m_layer_menu->try_add_action(GUI::Action::create( "Select &Previous Layer", { 0, Key_PageUp }, g_icon_bag.previous_layer, [&](auto&) { @@ -916,7 +916,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) "Select B&ottom Layer", { 0, Key_End }, g_icon_bag.bottom_layer, [&](auto&) { m_layer_list_widget->select_bottom_layer(); }))); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->add_separator(); TRY(m_layer_menu->try_add_action(GUI::CommonActions::make_move_to_front_action( [&](auto&) { auto* editor = current_image_editor(); @@ -937,7 +937,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) editor->image().move_layer_to_back(*active_layer); editor->layers_did_change(); }))); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->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(); @@ -956,7 +956,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) return; editor->image().move_layer_down(*active_layer); }))); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->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(); @@ -987,7 +987,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) m_layer_list_widget->on_context_menu_request = [&](auto& event) { m_layer_menu->popup(event.screen_position()); }; - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->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(); @@ -1040,7 +1040,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) editor->did_complete_action("Merge Active Layer Down"sv); }))); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->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(); @@ -1069,7 +1069,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) } editor->did_complete_action("Flip Layer Horizontally"sv); }))); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->add_separator(); 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&) { @@ -1101,7 +1101,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) editor->did_complete_action("Rotate Layer Clockwise"sv); }))); - TRY(m_layer_menu->try_add_separator()); + m_layer_menu->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(); @@ -1150,7 +1150,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) return; }))); - TRY(m_filter_menu->try_add_separator()); + m_filter_menu->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); diff --git a/Userland/Applications/Presenter/PresenterWidget.cpp b/Userland/Applications/Presenter/PresenterWidget.cpp index 6b0c0d6c3c..e1f0974e8f 100644 --- a/Userland/Applications/Presenter/PresenterWidget.cpp +++ b/Userland/Applications/Presenter/PresenterWidget.cpp @@ -66,7 +66,7 @@ ErrorOr PresenterWidget::initialize_menubar() this->set_file(response.value().filename()); }); TRY(file_menu->try_add_action(open_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Applications/SoundPlayer/main.cpp b/Userland/Applications/SoundPlayer/main.cpp index 3866665d22..ab6d5411c9 100644 --- a/Userland/Applications/SoundPlayer/main.cpp +++ b/Userland/Applications/SoundPlayer/main.cpp @@ -68,7 +68,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } }))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); @@ -97,9 +97,9 @@ ErrorOr serenity_main(Main::Arguments arguments) auto linear_volume_slider = GUI::Action::create_checkable("&Nonlinear Volume Slider", [&](auto& action) { static_cast(player)->set_nonlinear_volume_slider(action.is_checked()); }); - TRY(playback_menu->try_add_separator()); + playback_menu->add_separator(); TRY(playback_menu->try_add_action(linear_volume_slider)); - TRY(playback_menu->try_add_separator()); + playback_menu->add_separator(); auto playlist_toggle = GUI::Action::create_checkable("&Show Playlist", [&](auto& action) { static_cast(player)->set_playlist_visible(action.is_checked()); diff --git a/Userland/Applications/SpaceAnalyzer/main.cpp b/Userland/Applications/SpaceAnalyzer/main.cpp index de4cdebfb7..a050df7967 100644 --- a/Userland/Applications/SpaceAnalyzer/main.cpp +++ b/Userland/Applications/SpaceAnalyzer/main.cpp @@ -74,7 +74,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::MessageBox::show_error(window, DeprecatedString::formatted("{}", result.error())); } }))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); diff --git a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp index 9df8395593..eeba2d33cd 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp @@ -723,9 +723,9 @@ ErrorOr SpreadsheetWidget::initialize_menubar(GUI::Window& window) TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_as_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(*m_import_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { if (!request_close()) return; @@ -740,7 +740,7 @@ ErrorOr SpreadsheetWidget::initialize_menubar(GUI::Window& window) auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(*m_undo_action)); TRY(edit_menu->try_add_action(*m_redo_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_cut_action)); TRY(edit_menu->try_add_action(*m_copy_action)); TRY(edit_menu->try_add_action(*m_paste_action)); diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp index 39c551ac28..d058badccb 100644 --- a/Userland/Applications/SystemMonitor/main.cpp +++ b/Userland/Applications/SystemMonitor/main.cpp @@ -436,10 +436,10 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(process_context_menu->try_add_action(kill_action)); TRY(process_context_menu->try_add_action(stop_action)); TRY(process_context_menu->try_add_action(continue_action)); - TRY(process_context_menu->try_add_separator()); + process_context_menu->add_separator(); TRY(process_context_menu->try_add_action(profile_action)); TRY(process_context_menu->try_add_action(debug_action)); - TRY(process_context_menu->try_add_separator()); + process_context_menu->add_separator(); TRY(process_context_menu->try_add_action(process_properties_action)); process_table_view.on_context_menu_request = [&]([[maybe_unused]] const GUI::ModelIndex& index, const GUI::ContextMenuEvent& event) { if (index.is_valid()) diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index 0c146cc888..59982a58bc 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -332,7 +332,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Process::spawn_or_show_error(window, "/bin/TerminalSettings"sv); }); - TRY(terminal->context_menu().try_add_separator()); + terminal->context_menu().add_separator(); TRY(terminal->context_menu().try_add_action(open_settings_action)); auto file_menu = TRY(window->try_add_menu("&File"_string)); @@ -341,7 +341,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }))); TRY(file_menu->try_add_action(open_settings_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); auto tty_has_foreground_process = [&] { pid_t fg_pid = tcgetpgrp(ptm_fd); @@ -387,7 +387,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto edit_menu = TRY(window->try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(terminal->copy_action())); TRY(edit_menu->try_add_action(terminal->paste_action())); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(GUI::Action::create("&Find...", { Mod_Ctrl | Mod_Shift, Key_F }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv)), [&](auto&) { find_window->show(); @@ -410,7 +410,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } }; - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(GUI::CommonActions::make_zoom_in_action([&](auto&) { adjust_font_size(1); }))); diff --git a/Userland/Applications/TextEditor/MainWidget.cpp b/Userland/Applications/TextEditor/MainWidget.cpp index 836665b25b..44bfc4bdb4 100644 --- a/Userland/Applications/TextEditor/MainWidget.cpp +++ b/Userland/Applications/TextEditor/MainWidget.cpp @@ -370,9 +370,9 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(file_menu->try_add_action(*m_open_action)); TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_as_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(*m_open_folder_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { if (editor().document().is_modified()) { @@ -399,14 +399,14 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(m_editor->undo_action())); TRY(edit_menu->try_add_action(m_editor->redo_action())); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(m_editor->cut_action())); TRY(edit_menu->try_add_action(m_editor->copy_action())); TRY(edit_menu->try_add_action(m_editor->paste_action())); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(m_editor->insert_emoji_action())); TRY(edit_menu->try_add_action(*m_vim_emulation_setting_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_find_replace_action)); TRY(edit_menu->try_add_action(*m_find_next_action)); TRY(edit_menu->try_add_action(*m_find_previous_action)); @@ -466,7 +466,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(layout_menu->try_add_action(*m_layout_statusbar_action)); TRY(layout_menu->try_add_action(*m_layout_ruler_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(GUI::Action::create("Change &Font...", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-font-editor.png"sv)), [&](auto&) { @@ -478,7 +478,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) } }))); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); m_wrapping_mode_actions.set_exclusive(true); auto wrapping_mode_menu = TRY(view_menu->try_add_submenu("&Wrapping Mode"_string)); @@ -547,7 +547,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) m_soft_tab_4_width_action->set_checked(true); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); m_visualize_trailing_whitespace_action = GUI::Action::create_checkable("T&railing Whitespace", [&](auto&) { m_editor->set_visualize_trailing_whitespace(m_visualize_trailing_whitespace_action->is_checked()); @@ -585,12 +585,12 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(view_menu->try_add_action(*m_relative_line_number_action)); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); TRY(view_menu->try_add_action(*m_no_preview_action)); TRY(view_menu->try_add_action(*m_markdown_preview_action)); TRY(view_menu->try_add_action(*m_html_preview_action)); m_no_preview_action->set_checked(true); - TRY(view_menu->try_add_separator()); + view_menu->add_separator(); syntax_actions.set_exclusive(true); @@ -708,7 +708,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_8_width_action)); TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_16_width_action)); - TRY(m_line_column_statusbar_menu->try_add_separator()); + m_line_column_statusbar_menu->add_separator(); TRY(m_line_column_statusbar_menu->try_add_action(*m_cursor_line_highlighting_action)); TRY(m_syntax_statusbar_menu->try_add_action(*m_plain_text_highlight)); diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index 315d097f55..867c970b9f 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -285,7 +285,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) return; save_to_file(result.value().filename(), result.value().release_stream()); }))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { if (request_close() == GUI::Window::CloseRequestDecision::StayOpen) diff --git a/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp b/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp index 3b07afced2..c559798f00 100644 --- a/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp +++ b/Userland/Applications/VideoPlayer/VideoPlayerWidget.cpp @@ -393,7 +393,7 @@ ErrorOr VideoPlayerWidget::initialize_menubar(GUI::Window& window) open_file(response.release_value()); }))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { window.close(); }))); diff --git a/Userland/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp index cb3ae8d175..c31220703a 100644 --- a/Userland/Demos/CatDog/main.cpp +++ b/Userland/Demos/CatDog/main.cpp @@ -46,7 +46,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto context_menu = TRY(GUI::Menu::try_create()); TRY(context_menu->try_add_action(GUI::CommonActions::make_about_action("CatDog Demo", app_icon, window))); - TRY(context_menu->try_add_separator()); + context_menu->add_separator(); TRY(context_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); window->show(); diff --git a/Userland/Demos/Eyes/main.cpp b/Userland/Demos/Eyes/main.cpp index 0bbb066a0d..64a9a3d086 100644 --- a/Userland/Demos/Eyes/main.cpp +++ b/Userland/Demos/Eyes/main.cpp @@ -86,7 +86,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto file_menu = TRY(window->try_add_menu("&File"_string)); TRY(file_menu->try_add_action(move(show_window_frame_action))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); auto help_menu = TRY(window->try_add_menu("&Help"_string)); diff --git a/Userland/Demos/Mandelbrot/Mandelbrot.cpp b/Userland/Demos/Mandelbrot/Mandelbrot.cpp index db06862d69..f2066e087f 100644 --- a/Userland/Demos/Mandelbrot/Mandelbrot.cpp +++ b/Userland/Demos/Mandelbrot/Mandelbrot.cpp @@ -444,7 +444,7 @@ ErrorOr serenity_main(Main::Arguments arguments) export_submenu.set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"sv))); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); auto zoom_in_action = GUI::CommonActions::make_zoom_in_action( diff --git a/Userland/DevTools/GMLPlayground/MainWidget.cpp b/Userland/DevTools/GMLPlayground/MainWidget.cpp index 33c2334266..e219412685 100644 --- a/Userland/DevTools/GMLPlayground/MainWidget.cpp +++ b/Userland/DevTools/GMLPlayground/MainWidget.cpp @@ -190,7 +190,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) TRY(file_menu->try_add_action(open_action)); TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_as_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->add_recent_files_list([&](auto& action) { if (request_close() == GUI::Window::CloseRequestDecision::StayOpen) @@ -209,14 +209,14 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) auto edit_menu = TRY(window.try_add_menu("&Edit"_string)); TRY(edit_menu->try_add_action(m_editor->undo_action())); TRY(edit_menu->try_add_action(m_editor->redo_action())); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(m_editor->cut_action())); TRY(edit_menu->try_add_action(m_editor->copy_action())); TRY(edit_menu->try_add_action(m_editor->paste_action())); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(m_editor->select_all_action())); TRY(edit_menu->try_add_action(m_editor->go_to_line_or_column_action())); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); auto format_gml_action = GUI::Action::create("&Format GML", { Mod_Ctrl | Mod_Shift, Key_I }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reformat.png"sv)), [&](auto&) { auto formatted_gml_or_error = GUI::GML::format_gml(m_editor->text()); diff --git a/Userland/DevTools/SQLStudio/MainWidget.cpp b/Userland/DevTools/SQLStudio/MainWidget.cpp index cf788bbcb8..2c6e02adbe 100644 --- a/Userland/DevTools/SQLStudio/MainWidget.cpp +++ b/Userland/DevTools/SQLStudio/MainWidget.cpp @@ -307,7 +307,7 @@ ErrorOr MainWidget::initialize_menu(GUI::Window* window) TRY(file_menu->try_add_action(*m_save_action)); TRY(file_menu->try_add_action(*m_save_as_action)); TRY(file_menu->try_add_action(*m_save_all_action)); - TRY(file_menu->try_add_separator()); + file_menu->add_separator(); TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); @@ -316,10 +316,10 @@ ErrorOr MainWidget::initialize_menu(GUI::Window* window) TRY(edit_menu->try_add_action(*m_copy_action)); TRY(edit_menu->try_add_action(*m_cut_action)); TRY(edit_menu->try_add_action(*m_paste_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_undo_action)); TRY(edit_menu->try_add_action(*m_redo_action)); - TRY(edit_menu->try_add_separator()); + edit_menu->add_separator(); TRY(edit_menu->try_add_action(*m_run_script_action)); auto help_menu = TRY(window->try_add_menu("&Help"_string)); diff --git a/Userland/Games/2048/main.cpp b/Userland/Games/2048/main.cpp index 03312dc5c7..c3dbc878b7 100644 --- a/Userland/Games/2048/main.cpp +++ b/Userland/Games/2048/main.cpp @@ -187,12 +187,12 @@ ErrorOr serenity_main(Main::Arguments arguments) update(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::Action::create("&Settings", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/settings.png"sv)), [&](auto&) { change_settings(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Games/BrickGame/main.cpp b/Userland/Games/BrickGame/main.cpp index 19feb34e1a..ed417caa30 100644 --- a/Userland/Games/BrickGame/main.cpp +++ b/Userland/Games/BrickGame/main.cpp @@ -68,7 +68,7 @@ ErrorOr serenity_main(Main::Arguments arguments) show_shadow_piece_action->set_checked(game->show_shadow_hint()); TRY(game_menu->try_add_action(show_shadow_piece_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Games/Chess/main.cpp b/Userland/Games/Chess/main.cpp index 987cbf4c8b..d3954d6d54 100644 --- a/Userland/Games/Chess/main.cpp +++ b/Userland/Games/Chess/main.cpp @@ -97,7 +97,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(game_menu->try_add_action(GUI::Action::create("&Flip Board", { Mod_Ctrl, Key_F }, [&](auto&) { widget->flip_board(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::Action::create("&Import PGN...", { Mod_Ctrl, Key_O }, [&](auto&) { FileSystemAccessClient::OpenFileOptions options { @@ -129,7 +129,7 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Clipboard::the().set_data(widget->get_fen().release_value_but_fixme_should_propagate_errors().bytes()); GUI::MessageBox::show(window, "Board state copied to clipboard as FEN."sv, "Copy FEN"sv, GUI::MessageBox::Type::Information); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { if (widget->board().game_result() == Chess::Board::Result::NotFinished) { @@ -138,7 +138,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } widget->reset(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); auto settings_action = GUI::Action::create( "Chess &Settings", {}, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/games.png"sv)), [window](auto&) { @@ -155,7 +155,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }); show_available_moves_action->set_checked(widget->show_available_moves()); TRY(game_menu->try_add_action(show_available_moves_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); diff --git a/Userland/Games/ColorLines/main.cpp b/Userland/Games/ColorLines/main.cpp index 947b9830d5..85bdbc80c4 100644 --- a/Userland/Games/ColorLines/main.cpp +++ b/Userland/Games/ColorLines/main.cpp @@ -55,7 +55,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { game->reset(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Games/Flood/main.cpp b/Userland/Games/Flood/main.cpp index 853898a355..766c7cdda5 100644 --- a/Userland/Games/Flood/main.cpp +++ b/Userland/Games/Flood/main.cpp @@ -170,12 +170,12 @@ ErrorOr serenity_main(Main::Arguments arguments) start_a_new_game(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::Action::create("&Settings", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/settings.png"sv)), [&](auto&) { change_settings(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Games/GameOfLife/main.cpp b/Userland/Games/GameOfLife/main.cpp index 26b64069b8..46aa3fde60 100644 --- a/Userland/Games/GameOfLife/main.cpp +++ b/Userland/Games/GameOfLife/main.cpp @@ -136,10 +136,10 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(game_menu->try_add_action(clear_board_action)); TRY(game_menu->try_add_action(randomize_cells_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(toggle_running_action)); TRY(game_menu->try_add_action(run_one_generation_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Games/Hearts/main.cpp b/Userland/Games/Hearts/main.cpp index 28de5b50b6..b2f4aa5ba3 100644 --- a/Userland/Games/Hearts/main.cpp +++ b/Userland/Games/Hearts/main.cpp @@ -90,12 +90,12 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(game_menu->try_add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { game.setup(player_name); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(TRY(Cards::make_cards_settings_action(window)))); TRY(game_menu->try_add_action(GUI::Action::create("&Settings", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/settings.png"sv)), [&](auto&) { change_settings(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); auto help_menu = TRY(window->try_add_menu("&Help"_string)); diff --git a/Userland/Games/MasterWord/main.cpp b/Userland/Games/MasterWord/main.cpp index 26d61a9c6b..6077c637c8 100644 --- a/Userland/Games/MasterWord/main.cpp +++ b/Userland/Games/MasterWord/main.cpp @@ -72,7 +72,7 @@ ErrorOr serenity_main(Main::Arguments arguments) game.reset(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp index 34e5957c50..b00f2aae46 100644 --- a/Userland/Games/Minesweeper/main.cpp +++ b/Userland/Games/Minesweeper/main.cpp @@ -64,7 +64,7 @@ ErrorOr serenity_main(Main::Arguments arguments) field->reset(); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); auto chord_toggler_action = GUI::Action::create_checkable("&Single-click Chording", [&](auto& action) { field->set_single_chording(action.is_checked()); @@ -72,7 +72,7 @@ ErrorOr serenity_main(Main::Arguments arguments) chord_toggler_action->set_checked(field->is_single_chording()); TRY(game_menu->try_add_action(*chord_toggler_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); @@ -110,7 +110,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(difficulty_menu->try_add_action(action)); difficulty_actions.add_action(action); - TRY(difficulty_menu->try_add_separator()); + difficulty_menu->add_separator(); action = GUI::Action::create_checkable("&Custom Game...", { Mod_Ctrl, Key_C }, [&](auto&) { CustomGameDialog::show(window, field); }); diff --git a/Userland/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp index 57eb37371b..c755509c97 100644 --- a/Userland/Games/Snake/main.cpp +++ b/Userland/Games/Snake/main.cpp @@ -146,7 +146,7 @@ ErrorOr serenity_main(Main::Arguments arguments) })); TRY(add_skin_action("Classic"sv, true)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); }))); diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp index ea8a6dfd67..96cfd8399d 100644 --- a/Userland/Games/Solitaire/main.cpp +++ b/Userland/Games/Solitaire/main.cpp @@ -205,19 +205,19 @@ ErrorOr serenity_main(Main::Arguments arguments) game.setup(mode); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); auto undo_action = GUI::CommonActions::make_undo_action([&](auto&) { game.perform_undo(); }); undo_action->set_enabled(false); TRY(game_menu->try_add_action(undo_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(TRY(Cards::make_cards_settings_action(window)))); TRY(game_menu->try_add_action(single_card_draw_action)); TRY(game_menu->try_add_action(three_card_draw_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(toggle_auto_collect_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); auto help_menu = TRY(window->try_add_menu("&Help"_string)); diff --git a/Userland/Games/Spider/main.cpp b/Userland/Games/Spider/main.cpp index 85448c6a6f..f2616cb31b 100644 --- a/Userland/Games/Spider/main.cpp +++ b/Userland/Games/Spider/main.cpp @@ -242,17 +242,17 @@ ErrorOr serenity_main(Main::Arguments arguments) game.setup(mode); }))); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); auto undo_action = GUI::CommonActions::make_undo_action([&](auto&) { game.perform_undo(); }); undo_action->set_enabled(false); TRY(game_menu->try_add_action(undo_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(TRY(Cards::make_cards_settings_action(window)))); TRY(game_menu->try_add_action(single_suit_action)); TRY(game_menu->try_add_action(two_suit_action)); - TRY(game_menu->try_add_separator()); + game_menu->add_separator(); TRY(game_menu->try_add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }))); auto view_menu = TRY(window->try_add_menu("&View"_string)); diff --git a/Userland/Libraries/LibGUI/LinkLabel.cpp b/Userland/Libraries/LibGUI/LinkLabel.cpp index 38c0bbceed..52ca5ab548 100644 --- a/Userland/Libraries/LibGUI/LinkLabel.cpp +++ b/Userland/Libraries/LibGUI/LinkLabel.cpp @@ -51,7 +51,7 @@ ErrorOr LinkLabel::create_menus() { m_context_menu = TRY(Menu::try_create()); TRY(m_context_menu->try_add_action(*m_open_action)); - TRY(m_context_menu->try_add_separator()); + m_context_menu->add_separator(); TRY(m_context_menu->try_add_action(*m_copy_action)); return {}; } diff --git a/Userland/Libraries/LibGUI/Menu.cpp b/Userland/Libraries/LibGUI/Menu.cpp index 91f5b576f8..7588184fe0 100644 --- a/Userland/Libraries/LibGUI/Menu.cpp +++ b/Userland/Libraries/LibGUI/Menu.cpp @@ -127,21 +127,12 @@ Menu& Menu::add_submenu(String name) return menu; } -ErrorOr Menu::try_add_separator() -{ - // NOTE: We grow the vector first, to get allocation failure handled immediately. - TRY(m_items.try_ensure_capacity(m_items.size() + 1)); - - auto item = TRY(adopt_nonnull_own_or_enomem(new (nothrow) MenuItem(m_menu_id, MenuItem::Type::Separator))); - if (m_menu_id != -1) - realize_menu_item(*item, m_items.size()); - m_items.unchecked_append(move(item)); - return {}; -} - void Menu::add_separator() { - MUST(try_add_separator()); + auto item = make(m_menu_id, MenuItem::Type::Separator); + if (m_menu_id != -1) + realize_menu_item(*item, m_items.size()); + m_items.append(move(item)); } void Menu::realize_if_needed(RefPtr const& default_action) @@ -271,7 +262,7 @@ ErrorOr Menu::add_recent_files_list(Function callback) TRY(try_add_action(action)); } - TRY(try_add_separator()); + add_separator(); return {}; } diff --git a/Userland/Libraries/LibGUI/Menu.h b/Userland/Libraries/LibGUI/Menu.h index 43fd94fe0e..da76175657 100644 --- a/Userland/Libraries/LibGUI/Menu.h +++ b/Userland/Libraries/LibGUI/Menu.h @@ -42,7 +42,6 @@ public: Action* action_at(size_t); ErrorOr try_add_action(NonnullRefPtr); - ErrorOr try_add_separator(); ErrorOr> try_add_submenu(String name); void add_action(NonnullRefPtr); diff --git a/Userland/Libraries/LibGUI/Toolbar.cpp b/Userland/Libraries/LibGUI/Toolbar.cpp index bedcff39ce..44db59c077 100644 --- a/Userland/Libraries/LibGUI/Toolbar.cpp +++ b/Userland/Libraries/LibGUI/Toolbar.cpp @@ -258,7 +258,7 @@ ErrorOr Toolbar::update_overflow_menu() TRY(m_overflow_menu->try_add_action(*item->action)); } if (item->action && peek_item->type == Item::Type::Separator) - TRY(m_overflow_menu->try_add_separator()); + m_overflow_menu->add_separator(); } return {};