Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-12 02:30:30 +09:00
Code Activity

Settings: Convert to TRY + serenity_main(..)

Browse source
This commit is contained in:
Brian Gianforcaro 2021-11-27 13:00:18 -08:00 • committed by Andreas Kling
parent 908d943e85
commit eb896aa33e
Notes: sideshowbarker 2024-07-18 00:36:43 +09:00
2 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/Settings/CMakeLists.txt
View file

@ -9,4 +9,4 @@ set(SOURCES
) )
serenity_app(Settings ICON app-settings) serenity_app(Settings ICON app-settings)
target_link_libraries(Settings LibGUI LibDesktop) target_link_libraries(Settings LibGUI LibDesktop LibMain)

52
Userland/Applications/Settings/main.cpp
View file

@ -6,6 +6,7 @@
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibCore/Process.h> #include <LibCore/Process.h>
#include <LibCore/System.h>
#include <LibDesktop/AppFile.h> #include <LibDesktop/AppFile.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
@ -15,6 +16,7 @@
#include <LibGUI/Model.h> #include <LibGUI/Model.h>
#include <LibGUI/Statusbar.h> #include <LibGUI/Statusbar.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibMain/Main.h>
#include <serenity.h> #include <serenity.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -66,62 +68,56 @@ private:
Vector<NonnullRefPtr<Desktop::AppFile>> m_apps; Vector<NonnullRefPtr<Desktop::AppFile>> m_apps;
}; };
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio thread recvfd sendfd rpath cpath wpath unix proc exec", nullptr) < 0) { TRY(Core::System::pledge("stdio thread recvfd sendfd rpath cpath wpath unix proc exec", nullptr));
perror("pledge");
return 1;
}
auto app = GUI::Application::construct(argc, argv); auto app = TRY(GUI::Application::try_create(arguments));
if (pledge("stdio thread recvfd sendfd rpath cpath wpath proc exec", nullptr) < 0) { TRY(Core::System::pledge("stdio thread recvfd sendfd rpath cpath wpath proc exec", nullptr));
perror("pledge");
return 1;
}
auto app_icon = GUI::Icon::default_icon("app-settings"); auto app_icon = GUI::Icon::default_icon("app-settings");
auto window = GUI::Window::construct(); auto window = TRY(GUI::Window::try_create());
window->set_title("Settings"); window->set_title("Settings");
window->resize(360, 240); window->resize(360, 240);
auto& file_menu = window->add_menu("&File"); auto file_menu = TRY(window->try_add_menu("&File"));
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
app->quit(); app->quit();
})); }));
auto& help_menu = window->add_menu("&Help"); auto help_menu = TRY(window->try_add_menu("&Help"));
help_menu.add_action(GUI::CommonActions::make_about_action("Settings", app_icon, window)); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Settings", app_icon, window)));
auto& main_widget = window->set_main_widget<GUI::Widget>(); auto main_widget = TRY(window->try_set_main_widget<GUI::Widget>());
main_widget.set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
main_widget.set_layout<GUI::VerticalBoxLayout>(); main_widget->set_layout<GUI::VerticalBoxLayout>();
auto& icon_view = main_widget.add<GUI::IconView>(); auto icon_view = TRY(main_widget->try_add<GUI::IconView>());
icon_view.set_should_hide_unnecessary_scrollbars(true); icon_view->set_should_hide_unnecessary_scrollbars(true);
auto model = adopt_ref(*new SettingsAppsModel); auto model = adopt_ref(*new SettingsAppsModel);
icon_view.set_model(*model); icon_view->set_model(*model);
icon_view.on_activation = [&](GUI::ModelIndex const& index) { icon_view->on_activation = [&](GUI::ModelIndex const& index) {
auto executable = model->data(index, GUI::ModelRole::Custom).as_string(); auto executable = model->data(index, GUI::ModelRole::Custom).as_string();
auto launch_origin_rect = icon_view.to_widget_rect(icon_view.content_rect(index)).translated(icon_view.screen_relative_rect().location()); auto launch_origin_rect = icon_view->to_widget_rect(icon_view->content_rect(index)).translated(icon_view->screen_relative_rect().location());
setenv("__libgui_launch_origin_rect", String::formatted("{},{},{},{}", launch_origin_rect.x(), launch_origin_rect.y(), launch_origin_rect.width(), launch_origin_rect.height()).characters(), 1); setenv("__libgui_launch_origin_rect", String::formatted("{},{},{},{}", launch_origin_rect.x(), launch_origin_rect.y(), launch_origin_rect.width(), launch_origin_rect.height()).characters(), 1);
Core::Process::spawn(executable); Core::Process::spawn(executable);
}; };
auto& statusbar = main_widget.add<GUI::Statusbar>(); auto statusbar = TRY(main_widget->try_add<GUI::Statusbar>());
icon_view.on_selection_change = [&] { icon_view->on_selection_change = [&] {
auto index = icon_view.selection().first(); auto index = icon_view->selection().first();
if (!index.is_valid()) { if (!index.is_valid()) {
statusbar.set_text({}); statusbar->set_text({});
return; return;
} }
auto& app = *(NonnullRefPtr<Desktop::AppFile>*)index.internal_data(); auto& app = *(NonnullRefPtr<Desktop::AppFile>*)index.internal_data();
statusbar.set_text(app->description()); statusbar->set_text(app->description());
}; };
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));