mirror of
https://github.com/RGBCube/serenity
synced 2025-05-14 07:54:58 +00:00
1a97382305
The pattern to construct `Application` was to use the `try_create` method from the `C_OBJECT` macro. While being safe from an OOM perspective, this method doesn't propagate errors from the constructor. This patch make `Application` use the `C_OBJECT_ABSTRACT` and manually define a `create` method that can bubble up errors from the construction stage. This commit also removes the ability to use `argc` and `argv` to create an `Application`, only `Main`'s `Arguments` can be used. From a user point of view, the patch renames `try_create` => `create`, hence the huge number of modified files.
112 lines
4.2 KiB
C++
112 lines
4.2 KiB
C++
/*
|
||
* Copyright (c) 2020, Hüseyin Aslıtürk <asliturk@hotmail.com>
|
||
* Copyright (c) 2021, Rasmus Nylander <RasmusNylander.SerenityOS@gmail.com>
|
||
*
|
||
* SPDX-License-Identifier: BSD-2-Clause
|
||
*/
|
||
|
||
#include "KeyboardMapperWidget.h"
|
||
#include <LibCore/ArgsParser.h>
|
||
#include <LibCore/System.h>
|
||
#include <LibGUI/Action.h>
|
||
#include <LibGUI/Application.h>
|
||
#include <LibGUI/FilePicker.h>
|
||
#include <LibGUI/Icon.h>
|
||
#include <LibGUI/Menu.h>
|
||
#include <LibGUI/Menubar.h>
|
||
#include <LibMain/Main.h>
|
||
|
||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||
{
|
||
StringView path;
|
||
Core::ArgsParser args_parser;
|
||
args_parser.add_positional_argument(path, "Keyboard character mapping file.", "file", Core::ArgsParser::Required::No);
|
||
args_parser.parse(arguments);
|
||
|
||
TRY(Core::System::pledge("stdio getkeymap thread rpath cpath wpath recvfd sendfd unix"));
|
||
|
||
auto app = TRY(GUI::Application::create(arguments));
|
||
|
||
TRY(Core::System::pledge("stdio getkeymap thread rpath cpath wpath recvfd sendfd"));
|
||
|
||
auto app_icon = GUI::Icon::default_icon("app-keyboard-mapper"sv);
|
||
|
||
auto window = GUI::Window::construct();
|
||
window->set_title("Keyboard Mapper");
|
||
window->set_icon(app_icon.bitmap_for_size(16));
|
||
auto keyboard_mapper_widget = TRY(window->set_main_widget<KeyboardMapperWidget>());
|
||
window->resize(775, 315);
|
||
window->set_resizable(false);
|
||
|
||
if (path.is_empty())
|
||
TRY(keyboard_mapper_widget->load_map_from_system());
|
||
else
|
||
TRY(keyboard_mapper_widget->load_map_from_file(path));
|
||
|
||
TRY(Core::System::pledge("stdio thread rpath cpath wpath recvfd sendfd"));
|
||
|
||
auto open_action = GUI::CommonActions::make_open_action(
|
||
[&](auto&) {
|
||
if (!keyboard_mapper_widget->request_close())
|
||
return;
|
||
|
||
Optional<DeprecatedString> path = GUI::FilePicker::get_open_filepath(window, "Open"sv, "/res/keymaps/"sv);
|
||
if (!path.has_value())
|
||
return;
|
||
|
||
if (auto error_or = keyboard_mapper_widget->load_map_from_file(path.value()); error_or.is_error())
|
||
keyboard_mapper_widget->show_error_to_user(error_or.release_error());
|
||
});
|
||
|
||
auto save_action = GUI::CommonActions::make_save_action(
|
||
[&](auto&) {
|
||
if (auto error_or = keyboard_mapper_widget->save(); error_or.is_error())
|
||
keyboard_mapper_widget->show_error_to_user(error_or.release_error());
|
||
});
|
||
|
||
auto save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
|
||
DeprecatedString name = "Unnamed";
|
||
Optional<DeprecatedString> save_path = GUI::FilePicker::get_save_filepath(window, name, "json");
|
||
if (!save_path.has_value())
|
||
return;
|
||
|
||
if (auto error_or = keyboard_mapper_widget->save_to_file(save_path.value()); error_or.is_error())
|
||
keyboard_mapper_widget->show_error_to_user(error_or.release_error());
|
||
});
|
||
|
||
auto quit_action = GUI::CommonActions::make_quit_action(
|
||
[&](auto&) {
|
||
app->quit();
|
||
});
|
||
|
||
auto auto_modifier_action = GUI::Action::create("Auto Modifier", [&](auto& act) {
|
||
keyboard_mapper_widget->set_automatic_modifier(act.is_checked());
|
||
});
|
||
auto_modifier_action->set_status_tip("Toggle automatic modifier");
|
||
auto_modifier_action->set_checkable(true);
|
||
auto_modifier_action->set_checked(false);
|
||
|
||
auto& file_menu = window->add_menu("&File"_short_string);
|
||
file_menu.add_action(open_action);
|
||
file_menu.add_action(save_action);
|
||
file_menu.add_action(save_as_action);
|
||
file_menu.add_separator();
|
||
file_menu.add_action(quit_action);
|
||
|
||
auto& settings_menu = window->add_menu(TRY("&Settings"_string));
|
||
settings_menu.add_action(auto_modifier_action);
|
||
|
||
auto& help_menu = window->add_menu("&Help"_short_string);
|
||
help_menu.add_action(GUI::CommonActions::make_command_palette_action(window));
|
||
help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Mapper", app_icon, window));
|
||
|
||
window->on_close_request = [&]() -> GUI::Window::CloseRequestDecision {
|
||
if (keyboard_mapper_widget->request_close())
|
||
return GUI::Window::CloseRequestDecision::Close;
|
||
return GUI::Window::CloseRequestDecision::StayOpen;
|
||
};
|
||
|
||
window->show();
|
||
|
||
return app->exec();
|
||
}
|