leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(time): first_day_of_week config

Browse source
This commit is contained in:
maciekk64 2024-03-22 19:34:46 +01:00 • committed by Michael Murphy
parent 3ea612f843
commit b5e1e6d677
1 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cosmic-settings/src/pages/time/date.rs
View file

@ -4,7 +4,7 @@
use cosmic::{ use cosmic::{
cosmic_config::{self, ConfigGet, ConfigSet}, cosmic_config::{self, ConfigGet, ConfigSet},
iced::{widget::horizontal_space, Length}, iced::{widget::horizontal_space, Length},
widget::settings, widget::{dropdown, settings},
Apply, Apply,
}; };
use cosmic_settings_page::Section; use cosmic_settings_page::Section;
@ -19,6 +19,7 @@ pub struct Page {
auto: bool, auto: bool,
auto_timezone: bool, auto_timezone: bool,
military_time: bool, military_time: bool,
first_day_of_week: usize,
show_date_in_top_panel: bool, show_date_in_top_panel: bool,
// info: Option<cosmic_settings_time::Info>, // info: Option<cosmic_settings_time::Info>,
} }
@ -30,6 +31,10 @@ impl Default for Page {
error!(?err, "Failed to read config 'military_time'"); error!(?err, "Failed to read config 'military_time'");
false false
}); });
let first_day_of_week = config.get("first_day_of_week").unwrap_or_else(|err| {
error!(?err, "Failed to read config 'first_day_of_week'");
6
});
let show_date_in_top_panel = config.get("show_date_in_top_panel").unwrap_or_else(|err| { let show_date_in_top_panel = config.get("show_date_in_top_panel").unwrap_or_else(|err| {
error!(?err, "Failed to read config 'show_date_in_top_panel'"); error!(?err, "Failed to read config 'show_date_in_top_panel'");
true true
@ -39,6 +44,7 @@ impl Default for Page {
auto: false, auto: false,
auto_timezone: false, auto_timezone: false,
military_time, military_time,
first_day_of_week,
show_date_in_top_panel, show_date_in_top_panel,
} }
} }
@ -74,6 +80,12 @@ impl Page {
error!(?err, "Failed to set config 'military_time'"); error!(?err, "Failed to set config 'military_time'");
} }
} }
Message::FirstDayOfWeek(weekday) => {
self.first_day_of_week = weekday;
if let Err(err) = self.config.set("first_day_of_week", weekday) {
error!(?err, "Failed to set config 'first_day_of_week'");
}
}
Message::ShowDate(enable) => { Message::ShowDate(enable) => {
self.show_date_in_top_panel = enable; self.show_date_in_top_panel = enable;
if let Err(err) = self.config.set("show_date_in_top_panel", enable) { if let Err(err) = self.config.set("show_date_in_top_panel", enable) {
@ -89,6 +101,7 @@ pub enum Message {
Automatic(bool), Automatic(bool),
AutomaticTimezone(bool), AutomaticTimezone(bool),
MilitaryTime(bool), MilitaryTime(bool),
FirstDayOfWeek(usize),
ShowDate(bool), ShowDate(bool),
} }
@ -132,10 +145,25 @@ fn format() -> Section<crate::pages::Message> {
.toggler(page.military_time, Message::MilitaryTime), .toggler(page.military_time, Message::MilitaryTime),
) )
// First day of week // First day of week
.add(settings::item( .add(
&*section.descriptions[1], settings::item::builder(&*section.descriptions[1]).control(dropdown(
horizontal_space(Length::Fill), &["Friday", "Saturday", "Sunday", "Monday"],
)) match page.first_day_of_week {
4 => Some(0), // friday
5 => Some(1), // saturday
0 => Some(3), // monday
_ => Some(2), // sunday
},
|v| {
match v {
0 => Message::FirstDayOfWeek(4), // friday
1 => Message::FirstDayOfWeek(5), // saturday
3 => Message::FirstDayOfWeek(0), // monday
_ => Message::FirstDayOfWeek(6), // sunday
}
},
)),
)
// Date on top panel toggle // Date on top panel toggle
.add( .add(
settings::item::builder(&*section.descriptions[2]) settings::item::builder(&*section.descriptions[2])