mirror of
https://github.com/RGBCube/serenity
synced 2025-07-29 14:27:35 +00:00
LibGUI+Userland: Remove Toolbar::try_add_{action,separator}()
These calls largely occur during initialization before there's unsaved state worth preserving
This commit is contained in:
parent
eafdb06d87
commit
57f3b18109
10 changed files with 109 additions and 131 deletions
|
@ -61,15 +61,15 @@ ErrorOr<NonnullRefPtr<CalendarWidget>> CalendarWidget::create(GUI::Window* paren
|
|||
|
||||
auto open_settings_action = TRY(widget->create_open_settings_action());
|
||||
|
||||
(void)TRY(toolbar->try_add_action(prev_date_action));
|
||||
(void)TRY(toolbar->try_add_action(next_date_action));
|
||||
TRY(toolbar->try_add_separator());
|
||||
(void)TRY(toolbar->try_add_action(jump_to_action));
|
||||
(void)TRY(toolbar->try_add_action(add_event_action));
|
||||
TRY(toolbar->try_add_separator());
|
||||
(void)TRY(toolbar->try_add_action(view_month_action));
|
||||
(void)TRY(toolbar->try_add_action(view_year_action));
|
||||
(void)TRY(toolbar->try_add_action(open_settings_action));
|
||||
toolbar->add_action(prev_date_action);
|
||||
toolbar->add_action(next_date_action);
|
||||
toolbar->add_separator();
|
||||
toolbar->add_action(jump_to_action);
|
||||
toolbar->add_action(add_event_action);
|
||||
toolbar->add_separator();
|
||||
toolbar->add_action(view_month_action);
|
||||
toolbar->add_action(view_year_action);
|
||||
toolbar->add_action(open_settings_action);
|
||||
|
||||
widget->create_on_tile_doubleclick();
|
||||
|
||||
|
|
|
@ -1079,31 +1079,31 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
|
|||
help_menu->add_action(GUI::CommonActions::make_command_palette_action(window));
|
||||
help_menu->add_action(GUI::CommonActions::make_about_action("File Manager"sv, GUI::Icon::default_icon("app-file-manager"sv), window));
|
||||
|
||||
(void)TRY(main_toolbar.try_add_action(go_back_action));
|
||||
(void)TRY(main_toolbar.try_add_action(go_forward_action));
|
||||
(void)TRY(main_toolbar.try_add_action(open_parent_directory_action));
|
||||
(void)TRY(main_toolbar.try_add_action(go_home_action));
|
||||
main_toolbar.add_action(go_back_action);
|
||||
main_toolbar.add_action(go_forward_action);
|
||||
main_toolbar.add_action(open_parent_directory_action);
|
||||
main_toolbar.add_action(go_home_action);
|
||||
|
||||
TRY(main_toolbar.try_add_separator());
|
||||
(void)TRY(main_toolbar.try_add_action(directory_view->open_terminal_action()));
|
||||
main_toolbar.add_separator();
|
||||
main_toolbar.add_action(directory_view->open_terminal_action());
|
||||
|
||||
TRY(main_toolbar.try_add_separator());
|
||||
(void)TRY(main_toolbar.try_add_action(mkdir_action));
|
||||
(void)TRY(main_toolbar.try_add_action(touch_action));
|
||||
TRY(main_toolbar.try_add_separator());
|
||||
main_toolbar.add_separator();
|
||||
main_toolbar.add_action(mkdir_action);
|
||||
main_toolbar.add_action(touch_action);
|
||||
main_toolbar.add_separator();
|
||||
|
||||
(void)TRY(main_toolbar.try_add_action(focus_dependent_delete_action));
|
||||
(void)TRY(main_toolbar.try_add_action(directory_view->rename_action()));
|
||||
main_toolbar.add_action(focus_dependent_delete_action);
|
||||
main_toolbar.add_action(directory_view->rename_action());
|
||||
|
||||
TRY(main_toolbar.try_add_separator());
|
||||
(void)TRY(main_toolbar.try_add_action(cut_action));
|
||||
(void)TRY(main_toolbar.try_add_action(copy_action));
|
||||
(void)TRY(main_toolbar.try_add_action(paste_action));
|
||||
main_toolbar.add_separator();
|
||||
main_toolbar.add_action(cut_action);
|
||||
main_toolbar.add_action(copy_action);
|
||||
main_toolbar.add_action(paste_action);
|
||||
|
||||
TRY(main_toolbar.try_add_separator());
|
||||
(void)TRY(main_toolbar.try_add_action(directory_view->view_as_icons_action()));
|
||||
(void)TRY(main_toolbar.try_add_action(directory_view->view_as_table_action()));
|
||||
(void)TRY(main_toolbar.try_add_action(directory_view->view_as_columns_action()));
|
||||
main_toolbar.add_separator();
|
||||
main_toolbar.add_action(directory_view->view_as_icons_action());
|
||||
main_toolbar.add_action(directory_view->view_as_table_action());
|
||||
main_toolbar.add_action(directory_view->view_as_columns_action());
|
||||
|
||||
breadcrumbbar.on_path_change = [&](auto selected_path) {
|
||||
if (FileSystem::is_directory(selected_path)) {
|
||||
|
|
|
@ -378,33 +378,33 @@ ErrorOr<void> MainWidget::create_actions()
|
|||
ErrorOr<void> MainWidget::create_toolbars()
|
||||
{
|
||||
auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
|
||||
(void)TRY(toolbar.try_add_action(*m_new_action));
|
||||
(void)TRY(toolbar.try_add_action(*m_open_action));
|
||||
(void)TRY(toolbar.try_add_action(*m_save_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_delete_action));
|
||||
TRY(toolbar.try_add_separator());
|
||||
(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_open_preview_action));
|
||||
TRY(toolbar.try_add_separator());
|
||||
(void)TRY(toolbar.try_add_action(*m_previous_glyph_action));
|
||||
(void)TRY(toolbar.try_add_action(*m_next_glyph_action));
|
||||
(void)TRY(toolbar.try_add_action(*m_go_to_glyph_action));
|
||||
toolbar.add_action(*m_new_action);
|
||||
toolbar.add_action(*m_open_action);
|
||||
toolbar.add_action(*m_save_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_delete_action);
|
||||
toolbar.add_separator();
|
||||
toolbar.add_action(*m_undo_action);
|
||||
toolbar.add_action(*m_redo_action);
|
||||
toolbar.add_separator();
|
||||
toolbar.add_action(*m_open_preview_action);
|
||||
toolbar.add_separator();
|
||||
toolbar.add_action(*m_previous_glyph_action);
|
||||
toolbar.add_action(*m_next_glyph_action);
|
||||
toolbar.add_action(*m_go_to_glyph_action);
|
||||
|
||||
auto& glyph_transform_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("glyph_transform_toolbar");
|
||||
(void)TRY(glyph_transform_toolbar.try_add_action(*m_flip_horizontal_action));
|
||||
(void)TRY(glyph_transform_toolbar.try_add_action(*m_flip_vertical_action));
|
||||
(void)TRY(glyph_transform_toolbar.try_add_action(*m_rotate_counterclockwise_action));
|
||||
(void)TRY(glyph_transform_toolbar.try_add_action(*m_rotate_clockwise_action));
|
||||
glyph_transform_toolbar.add_action(*m_flip_horizontal_action);
|
||||
glyph_transform_toolbar.add_action(*m_flip_vertical_action);
|
||||
glyph_transform_toolbar.add_action(*m_rotate_counterclockwise_action);
|
||||
glyph_transform_toolbar.add_action(*m_rotate_clockwise_action);
|
||||
|
||||
auto& glyph_mode_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("glyph_mode_toolbar");
|
||||
(void)TRY(glyph_mode_toolbar.try_add_action(*m_paint_glyph_action));
|
||||
(void)TRY(glyph_mode_toolbar.try_add_action(*m_move_glyph_action));
|
||||
glyph_mode_toolbar.add_action(*m_paint_glyph_action);
|
||||
glyph_mode_toolbar.add_action(*m_move_glyph_action);
|
||||
|
||||
return {};
|
||||
}
|
||||
|
|
|
@ -200,9 +200,9 @@ ErrorOr<void> MainWidget::initialize_fallibles(GUI::Window& window)
|
|||
open_page(help_index_path);
|
||||
});
|
||||
|
||||
(void)TRY(m_toolbar->try_add_action(*m_go_back_action));
|
||||
(void)TRY(m_toolbar->try_add_action(*m_go_forward_action));
|
||||
(void)TRY(m_toolbar->try_add_action(*m_go_home_action));
|
||||
m_toolbar->add_action(*m_go_back_action);
|
||||
m_toolbar->add_action(*m_go_forward_action);
|
||||
m_toolbar->add_action(*m_go_home_action);
|
||||
|
||||
auto file_menu = window.add_menu("&File"_string);
|
||||
file_menu->add_action(GUI::CommonActions::make_quit_action([](auto&) {
|
||||
|
|
|
@ -294,17 +294,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
};
|
||||
|
||||
(void)TRY(main_toolbar->try_add_action(open_action));
|
||||
(void)TRY(main_toolbar->try_add_action(delete_action));
|
||||
(void)TRY(main_toolbar->try_add_separator());
|
||||
(void)TRY(main_toolbar->try_add_action(go_first_action));
|
||||
(void)TRY(main_toolbar->try_add_action(go_back_action));
|
||||
(void)TRY(main_toolbar->try_add_action(go_forward_action));
|
||||
(void)TRY(main_toolbar->try_add_action(go_last_action));
|
||||
(void)TRY(main_toolbar->try_add_separator());
|
||||
(void)TRY(main_toolbar->try_add_action(zoom_in_action));
|
||||
(void)TRY(main_toolbar->try_add_action(reset_zoom_action));
|
||||
(void)TRY(main_toolbar->try_add_action(zoom_out_action));
|
||||
main_toolbar->add_action(open_action);
|
||||
main_toolbar->add_action(delete_action);
|
||||
main_toolbar->add_separator();
|
||||
main_toolbar->add_action(go_first_action);
|
||||
main_toolbar->add_action(go_back_action);
|
||||
main_toolbar->add_action(go_forward_action);
|
||||
main_toolbar->add_action(go_last_action);
|
||||
main_toolbar->add_separator();
|
||||
main_toolbar->add_action(zoom_in_action);
|
||||
main_toolbar->add_action(reset_zoom_action);
|
||||
main_toolbar->add_action(zoom_out_action);
|
||||
|
||||
auto file_menu = window->add_menu("&File"_string);
|
||||
file_menu->add_action(open_action);
|
||||
|
|
|
@ -1178,19 +1178,19 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
});
|
||||
|
||||
auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
|
||||
(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));
|
||||
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);
|
||||
|
||||
m_zoom_combobox = TRY(toolbar.try_add<GUI::ComboBox>());
|
||||
m_zoom_combobox->set_max_width(75);
|
||||
|
@ -1230,8 +1230,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
m_zoom_combobox->on_change(m_zoom_combobox->text(), GUI::ModelIndex());
|
||||
};
|
||||
|
||||
TRY(toolbar.try_add_separator());
|
||||
(void)TRY(toolbar.try_add_action(*m_levels_dialog_action));
|
||||
toolbar.add_separator();
|
||||
toolbar.add_action(*m_levels_dialog_action);
|
||||
|
||||
return {};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue