Skip to content

feat: Adding the option to display year in time applet #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DracoTomes wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: Adding the option to display year in time applet #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
388d769
#1238 added option to display year
DracoTomes Jan 5, 2026
f785e28
#1238 added option to display year
DracoTomes Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 37 additions & 14 deletions cosmic-applet-time/src/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,23 +262,46 @@ impl Window {

if self.config.show_date_in_top_panel {
if self.config.show_weekday {
let mut fs = fieldsets::MDET::medium();
if !self.config.show_seconds {
fs = fs.with_time_precision(TimePrecision::Minute);
if self.config.show_year {
let mut fs = fieldsets::YMDET::medium();
if !self.config.show_seconds {
fs = fs.with_time_precision(TimePrecision::Minute);
}
DateTimeFormatter::try_new(prefs, fs)
.unwrap()
.format(&datetime)
.to_string()
} else {
let mut fs = fieldsets::MDET::medium();
if !self.config.show_seconds {
fs = fs.with_time_precision(TimePrecision::Minute);
}
DateTimeFormatter::try_new(prefs, fs)
.unwrap()
.format(&datetime)
.to_string()
}
DateTimeFormatter::try_new(prefs, fs)
.unwrap()
.format(&datetime)
.to_string()
} else {
let mut fs = fieldsets::MDT::medium();
if !self.config.show_seconds {
fs = fs.with_time_precision(TimePrecision::Minute);
if self.config.show_year {
let mut fs = fieldsets::YMDT::medium();
if !self.config.show_seconds {
fs = fs.with_time_precision(TimePrecision::Minute);
}
DateTimeFormatter::try_new(prefs, fs)
.unwrap()
.format(&datetime)
.to_string()
} else {
let mut fs = fieldsets::MDT::medium();
if !self.config.show_seconds {
fs = fs.with_time_precision(TimePrecision::Minute);
}
DateTimeFormatter::try_new(prefs, fs)
.unwrap()
.format(&datetime)
.to_string()
}
DateTimeFormatter::try_new(prefs, fs)
.unwrap()
.format(&datetime)
.to_string()

}
} else {
let mut fs = fieldsets::T::medium();
Expand Down
2 changes: 2 additions & 0 deletions cosmic-applets-config/src/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub struct TimeAppletConfig {
pub show_seconds: bool,
pub first_day_of_week: u8,
pub show_date_in_top_panel: bool,
pub show_year: bool,
pub show_weekday: bool,
#[serde(default, skip_serializing_if = "str::is_empty")]
pub format_strftime: String,
Expand All @@ -22,6 +23,7 @@ impl Default for TimeAppletConfig {
show_seconds: false,
first_day_of_week: 6,
show_date_in_top_panel: true,
show_year: false,
show_weekday: false,
format_strftime: Default::default(),
}
Expand Down