Skip to content

Commit

Permalink
LibGUI: Teach Calendar about the new Config Items
Browse files Browse the repository at this point in the history
Now the Calendar living in LibGUI knows about FirstDayOfWeekend and
WeekendLength.
  • Loading branch information
TobyAsE authored and trflynn89 committed Oct 4, 2022
1 parent eca559d commit 170b8ca
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
18 changes: 18 additions & 0 deletions Userland/Libraries/LibGUI/Calendar.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2019-2020, Ryan Grieb <[email protected]>
* Copyright (c) 2020-2022, the SerenityOS developers.
* Copyright (c) 2022, Tobias Christiansen <[email protected]>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
Expand Down Expand Up @@ -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<DayOfWeek>(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<DayOfWeek>(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++) {
Expand Down Expand Up @@ -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<DayOfWeek>(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<DayOfWeek>(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();
}
}
}
4 changes: 4 additions & 0 deletions Userland/Libraries/LibGUI/Calendar.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2019-2020, Ryan Grieb <[email protected]>
* Copyright (c) 2020-2022, the SerenityOS developers.
* Copyright (c) 2022, Tobias Christiansen <[email protected]>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
Expand Down Expand Up @@ -71,6 +72,7 @@ class Calendar final
}

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<void()> on_tile_click;
Function<void()> on_tile_doubleclick;
Expand Down Expand Up @@ -146,6 +148,8 @@ class Calendar final
Saturday
};
DayOfWeek m_first_day_of_week { DayOfWeek::Sunday };
DayOfWeek m_first_day_of_weekend { DayOfWeek::Saturday };
int m_weekend_length { 2 };
};

}

0 comments on commit 170b8ca

Please sign in to comment.