RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:17:44 +00:00
Code Issues Activity Actions

Help: Port to LibMain :^)

Browse source
This commit is contained in:
Andreas Kling 2021-11-23 16:03:01 +01:00
parent 86b3769e59
commit e7d4622ce0
2 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,4 +13,4 @@ set(SOURCES
) )
serenity_app(Help ICON app-help) serenity_app(Help ICON app-help)
target_link_libraries(Help LibWeb LibMarkdown LibGUI LibDesktop) target_link_libraries(Help LibWeb LibMarkdown LibGUI LibDesktop LibMain)

45
Userland/Applications/Help/main.cpp
View file

@ -10,6 +10,7 @@
#include <AK/URL.h> #include <AK/URL.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/System.h>
#include <LibDesktop/Launcher.h> #include <LibDesktop/Launcher.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
@ -28,6 +29,7 @@
#include <LibGUI/ToolbarContainer.h> #include <LibGUI/ToolbarContainer.h>
#include <LibGUI/TreeView.h> #include <LibGUI/TreeView.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibMain/Main.h>
#include <LibMarkdown/Document.h> #include <LibMarkdown/Document.h>
#include <LibWeb/OutOfProcessWebView.h> #include <LibWeb/OutOfProcessWebView.h>
#include <libgen.h> #include <libgen.h>
@ -35,47 +37,26 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char* argv[]) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio recvfd sendfd rpath unix", nullptr) < 0) { TRY(Core::System::pledge("stdio recvfd sendfd rpath unix", nullptr));
perror("pledge"); auto app = TRY(GUI::Application::try_create(arguments));
return 1;
}
auto app = GUI::Application::construct(argc, argv); TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil("/usr/share/man", "r"));
if (unveil("/res", "r") < 0) { TRY(Core::System::unveil("/tmp/portal/launch", "rw"));
perror("unveil"); TRY(Core::System::unveil("/tmp/portal/webcontent", "rw"));
return 1; TRY(Core::System::unveil(nullptr, nullptr));
}
if (unveil("/usr/share/man", "r") < 0) {
perror("unveil");
return 1;
}
if (unveil("/tmp/portal/launch", "rw") < 0) {
perror("unveil");
return 1;
}
if (unveil("/tmp/portal/webcontent", "rw") < 0) {
perror("unveil");
return 1;
}
unveil(nullptr, nullptr);
const char* start_page = nullptr; const char* start_page = nullptr;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_positional_argument(start_page, "Page to open at launch", "page", Core::ArgsParser::Required::No); args_parser.add_positional_argument(start_page, "Page to open at launch", "page", Core::ArgsParser::Required::No);
args_parser.parse(arguments);
args_parser.parse(argc, argv);
auto app_icon = GUI::Icon::default_icon("app-help"); auto app_icon = GUI::Icon::default_icon("app-help");
auto window = GUI::Window::construct(); auto window = TRY(GUI::Window::try_create());
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->set_title("Help"); window->set_title("Help");
window->resize(570, 500); window->resize(570, 500);
@ -274,7 +255,7 @@ int main(int argc, char* argv[])
auto& help_menu = window->add_menu("&Help"); auto& help_menu = window->add_menu("&Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Help", app_icon, window)); help_menu.add_action(GUI::CommonActions::make_about_action("Help", app_icon, window));
auto context_menu = GUI::Menu::construct(); auto context_menu = TRY(GUI::Menu::try_create());
context_menu->add_action(*go_back_action); context_menu->add_action(*go_back_action);
context_menu->add_action(*go_forward_action); context_menu->add_action(*go_forward_action);
context_menu->add_action(*go_home_action); context_menu->add_action(*go_home_action);