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

Terminal: Propagate more errors

Browse source
This commit is contained in:
Junior Rantila 2022-08-06 02:50:22 +02:00 • committed by Brian Gianforcaro
parent 407a88ebf6
commit d40b0439d8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Applications/Terminal/main.cpp
View file

@ -192,10 +192,10 @@ static ErrorOr<NonnullRefPtr<GUI::Window>> create_find_window(VT::TerminalWidget
find_textbox->set_text(terminal.selected_text().replace("\n"sv, " "sv, ReplaceMode::All)); find_textbox->set_text(terminal.selected_text().replace("\n"sv, " "sv, ReplaceMode::All));
auto find_backwards = TRY(find->try_add<GUI::Button>()); auto find_backwards = TRY(find->try_add<GUI::Button>());
find_backwards->set_fixed_width(25); find_backwards->set_fixed_width(25);
find_backwards->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/upward-triangle.png"sv).release_value_but_fixme_should_propagate_errors()); find_backwards->set_icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/upward-triangle.png"sv)));
auto find_forwards = TRY(find->try_add<GUI::Button>()); auto find_forwards = TRY(find->try_add<GUI::Button>());
find_forwards->set_fixed_width(25); find_forwards->set_fixed_width(25);
find_forwards->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/downward-triangle.png"sv).release_value_but_fixme_should_propagate_errors()); find_forwards->set_icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/downward-triangle.png"sv)));
find_textbox->on_return_pressed = [find_backwards]() mutable { find_textbox->on_return_pressed = [find_backwards]() mutable {
find_backwards->click(); find_backwards->click();
@ -338,7 +338,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto show_scroll_bar = Config::read_bool("Terminal"sv, "Terminal"sv, "ShowScrollBar"sv, true); auto show_scroll_bar = Config::read_bool("Terminal"sv, "Terminal"sv, "ShowScrollBar"sv, true);
terminal->set_show_scrollbar(show_scroll_bar); terminal->set_show_scrollbar(show_scroll_bar);
auto open_settings_action = GUI::Action::create("&Settings", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/settings.png"sv).release_value_but_fixme_should_propagate_errors(), auto open_settings_action = GUI::Action::create("&Settings", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/settings.png"sv)),
[&](auto&) { [&](auto&) {
GUI::Process::spawn_or_show_error(window, "/bin/TerminalSettings"sv); GUI::Process::spawn_or_show_error(window, "/bin/TerminalSettings"sv);
}); });
@ -347,7 +347,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(terminal->context_menu().try_add_action(open_settings_action)); TRY(terminal->context_menu().try_add_action(open_settings_action));
auto file_menu = TRY(window->try_add_menu("&File")); auto file_menu = TRY(window->try_add_menu("&File"));
TRY(file_menu->try_add_action(GUI::Action::create("Open New &Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-terminal.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { TRY(file_menu->try_add_action(GUI::Action::create("Open New &Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-terminal.png"sv)), [&](auto&) {
GUI::Process::spawn_or_show_error(window, "/bin/Terminal"sv); GUI::Process::spawn_or_show_error(window, "/bin/Terminal"sv);
}))); })));
@ -397,7 +397,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(edit_menu->try_add_action(terminal->copy_action())); TRY(edit_menu->try_add_action(terminal->copy_action()));
TRY(edit_menu->try_add_action(terminal->paste_action())); TRY(edit_menu->try_add_action(terminal->paste_action()));
TRY(edit_menu->try_add_separator()); TRY(edit_menu->try_add_separator());
TRY(edit_menu->try_add_action(GUI::Action::create("&Find...", { Mod_Ctrl | Mod_Shift, Key_F }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/find.png"sv).release_value_but_fixme_should_propagate_errors(), TRY(edit_menu->try_add_action(GUI::Action::create("&Find...", { Mod_Ctrl | Mod_Shift, Key_F }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/find.png"sv)),
[&](auto&) { [&](auto&) {
find_window->show(); find_window->show();
find_window->move_to_front(); find_window->move_to_front();