diff --git a/Userland/Libraries/LibGUI/Calendar.cpp b/Userland/Libraries/LibGUI/Calendar.cpp index 23f1b1ca5c..7bccaa2391 100644 --- a/Userland/Libraries/LibGUI/Calendar.cpp +++ b/Userland/Libraries/LibGUI/Calendar.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2019-2020, Ryan Grieb * Copyright (c) 2020-2022, the SerenityOS developers. + * Copyright (c) 2022, Tobias Christiansen * * SPDX-License-Identifier: BSD-2-Clause */ @@ -30,6 +31,12 @@ Calendar::Calendar(Core::DateTime date_time, 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)); + auto first_day_of_weekend = Config::read_string("Calendar"sv, "View"sv, "FirstDayOfWeekend"sv, "Saturday"sv); + m_first_day_of_weekend = static_cast(day_of_week_index(first_day_of_weekend)); + + auto weekend_length = Config::read_i32("Calendar"sv, "View"sv, "WeekendLength"sv, 2); + m_weekend_length = weekend_length; + set_fill_with_background_color(true); for (int i = 0; i < 7; i++) { @@ -760,6 +767,17 @@ void Calendar::config_string_did_change(String const& domain, String const& grou if (domain == "Calendar" && group == "View" && key == "FirstDayOfWeek") { m_first_day_of_week = static_cast(day_of_week_index(value)); update_tiles(m_view_year, m_view_month); + } else if (domain == "Calendar" && group == "View" && key == "FirstDayOfWeekend") { + m_first_day_of_weekend = static_cast(day_of_week_index(value)); + update(); + } +} + +void Calendar::config_i32_did_change(String const& domain, String const& group, String const& key, i32 value) +{ + if (domain == "Calendar" && group == "View" && key == "WeekendLength") { + m_weekend_length = value; + update(); } } } diff --git a/Userland/Libraries/LibGUI/Calendar.h b/Userland/Libraries/LibGUI/Calendar.h index 56a2c394bf..dea9c5f5a6 100644 --- a/Userland/Libraries/LibGUI/Calendar.h +++ b/Userland/Libraries/LibGUI/Calendar.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2019-2020, Ryan Grieb * Copyright (c) 2020-2022, the SerenityOS developers. + * Copyright (c) 2022, Tobias Christiansen * * SPDX-License-Identifier: BSD-2-Clause */ @@ -71,6 +72,7 @@ public: } virtual void config_string_did_change(String const&, String const&, String const&, String const&) override; + virtual void config_i32_did_change(String const&, String const&, String const&, i32 value) override; Function on_tile_click; Function on_tile_doubleclick; @@ -146,6 +148,8 @@ private: Saturday }; DayOfWeek m_first_day_of_week { DayOfWeek::Sunday }; + DayOfWeek m_first_day_of_weekend { DayOfWeek::Saturday }; + int m_weekend_length { 2 }; }; }