mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-30 08:41:15 +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.
50 lines
1.7 KiB
C++
50 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2022, Tim Flynn <trflynn89@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "ClockSettingsWidget.h"
|
|
#include "TimeZoneSettingsWidget.h"
|
|
#include <LibConfig/Client.h>
|
|
#include <LibCore/ArgsParser.h>
|
|
#include <LibCore/System.h>
|
|
#include <LibGUI/Application.h>
|
|
#include <LibGUI/Icon.h>
|
|
#include <LibGUI/SettingsWindow.h>
|
|
#include <LibMain/Main.h>
|
|
|
|
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|
{
|
|
TRY(Core::System::pledge("stdio rpath recvfd sendfd unix proc exec"));
|
|
|
|
auto app = TRY(GUI::Application::create(arguments));
|
|
|
|
Config::pledge_domain("Taskbar");
|
|
|
|
StringView selected_tab;
|
|
Core::ArgsParser args_parser;
|
|
args_parser.add_option(selected_tab, "Tab, one of 'clock' or 'time-zone'", "open-tab", 't', "tab");
|
|
args_parser.parse(arguments);
|
|
|
|
TRY(Core::System::pledge("stdio rpath recvfd sendfd proc exec"));
|
|
TRY(Core::System::unveil("/res", "r"));
|
|
TRY(Core::System::unveil("/bin/timezone", "x"));
|
|
TRY(Core::System::unveil("/etc/timezone", "r"));
|
|
TRY(Core::System::unveil(nullptr, nullptr));
|
|
|
|
auto app_icon = GUI::Icon::default_icon("app-analog-clock"sv); // FIXME: Create a ClockSettings icon.
|
|
|
|
auto window = TRY(GUI::SettingsWindow::create("Clock Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
|
|
(void)TRY(window->add_tab<ClockSettingsWidget>("Clock"_short_string, "clock"sv));
|
|
auto timezonesettings_widget = TRY(TimeZoneSettingsWidget::create());
|
|
TRY(window->add_tab(timezonesettings_widget, TRY("Time Zone"_string), "time-zone"sv));
|
|
|
|
window->set_icon(app_icon.bitmap_for_size(16));
|
|
window->resize(540, 570);
|
|
window->set_active_tab(selected_tab);
|
|
|
|
window->show();
|
|
return app->exec();
|
|
}
|