From 0eceed4fd72697a4e9bebf23c06b300637296361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20De=20Canni=C3=A8re?= Date: Sat, 16 Jul 2022 01:33:39 +0200 Subject: [PATCH] Calendar: Add a Calendar settings dialog for the first day of the week This commit adds a new settings dialog for the Calendar application and applet. It allows the user to specify their preferred first day of the week. --- Base/res/apps/CalendarSettings.af | 5 +++ Userland/Applications/CMakeLists.txt | 1 + Userland/Applications/Calendar/main.cpp | 4 +- .../CalendarSettings/CMakeLists.txt | 17 ++++++++ .../CalendarSettingsWidget.cpp | 33 +++++++++++++++ .../CalendarSettingsWidget.gml | 38 +++++++++++++++++ .../CalendarSettings/CalendarSettingsWidget.h | 23 ++++++++++ .../Applications/CalendarSettings/main.cpp | 42 +++++++++++++++++++ Userland/Libraries/LibGUI/Calendar.cpp | 10 +++++ Userland/Libraries/LibGUI/Calendar.h | 2 + Userland/Services/Taskbar/TaskbarWindow.cpp | 3 ++ Userland/Services/Taskbar/main.cpp | 2 +- 12 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 Base/res/apps/CalendarSettings.af create mode 100644 Userland/Applications/CalendarSettings/CMakeLists.txt create mode 100644 Userland/Applications/CalendarSettings/CalendarSettingsWidget.cpp create mode 100644 Userland/Applications/CalendarSettings/CalendarSettingsWidget.gml create mode 100644 Userland/Applications/CalendarSettings/CalendarSettingsWidget.h create mode 100644 Userland/Applications/CalendarSettings/main.cpp diff --git a/Base/res/apps/CalendarSettings.af b/Base/res/apps/CalendarSettings.af new file mode 100644 index 0000000000..8aeb9e3afa --- /dev/null +++ b/Base/res/apps/CalendarSettings.af @@ -0,0 +1,5 @@ +[App] +Name=Calendar Settings +Executable=/bin/CalendarSettings +Category=Settings +Description=Configure the Calendar application and applet diff --git a/Userland/Applications/CMakeLists.txt b/Userland/Applications/CMakeLists.txt index 3842e2e6ac..936366cc3f 100644 --- a/Userland/Applications/CMakeLists.txt +++ b/Userland/Applications/CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(Browser) add_subdirectory(BrowserSettings) add_subdirectory(Calculator) add_subdirectory(Calendar) +add_subdirectory(CalendarSettings) add_subdirectory(CharacterMap) add_subdirectory(ClockSettings) add_subdirectory(CrashReporter) diff --git a/Userland/Applications/Calendar/main.cpp b/Userland/Applications/Calendar/main.cpp index 67a5d50935..b1c7d7223b 100644 --- a/Userland/Applications/Calendar/main.cpp +++ b/Userland/Applications/Calendar/main.cpp @@ -6,12 +6,12 @@ #include "AddEventDialog.h" #include +#include #include #include #include #include #include -#include #include #include #include @@ -26,6 +26,8 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app = TRY(GUI::Application::try_create(arguments)); + Config::pledge_domain("Calendar"); + TRY(Core::System::pledge("stdio recvfd sendfd rpath")); TRY(Core::System::unveil("/etc/timezone", "r")); TRY(Core::System::unveil("/res", "r")); diff --git a/Userland/Applications/CalendarSettings/CMakeLists.txt b/Userland/Applications/CalendarSettings/CMakeLists.txt new file mode 100644 index 0000000000..986dfef173 --- /dev/null +++ b/Userland/Applications/CalendarSettings/CMakeLists.txt @@ -0,0 +1,17 @@ +serenity_component( + CalendarSettings + RECOMMENDED + TARGETS CalendarSettings +) + +compile_gml(CalendarSettingsWidget.gml CalendarSettingsWidgetGML.h calendar_settings_widget_gml) + +set(SOURCES + main.cpp + CalendarSettingsWidget.cpp + CalendarSettingsWidget.h + CalendarSettingsWidgetGML.h +) + +serenity_app(CalendarSettings ICON app-calendar) +target_link_libraries(CalendarSettings LibConfig LibGUI LibMain) diff --git a/Userland/Applications/CalendarSettings/CalendarSettingsWidget.cpp b/Userland/Applications/CalendarSettings/CalendarSettingsWidget.cpp new file mode 100644 index 0000000000..72d4976f86 --- /dev/null +++ b/Userland/Applications/CalendarSettings/CalendarSettingsWidget.cpp @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2022-2022, Olivier De Cannière + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include "CalendarSettingsWidget.h" +#include +#include +#include +#include + +void CalendarSettingsWidget::apply_settings() +{ + Config::write_string("Calendar"sv, "View"sv, "FirstDayOfWeek"sv, m_first_day_of_week_combobox->text()); +} + +void CalendarSettingsWidget::reset_default_values() +{ + m_first_day_of_week_combobox->set_text("Sunday"); +} + +CalendarSettingsWidget::CalendarSettingsWidget() +{ + load_from_gml(calendar_settings_widget_gml); + m_first_day_of_week_combobox = *find_descendant_of_type_named("first_day_of_week"); + m_first_day_of_week_combobox->set_text(Config::read_string("Calendar"sv, "View"sv, "FirstDayOfWeek"sv, "Sunday"sv)); + m_first_day_of_week_combobox->set_only_allow_values_from_model(true); + m_first_day_of_week_combobox->set_model(*GUI::ItemListModel>::create(AK::long_day_names)); + m_first_day_of_week_combobox->on_change = [&](auto, auto) { + set_modified(true); + }; +} diff --git a/Userland/Applications/CalendarSettings/CalendarSettingsWidget.gml b/Userland/Applications/CalendarSettings/CalendarSettingsWidget.gml new file mode 100644 index 0000000000..8403a640e5 --- /dev/null +++ b/Userland/Applications/CalendarSettings/CalendarSettingsWidget.gml @@ -0,0 +1,38 @@ +@GUI::Frame { + fill_with_background_color: true + layout: @GUI::VerticalBoxLayout { + margins: [8] + spacing: 5 + } + + @GUI::GroupBox { + title: "Preferred first day of week" + fixed_height: 72 + layout: @GUI::VerticalBoxLayout { + margins: [6] + spacing: 2 + } + + @GUI::Label { + text: "Determines which day a week starts with in the calendar view." + word_wrap: true + text_alignment: "CenterLeft" + } + + @GUI::Widget { + layout: @GUI::HorizontalBoxLayout { + spacing: 16 + } + + @GUI::Label { + text: "First day:" + text_alignment: "CenterLeft" + fixed_width: 70 + } + + @GUI::ComboBox { + name: "first_day_of_week" + } + } + } +} diff --git a/Userland/Applications/CalendarSettings/CalendarSettingsWidget.h b/Userland/Applications/CalendarSettings/CalendarSettingsWidget.h new file mode 100644 index 0000000000..b033537472 --- /dev/null +++ b/Userland/Applications/CalendarSettings/CalendarSettingsWidget.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2022-2022, Olivier De Cannière + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include + +class CalendarSettingsWidget final : public GUI::SettingsWindow::Tab { + C_OBJECT(CalendarSettingsWidget) + +public: + virtual void apply_settings() override; + virtual void reset_default_values() override; + +private: + CalendarSettingsWidget(); + + RefPtr m_first_day_of_week_combobox; +}; diff --git a/Userland/Applications/CalendarSettings/main.cpp b/Userland/Applications/CalendarSettings/main.cpp new file mode 100644 index 0000000000..1ff2cf5fec --- /dev/null +++ b/Userland/Applications/CalendarSettings/main.cpp @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2022-2022, Olivier De Cannière + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include "CalendarSettingsWidget.h" +#include +#include +#include +#include +#include +#include +#include + +ErrorOr serenity_main(Main::Arguments arguments) +{ + TRY(Core::System::pledge("stdio rpath recvfd sendfd unix")); + + auto app = TRY(GUI::Application::try_create(arguments)); + + Config::pledge_domain("Calendar"); + + StringView selected_tab; + Core::ArgsParser args_parser; + args_parser.add_option(selected_tab, "Tab, only option is 'calendar'", "open-tab", 't', "tab"); + args_parser.parse(arguments); + + TRY(Core::System::pledge("stdio rpath recvfd sendfd")); + TRY(Core::System::unveil("/res", "r")); + TRY(Core::System::unveil(nullptr, nullptr)); + + auto app_icon = GUI::Icon::default_icon("app-calendar"sv); + + auto window = TRY(GUI::SettingsWindow::create("Calendar Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); + (void)TRY(window->add_tab("Calendar"sv, "Calendar"sv)); + window->set_icon(app_icon.bitmap_for_size(16)); + window->set_active_tab(selected_tab); + + window->show(); + return app->exec(); +} diff --git a/Userland/Libraries/LibGUI/Calendar.cpp b/Userland/Libraries/LibGUI/Calendar.cpp index 1ce01c89be..2de848fa4b 100644 --- a/Userland/Libraries/LibGUI/Calendar.cpp +++ b/Userland/Libraries/LibGUI/Calendar.cpp @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -26,6 +27,9 @@ Calendar::Calendar(Core::DateTime date_time, Mode mode) : m_selected_date(date_time) , m_mode(mode) { + auto first_day_of_week = Config::read_string("Calendar"sv, "View"sv, "FirstDayOfWeek"sv, "Sunday"sv); + m_first_day_of_week = static_cast(day_of_week_index(first_day_of_week)); + set_fill_with_background_color(true); for (int i = 0; i < 7; i++) { @@ -736,4 +740,10 @@ void Calendar::doubleclick_event(GUI::MouseEvent& event) } } } + +size_t Calendar::day_of_week_index(String const& day_name) +{ + auto const& day_names = AK::long_day_names; + return AK::find_index(day_names.begin(), day_names.end(), day_name); +} } diff --git a/Userland/Libraries/LibGUI/Calendar.h b/Userland/Libraries/LibGUI/Calendar.h index 9ca630cf44..79c105d913 100644 --- a/Userland/Libraries/LibGUI/Calendar.h +++ b/Userland/Libraries/LibGUI/Calendar.h @@ -75,6 +75,8 @@ private: Calendar(Core::DateTime date_time = Core::DateTime::now(), Mode mode = Month); virtual ~Calendar() override = default; + static size_t day_of_week_index(String const&); + virtual void resize_event(GUI::ResizeEvent&) override; virtual void paint_event(GUI::PaintEvent&) override; virtual void mousemove_event(GUI::MouseEvent&) override; diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index f79c8e2892..0cc4a5f191 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -101,6 +101,9 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr start_menu) void TaskbarWindow::config_string_did_change(String const& domain, String const& group, String const& key, String const& value) { + if (domain == "Calendar"sv) + return; + VERIFY(domain == "Taskbar"); if (group == "Clock" && key == "TimeFormat") { m_clock_widget->update_format(value); diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp index 2459297fc8..25b817ccff 100644 --- a/Userland/Services/Taskbar/main.cpp +++ b/Userland/Services/Taskbar/main.cpp @@ -48,7 +48,7 @@ ErrorOr serenity_main(Main::Arguments arguments) { TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix sigaction")); auto app = TRY(GUI::Application::try_create(arguments)); - Config::pledge_domain("Taskbar"); + Config::pledge_domains({ "Taskbar", "Calendar" }); Config::monitor_domain("Taskbar"); app->event_loop().register_signal(SIGCHLD, [](int) { // Wait all available children