beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

CalendarSettings: Add Weekend-specific settings

Browse source 
In some calendars, weekends start on other days than saturday and can
also have different lengths than 2 days. This patch allows you to set
these values, however they don't do anything yet as Serenity's Calendar
doesn't care about Weekends at the moment.
This commit is contained in:
Tobias Christiansen 2022-10-04 11:36:09 +02:00 committed by Tim Flynn
parent 2a0a274898
commit eca559d65d
Notes: sideshowbarker 2024-07-18 00:34:07 +09:00 
Author: https://github.com/TobyAsE
Commit: https://github.com/SerenityOS/serenity/commit/eca559d65d
Pull-request: https://github.com/SerenityOS/serenity/pull/15469
Reviewed-by: https://github.com/trflynn89
3 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Userland/Applications/CalendarSettings/CalendarSettingsWidget.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022-2022, Olivier De Cannière <olivier.decanniere96@gmail.com>
* Copyright (c) 2022, Tobias Christiansen <tobyase@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -8,17 +9,23 @@
#include <AK/DateConstants.h>
#include <Applications/CalendarSettings/CalendarSettingsWidgetGML.h>
#include <LibConfig/Client.h>
#include <LibGUI/ComboBox.h>
#include <LibGUI/ItemListModel.h>
#include <LibGUI/SpinBox.h>
void CalendarSettingsWidget::apply_settings()
{
Config::write_string("Calendar"sv, "View"sv, "FirstDayOfWeek"sv, m_first_day_of_week_combobox->text());
Config::write_string("Calendar"sv, "View"sv, "FirstDayOfWeekend"sv, m_first_day_of_weekend_combobox->text());
Config::write_i32("Calendar"sv, "View"sv, "WeekendLength"sv, m_weekend_length_spinbox->value());
Config::write_string("Calendar"sv, "View"sv, "DefaultView"sv, m_default_view_combobox->text());
}
void CalendarSettingsWidget::reset_default_values()
{
m_first_day_of_week_combobox->set_text("Sunday");
m_first_day_of_weekend_combobox->set_text("Saturday");
m_weekend_length_spinbox->set_value(2);
m_default_view_combobox->set_text("Month");
}
@ -34,6 +41,20 @@ CalendarSettingsWidget::CalendarSettingsWidget()
set_modified(true);
};
m_first_day_of_weekend_combobox = *find_descendant_of_type_named<GUI::ComboBox>("first_day_of_weekend");
m_first_day_of_weekend_combobox->set_text(Config::read_string("Calendar"sv, "View"sv, "FirstDayOfWeekend"sv, "Saturday"sv));
m_first_day_of_weekend_combobox->set_only_allow_values_from_model(true);
m_first_day_of_weekend_combobox->set_model(*GUI::ItemListModel<StringView, Array<StringView, 7>>::create(AK::long_day_names));
m_first_day_of_weekend_combobox->on_change = [&](auto, auto) {
set_modified(true);
};
m_weekend_length_spinbox = *find_descendant_of_type_named<GUI::SpinBox>("weekend_length");
m_weekend_length_spinbox->set_value(Config::read_i32("Calendar"sv, "View"sv, "WeekendLength"sv, 2));
m_weekend_length_spinbox->on_change = [&](auto) {
set_modified(true);
};
m_default_view_combobox = *find_descendant_of_type_named<GUI::ComboBox>("default_view");
m_default_view_combobox->set_text(Config::read_string("Calendar"sv, "View"sv, "DefaultView"sv, "Month"sv));
m_default_view_combobox->set_only_allow_values_from_model(true);

57
Userland/Applications/CalendarSettings/CalendarSettingsWidget.gml
View file

@ -36,6 +36,63 @@
}
}
@GUI::GroupBox {
title: "Preferred Weekend Configuration"
fixed_height: 72
layout: @GUI::VerticalBoxLayout {
margins: [6]
spacing: 2
}
@GUI::Label {
text: "Determines the start and length of the weekend."
word_wrap: true
text_alignment: "CenterLeft"
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
spacing: 16
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {}
@GUI::Label {
text: "First day:"
text_alignment: "CenterLeft"
fixed_width: 84
}
@GUI::ComboBox {
name: "first_day_of_weekend"
}
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
spacing: 8
}
@GUI::Label {
text: "Length:"
text_alignment: "CenterLeft"
}
@GUI::SpinBox {
name: "weekend_length"
min: 0
max: 7
}
@GUI::Label {
text: "Days"
text_alignment: "CenterLeft"
}
}
}
}
@GUI::GroupBox {
title: "Default view"
fixed_height: 72

4
Userland/Applications/CalendarSettings/CalendarSettingsWidget.h
View file

@ -1,12 +1,12 @@
/*
* Copyright (c) 2022-2022, Olivier De Cannière <olivier.decanniere96@gmail.com>
* Copyright (c) 2022, Tobias Christiansen <tobyase@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibGUI/ComboBox.h>
#include <LibGUI/SettingsWindow.h>
class CalendarSettingsWidget final : public GUI::SettingsWindow::Tab {
@ -21,5 +21,7 @@ private:
static constexpr Array<StringView, 2> const m_view_modes = { "Month"sv, "Year"sv };
RefPtr<GUI::ComboBox> m_first_day_of_week_combobox;
RefPtr<GUI::ComboBox> m_first_day_of_weekend_combobox;
RefPtr<GUI::SpinBox> m_weekend_length_spinbox;
RefPtr<GUI::ComboBox> m_default_view_combobox;
};