Skip to content

calendar@deeppradhan: Add primary display setting closes #1447 #1598

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

calendar@deeppradhan: Add primary display setting closes #1447 #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 39 additions & 14 deletions calendar@deeppradhan/files/calendar@deeppradhan/desklet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ MyDesklet.prototype = {
// Initialise settings
this.settings = new Settings.DeskletSettings(this, this.metadata.uuid, desklet_id);
this.settings.bindProperty(Settings.BindingDirection.IN, "panels", "panels", this.onSettingChanged);
this.settings.bindProperty(Settings.BindingDirection.IN, "primary-display", "primaryDisplay", this.onSettingChanged);
this.settings.bindProperty(Settings.BindingDirection.IN, "auto-advance", "autoAdvance", this.onSettingChanged);
this.settings.bindProperty(Settings.BindingDirection.IN, "first-day", "firstDay", this.onSettingChanged);
this.settings.bindProperty(Settings.BindingDirection.IN, "show-weekday", "showWeekday", this.onSettingChanged);
Expand Down Expand Up @@ -178,23 +179,47 @@ MyDesklet.prototype = {

this.lastUpdate = { fullYear: now.getFullYear(), month: now.getMonth(), date: now.getDate() };

//////// Today Panel ////////
this.labelDate.style = (now.getDay() === 0 ? "color: " + this.colourSundays + "; " : "")
+ (now.getDay() === 6 ? "color: " + this.colourSaturdays + "; " : "")
+ "font-size: 4em; " + STYLE_TEXT_CENTER;

if (now.getDay() === 0 || now.getDay() === 6)
this.labelDay.style = "color: " + (now.getDay() === 0 ?
this.colourSundays : this.colourSaturdays) + "; " + STYLE_TEXT_CENTER;
this.labelDay.style = STYLE_TEXT_CENTER;
this.labelDate.style = STYLE_TEXT_CENTER;
this.labelMonthYear.style = STYLE_TEXT_CENTER;
this.labelTime.style = STYLE_TEXT_CENTER;

//////// Today Panel ////////
this.boxLayoutToday.remove_all_children();
if (this.showWeekday !== "off")
this.boxLayoutToday.add(this.labelDay);
this.boxLayoutToday.add(this.labelDate);
this.boxLayoutToday.add(this.labelMonthYear);
if (this.showTime)
this.boxLayoutToday.add(this.labelTime);

const primaryDisplayMap = {
day: { label: this.labelDay, size: "3em", order: ["monthYear", "day", "date", "time"] },
date: { label: this.labelDate, size: "4em", order: ["day", "date", "monthYear", "time"] },
month: { label: this.labelMonthYear, size: "2em", order: ["day", "monthYear", "date", "time"] },
time: { label: this.labelTime, size: "4em", order: ["day", "time", "date", "monthYear"] }
};

const primary = primaryDisplayMap[this.primaryDisplay] || primaryDisplayMap.date;
primary.label.style += `font-size: ${primary.size};`;

const allLabels = {
day: { label: this.labelDay, show: this.showWeekday !== "off" },
date: { label: this.labelDate, show: true },
monthYear: { label: this.labelMonthYear, show: true },
time: { label: this.labelTime, show: this.showTime }
};

primary.order.forEach(key => {
const item = allLabels[key];
if (item && item.show) {
this.boxLayoutToday.add(item.label);
}
});

if (now.getDay() === 0) {
this.labelDate.style += "color: " + this.colourSundays + ";";
this.labelDay.style += "color: " + this.colourSundays + ";";
}
if (now.getDay() === 6) {
this.labelDate.style += "color: " + this.colourSaturdays + ";";
this.labelDay.style += "color: " + this.colourSaturdays + ";";
}

//////// Month Panel ////////
this.labelMonth.set_text(MONTHS[this.date.getMonth()].substring(0, 3) + " " + this.date.getFullYear());

Expand Down
76 changes: 51 additions & 25 deletions calendar@deeppradhan/files/calendar@deeppradhan/po/ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# CALENDAR DESKLET
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Daniel <d3vf4n (at) tutanota (dot) com>, 2023.
#
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
"issues\n"
"POT-Creation-Date: 2024-05-14 23:55+0200\n"
"POT-Creation-Date: 2025-10-17 20:29+0200\n"
"PO-Revision-Date: 2024-05-14 23:59+0200\n"
"Last-Translator: Daniel <d3vf4n (at) tutanota (dot) com>\n"
"Language-Team: \n"
Expand All @@ -19,93 +19,93 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.0.1\n"

#: desklet.js:29
#. desklet.js:29
msgid "January"
msgstr "Gener"

#: desklet.js:29
#. desklet.js:29
msgid "February"
msgstr "Febrer"

#: desklet.js:29
#. desklet.js:29
msgid "March"
msgstr "Març"

#: desklet.js:29
#. desklet.js:29
msgid "April"
msgstr "Abril"

#: desklet.js:29
#. desklet.js:29
msgid "May"
msgstr "Maig"

#: desklet.js:30
#. desklet.js:30
msgid "June"
msgstr "Juny"

#: desklet.js:30
#. desklet.js:30
msgid "July"
msgstr "Juliol"

#: desklet.js:30
#. desklet.js:30
msgid "August"
msgstr "Agost"

#: desklet.js:30
#. desklet.js:30
msgid "September"
msgstr "Setembre"

#: desklet.js:30
#. desklet.js:30
msgid "October"
msgstr "Octubre"

#: desklet.js:30
#. desklet.js:30
msgid "November"
msgstr "Novembre"

#: desklet.js:31
#. desklet.js:31
msgid "December"
msgstr "Desembre"

#. settings-schema.json->first-day->options
#: desklet.js:34
#. desklet.js:34
msgid "Sunday"
msgstr "Diumenge"

#. settings-schema.json->first-day->options
#: desklet.js:34
#. desklet.js:34
msgid "Monday"
msgstr "Dilluns"

#: desklet.js:34
#. desklet.js:34
msgid "Tuesday"
msgstr "Dimarts"

#: desklet.js:34
#. desklet.js:34
msgid "Wednesday"
msgstr "Dimecres"

#: desklet.js:35
#. desklet.js:35
msgid "Thursday"
msgstr "Dijous"

#: desklet.js:35
#. desklet.js:35
msgid "Friday"
msgstr "Divendres"

#: desklet.js:35
#. desklet.js:35
msgid "Saturday"
msgstr "Dissabte"

#: desklet.js:135
#. desklet.js:136
msgid "Previous month..."
msgstr "Mes anterior"

#: desklet.js:137
#. desklet.js:138
msgid "Next month..."
msgstr "Mes següent"

#: desklet.js:152
#. desklet.js:153
msgid "Calendar"
msgstr "Calendari"

Expand Down Expand Up @@ -154,6 +154,32 @@ msgstr "Mes"
msgid "Select the panels to display in desklet"
msgstr "Trieu els plafons que seran visibles en la miniaplicació"

#. settings-schema.json->primary-display->description
msgid "Primary display"
msgstr ""

#. settings-schema.json->primary-display->options
#, fuzzy
msgid "Day"
msgstr "Maig"

#. settings-schema.json->primary-display->options
#, fuzzy
msgid "Month"
msgstr "Mes"

#. settings-schema.json->primary-display->options
msgid "Date"
msgstr ""

#. settings-schema.json->primary-display->options
msgid "Time"
msgstr ""

#. settings-schema.json->primary-display->tooltip
msgid "The biggest text"
msgstr ""

#. settings-schema.json->show-weekday->description
msgid "Show day of week"
msgstr "Mostra el dia de la setmana"
Expand Down
Loading