RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 11:07:46 +00:00
Code Issues Activity Actions

LibGUI: Move GUI::SettingsWindow setup out of the constructor

Browse source 
In order to propagate errors that occur during UI setup, we have to move
all that logic out of widget/window subclass constructors. This is a
first attempt at doing that, for GUI::SettingsWindow.
This commit is contained in:
Andreas Kling 2021-11-28 08:34:04 +01:00
parent 56c4f0aff5
commit 60c132d7d3
8 changed files with 48 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-browser");
auto window = TRY(GUI::SettingsWindow::try_create("Browser Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
auto window = TRY(GUI::SettingsWindow::create("Browser Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
window->set_icon(app_icon.bitmap_for_size(16));
TRY(window->add_tab<BrowserSettingsWidget>("Browser"));

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

@ -26,7 +26,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-display-settings");
auto window = TRY(GUI::SettingsWindow::try_create("Display Settings"));
auto window = TRY(GUI::SettingsWindow::create("Display Settings"));
TRY(window->add_tab<DisplaySettings::BackgroundSettingsWidget>("Background"));
TRY(window->add_tab<DisplaySettings::FontSettingsWidget>("Fonts"));
TRY(window->add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor"));

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

@ -29,7 +29,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-keyboard-settings");
auto window = TRY(GUI::SettingsWindow::try_create("Keyboard Settings"));
auto window = TRY(GUI::SettingsWindow::create("Keyboard Settings"));
window->set_icon(app_icon.bitmap_for_size(16));
TRY(window->add_tab<KeyboardSettingsWidget>("Keyboard"));

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

@ -27,7 +27,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-mail");
auto window = GUI::SettingsWindow::construct("Mail Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes);
auto window = TRY(GUI::SettingsWindow::create("Mail Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
TRY(window->add_tab<MailSettingsWidget>("Mail"));
window->set_icon(app_icon.bitmap_for_size(16));

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

@ -25,7 +25,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-mouse");
auto window = TRY(GUI::SettingsWindow::try_create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
auto window = TRY(GUI::SettingsWindow::create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
TRY(window->add_tab<MouseWidget>("Mouse"));
TRY(window->add_tab<ThemeWidget>("Cursor Theme"));
window->set_icon(app_icon.bitmap_for_size(16));

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

@ -26,7 +26,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-terminal");
auto window = TRY(GUI::SettingsWindow::try_create("Terminal Settings"));
auto window = TRY(GUI::SettingsWindow::create("Terminal Settings"));
window->set_icon(app_icon.bitmap_for_size(16));
TRY(window->add_tab<TerminalSettingsMainWidget>("Terminal"));
TRY(window->add_tab<TerminalSettingsViewWidget>("View"));