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

AnalogClock: Port to LibMain

Browse source
This commit is contained in:
Astraeus- 2021-12-15 00:11:47 +01:00 • committed by Brian Gianforcaro
parent eec6ae0d07
commit eb1f00a940
2 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,4 +10,4 @@ set(SOURCES
) )
serenity_app(AnalogClock ICON app-analog-clock) serenity_app(AnalogClock ICON app-analog-clock)
target_link_libraries(AnalogClock LibGUI) target_link_libraries(AnalogClock LibGUI LibMain)

42
Userland/Applications/AnalogClock/main.cpp
View file

@ -1,53 +1,45 @@
/* /*
* Copyright (c) 2021, Erlend Høier <Erlend@ReasonablePanic.com> * Copyright (c) 2021, Erlend Høier <Erlend@ReasonablePanic.com>
* Copyright (c) 2021, Julius Heijmen <julius.heijmen@gmail.com>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include "AnalogClock.h" #include "AnalogClock.h"
#include <LibCore/DateTime.h> #include <LibCore/DateTime.h>
#include <LibCore/System.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/Icon.h> #include <LibGUI/Icon.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/Menubar.h> #include <LibGUI/Menubar.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <unistd.h> #include <LibMain/Main.h>
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
auto app = GUI::Application::construct(argc, argv); auto app = TRY(GUI::Application::try_create(arguments));
if (pledge("stdio recvfd sendfd rpath", nullptr) < 0) { TRY(Core::System::pledge("stdio recvfd sendfd rpath"));
perror("pledge"); TRY(Core::System::unveil("/res", "r"));
return 1; TRY(Core::System::unveil(nullptr, nullptr));
}
if (unveil("/res", "r") < 0) { auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-analog-clock"));
perror("unveil"); auto window = TRY(GUI::Window::try_create());
return 1;
}
if (unveil(nullptr, nullptr) < 0) {
perror("unveil");
return 1;
}
auto app_icon = GUI::Icon::default_icon("app-analog-clock");
auto window = GUI::Window::construct();
window->set_title(Core::DateTime::now().to_string("%Y-%m-%d")); window->set_title(Core::DateTime::now().to_string("%Y-%m-%d"));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->resize(170, 170); window->resize(170, 170);
window->set_resizable(false); window->set_resizable(false);
auto& clock = window->set_main_widget<AnalogClock>(); auto clock = TRY(window->try_set_main_widget<AnalogClock>());
auto show_window_frame_action = GUI::Action::create_checkable( auto show_window_frame_action = GUI::Action::create_checkable(
"Show Window &Frame", { Mod_Alt, KeyCode::Key_F }, [&](auto& action) { "Show Window &Frame", { Mod_Alt, KeyCode::Key_F }, [&](auto& action) {
clock.set_show_window_frame(action.is_checked()); clock->set_show_window_frame(action.is_checked());
}); });
show_window_frame_action->set_checked(clock.show_window_frame()); show_window_frame_action->set_checked(clock->show_window_frame());
auto menu = GUI::Menu::construct(); auto menu = TRY(GUI::Menu::try_create());
menu->add_action(move(show_window_frame_action)); TRY(menu->try_add_action(*show_window_frame_action));
clock.on_context_menu_request = [&](auto& event) {
clock->on_context_menu_request = [&](auto& event) {
menu->popup(event.screen_position()); menu->popup(event.screen_position());
}; };