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

CharacterMap: Propagate errors from initialize_menubar()

Browse source
This commit is contained in:
Karol Kosek 2023-04-16 15:22:41 +02:00 • committed by Sam Atkins
parent b4f78760f2
commit abe5787126
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Applications/CharacterMap/CharacterMapWidget.cpp
View file

@ -149,19 +149,20 @@ CharacterMapWidget::CharacterMapWidget()
update_statusbar(); update_statusbar();
} }
void CharacterMapWidget::initialize_menubar(GUI::Window& window) ErrorOr<void> CharacterMapWidget::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(GUI::CommonActions::make_quit_action([](GUI::Action&) { TRY(file_menu->try_add_action(GUI::CommonActions::make_quit_action([](GUI::Action&) {
GUI::Application::the()->quit(); GUI::Application::the()->quit();
})); })));
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/CharacterMap.md"), "/bin/Help"); Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man1/CharacterMap.md"), "/bin/Help");
})); })));
help_menu.add_action(GUI::CommonActions::make_about_action("Character Map", GUI::Icon::default_icon("app-character-map"sv), &window)); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Character Map", GUI::Icon::default_icon("app-character-map"sv), &window)));
return {};
} }
void CharacterMapWidget::did_change_font() void CharacterMapWidget::did_change_font()

2
Userland/Applications/CharacterMap/CharacterMapWidget.h
View file

@ -17,7 +17,7 @@ class CharacterMapWidget final : public GUI::Widget {
public: public:
virtual ~CharacterMapWidget() override = default; virtual ~CharacterMapWidget() override = default;
void initialize_menubar(GUI::Window& window); ErrorOr<void> initialize_menubar(GUI::Window& window);
private: private:
CharacterMapWidget(); CharacterMapWidget();

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

@ -70,7 +70,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->resize(600, 400); window->resize(600, 400);
auto character_map_widget = TRY(window->set_main_widget<CharacterMapWidget>()); auto character_map_widget = TRY(window->set_main_widget<CharacterMapWidget>());
character_map_widget->initialize_menubar(*window); TRY(character_map_widget->initialize_menubar(*window));
auto font_query = Config::read_string("CharacterMap"sv, "History"sv, "Font"sv, Gfx::FontDatabase::the().default_font_query()); auto font_query = Config::read_string("CharacterMap"sv, "History"sv, "Font"sv, Gfx::FontDatabase::the().default_font_query());
character_map_widget->set_font(Gfx::FontDatabase::the().get_by_name(font_query)); character_map_widget->set_font(Gfx::FontDatabase::the().get_by_name(font_query));