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

HexEditor: Propagate errors from HexEditorWidget::initialize_menubar()

Browse source
This commit is contained in:
Karol Kosek 2023-04-16 14:56:27 +02:00 • committed by Sam Atkins
parent abe5787126
commit 41cf3b741f
3 changed files with 47 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

88
Userland/Applications/HexEditor/HexEditorWidget.cpp
View file

@ -401,36 +401,36 @@ void HexEditorWidget::update_inspector_values(size_t position)
m_value_inspector->update(); m_value_inspector->update();
} }
void HexEditorWidget::initialize_menubar(GUI::Window& window) ErrorOr<void> HexEditorWidget::initialize_menubar(GUI::Window& window)
{ {
auto& file_menu = window.add_menu("&File"_short_string); auto file_menu = TRY(window.try_add_menu("&File"_short_string));
file_menu.add_action(*m_new_action); TRY(file_menu->try_add_action(*m_new_action));
file_menu.add_action(*m_open_action); TRY(file_menu->try_add_action(*m_open_action));
file_menu.add_action(*m_save_action); TRY(file_menu->try_add_action(*m_save_action));
file_menu.add_action(*m_save_as_action); TRY(file_menu->try_add_action(*m_save_as_action));
file_menu.add_separator(); TRY(file_menu->try_add_separator());
file_menu.add_action(GUI::CommonActions::make_quit_action([this](auto&) { TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([this](auto&) {
if (!request_close()) if (!request_close())
return; return;
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); })));
auto& edit_menu = window.add_menu("&Edit"_short_string); auto edit_menu = TRY(window.try_add_menu("&Edit"_short_string));
edit_menu.add_action(*m_undo_action); TRY(edit_menu->try_add_action(*m_undo_action));
edit_menu.add_action(*m_redo_action); TRY(edit_menu->try_add_action(*m_redo_action));
edit_menu.add_separator(); TRY(edit_menu->try_add_separator());
edit_menu.add_action(GUI::CommonActions::make_select_all_action([this](auto&) { TRY(edit_menu->try_add_action(GUI::CommonActions::make_select_all_action([this](auto&) {
m_editor->select_all(); m_editor->select_all();
m_editor->update(); m_editor->update();
})); })));
edit_menu.add_action(*m_fill_selection_action); TRY(edit_menu->try_add_action(*m_fill_selection_action));
edit_menu.add_separator(); TRY(edit_menu->try_add_separator());
edit_menu.add_action(*m_copy_hex_action); TRY(edit_menu->try_add_action(*m_copy_hex_action));
edit_menu.add_action(*m_copy_text_action); TRY(edit_menu->try_add_action(*m_copy_text_action));
edit_menu.add_action(*m_copy_as_c_code_action); TRY(edit_menu->try_add_action(*m_copy_as_c_code_action));
edit_menu.add_separator(); TRY(edit_menu->try_add_separator());
edit_menu.add_action(*m_find_action); TRY(edit_menu->try_add_action(*m_find_action));
edit_menu.add_action(GUI::Action::create("Find &Next", { Mod_None, Key_F3 }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find-next.png"sv).release_value_but_fixme_should_propagate_errors(), [&](const GUI::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()) { if (m_search_text.is_empty() || m_search_buffer.is_empty()) {
GUI::MessageBox::show(&window, "Nothing to search for"sv, "Not found"sv, GUI::MessageBox::Type::Warning); GUI::MessageBox::show(&window, "Nothing to search for"sv, "Not found"sv, GUI::MessageBox::Type::Warning);
return; return;
@ -443,9 +443,9 @@ void HexEditorWidget::initialize_menubar(GUI::Window& window)
} }
m_editor->update(); m_editor->update();
m_last_found_index = result.value(); m_last_found_index = result.value();
})); })));
edit_menu.add_action(GUI::Action::create("Find All &Strings", { Mod_Ctrl | Mod_Shift, Key_F }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv).release_value_but_fixme_should_propagate_errors(), [&](const GUI::Action&) { TRY(edit_menu->try_add_action(GUI::Action::create("Find All &Strings", { Mod_Ctrl | Mod_Shift, Key_F }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv)), [&](const GUI::Action&) {
int min_length = 4; int min_length = 4;
auto matches = m_editor->find_all_strings(min_length); auto matches = m_editor->find_all_strings(min_length);
m_search_results->set_model(*new SearchResultsModel(move(matches))); m_search_results->set_model(*new SearchResultsModel(move(matches)));
@ -458,26 +458,26 @@ void HexEditorWidget::initialize_menubar(GUI::Window& window)
set_search_results_visible(true); set_search_results_visible(true);
m_editor->update(); m_editor->update();
})); })));
edit_menu.add_separator(); TRY(edit_menu->try_add_separator());
edit_menu.add_action(*m_goto_offset_action); TRY(edit_menu->try_add_action(*m_goto_offset_action));
auto& view_menu = window.add_menu("&View"_short_string); auto view_menu = TRY(window.try_add_menu("&View"_short_string));
auto show_toolbar = Config::read_bool("HexEditor"sv, "Layout"sv, "ShowToolbar"sv, true); auto show_toolbar = Config::read_bool("HexEditor"sv, "Layout"sv, "ShowToolbar"sv, true);
m_layout_toolbar_action->set_checked(show_toolbar); m_layout_toolbar_action->set_checked(show_toolbar);
m_toolbar_container->set_visible(show_toolbar); m_toolbar_container->set_visible(show_toolbar);
view_menu.add_action(*m_layout_toolbar_action); TRY(view_menu->try_add_action(*m_layout_toolbar_action));
view_menu.add_action(*m_layout_search_results_action); TRY(view_menu->try_add_action(*m_layout_search_results_action));
view_menu.add_action(*m_layout_value_inspector_action); TRY(view_menu->try_add_action(*m_layout_value_inspector_action));
view_menu.add_separator(); TRY(view_menu->try_add_separator());
auto bytes_per_row = Config::read_i32("HexEditor"sv, "Layout"sv, "BytesPerRow"sv, 16); auto bytes_per_row = Config::read_i32("HexEditor"sv, "Layout"sv, "BytesPerRow"sv, 16);
m_editor->set_bytes_per_row(bytes_per_row); m_editor->set_bytes_per_row(bytes_per_row);
m_editor->update(); m_editor->update();
m_bytes_per_row_actions.set_exclusive(true); m_bytes_per_row_actions.set_exclusive(true);
auto& bytes_per_row_menu = view_menu.add_submenu("Bytes per &Row"_string.release_value_but_fixme_should_propagate_errors()); auto bytes_per_row_menu = TRY(view_menu->try_add_submenu(TRY("Bytes per &Row"_string)));
for (int i = 8; i <= 32; i += 8) { for (int i = 8; i <= 32; i += 8) {
auto action = GUI::Action::create_checkable(DeprecatedString::number(i), [this, i](auto&) { auto action = GUI::Action::create_checkable(DeprecatedString::number(i), [this, i](auto&) {
m_editor->set_bytes_per_row(i); m_editor->set_bytes_per_row(i);
@ -485,36 +485,38 @@ void HexEditorWidget::initialize_menubar(GUI::Window& window)
Config::write_i32("HexEditor"sv, "Layout"sv, "BytesPerRow"sv, i); Config::write_i32("HexEditor"sv, "Layout"sv, "BytesPerRow"sv, i);
}); });
m_bytes_per_row_actions.add_action(action); m_bytes_per_row_actions.add_action(action);
bytes_per_row_menu.add_action(action); TRY(bytes_per_row_menu->try_add_action(action));
if (i == bytes_per_row) if (i == bytes_per_row)
action->set_checked(true); action->set_checked(true);
} }
m_value_inspector_mode_actions.set_exclusive(true); m_value_inspector_mode_actions.set_exclusive(true);
auto& inspector_mode_menu = view_menu.add_submenu("Value Inspector &Mode"_string.release_value_but_fixme_should_propagate_errors()); auto inspector_mode_menu = TRY(view_menu->try_add_submenu(TRY("Value Inspector &Mode"_string)));
auto little_endian_mode = GUI::Action::create_checkable("&Little Endian", [&](auto& action) { auto little_endian_mode = GUI::Action::create_checkable("&Little Endian", [&](auto& action) {
m_value_inspector_little_endian = action.is_checked(); m_value_inspector_little_endian = action.is_checked();
update_inspector_values(m_editor->selection_start_offset()); update_inspector_values(m_editor->selection_start_offset());
}); });
m_value_inspector_mode_actions.add_action(little_endian_mode); m_value_inspector_mode_actions.add_action(little_endian_mode);
inspector_mode_menu.add_action(little_endian_mode); TRY(inspector_mode_menu->try_add_action(little_endian_mode));
auto big_endian_mode = GUI::Action::create_checkable("&Big Endian", [this](auto& action) { auto big_endian_mode = GUI::Action::create_checkable("&Big Endian", [this](auto& action) {
m_value_inspector_little_endian = !action.is_checked(); m_value_inspector_little_endian = !action.is_checked();
update_inspector_values(m_editor->selection_start_offset()); update_inspector_values(m_editor->selection_start_offset());
}); });
m_value_inspector_mode_actions.add_action(big_endian_mode); m_value_inspector_mode_actions.add_action(big_endian_mode);
inspector_mode_menu.add_action(big_endian_mode); TRY(inspector_mode_menu->try_add_action(big_endian_mode));
// Default to little endian mode // Default to little endian mode
little_endian_mode->set_checked(true); little_endian_mode->set_checked(true);
auto& help_menu = window.add_menu("&Help"_short_string); auto help_menu = TRY(window.try_add_menu("&Help"_short_string));
help_menu.add_action(GUI::CommonActions::make_command_palette_action(&window)); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) { TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/HexEditor.md"), "/bin/Help"); Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/HexEditor.md"), "/bin/Help");
})); })));
help_menu.add_action(GUI::CommonActions::make_about_action("Hex Editor", GUI::Icon::default_icon("app-hex-editor"sv), &window)); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Hex Editor", GUI::Icon::default_icon("app-hex-editor"sv), &window)));
return {};
} }
void HexEditorWidget::set_path(StringView path) void HexEditorWidget::set_path(StringView path)

2
Userland/Applications/HexEditor/HexEditorWidget.h
View file

@ -26,7 +26,7 @@ class HexEditorWidget final : public GUI::Widget {
public: public:
virtual ~HexEditorWidget() override = default; virtual ~HexEditorWidget() override = default;
void open_file(String const& filename, NonnullOwnPtr<Core::File>); void open_file(String const& filename, NonnullOwnPtr<Core::File>);
void initialize_menubar(GUI::Window&); ErrorOr<void> initialize_menubar(GUI::Window&);
bool request_close(); bool request_close();
private: private:

2
Userland/Applications/HexEditor/main.cpp
View file

@ -47,7 +47,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil(nullptr, nullptr)); TRY(Core::System::unveil(nullptr, nullptr));
hex_editor_widget->initialize_menubar(*window); TRY(hex_editor_widget->initialize_menubar(*window));
window->show(); window->show();
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));