Skip to content

Commit eedb064

Browse files
thewraith420thewraith420
committed
Merge remote-tracking branch 'upstream/master'
2 parents 0638d20 + 4cc8739 commit eedb064

File tree

19 files changed

+1098
-89
lines changed

19 files changed

+1098
-89
lines changed

‎TimeAndDate@nightflame/files/TimeAndDate@nightflame/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## [2.0.1] - 13.12.2025
2+
3+
Small CSS update/fix
4+
5+
### Changed
6+
7+
- `stylesheet.css`
8+
9+
### Fixed
10+
11+
- CSS classes `time-container` and `date-container` were reversed and assigned to wrong elements
112

213
## [2.0] - 05.11.2025
314

‎TimeAndDate@nightflame/files/TimeAndDate@nightflame/desklet.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ MyDesklet.prototype = {
164164

165165

166166

167-
let timeLabelContainer = new St.BoxLayout({vertical:!this.isTwoColumns, style_class: 'date-container'});
168-
let dateLabelContainer = new St.BoxLayout({vertical:!this.isTwoColumns, style_class: 'time-container'});
167+
let timeLabelContainer = new St.BoxLayout({vertical:!this.isTwoColumns, style_class: 'time-container'});
168+
let dateLabelContainer = new St.BoxLayout({vertical:!this.isTwoColumns, style_class: 'date-container'});
169169
timeLabelContainer.add(this.timeLabel, {x_fill: false, y_fill: false, x_align: St.Align.MIDDLE, y_align: St.Align.MIDDLE});
170170
dateLabelContainer.add(this.dateLabel, {x_fill: false, y_fill: false, x_align: St.Align.MIDDLE, y_align: St.Align.MIDDLE});
171171

‎TimeAndDate@nightflame/files/TimeAndDate@nightflame/metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"max-instances": "5",
33
"description": "Themeable desklet that displays the time and date. New overhauled version.",
44
"uuid": "TimeAndDate@nightflame",
5-
"version": "2.0",
5+
"version": "2.0.1",
66
"name": "Time and Date Desklet"
77
}

‎TimeAndDate@nightflame/files/TimeAndDate@nightflame/po/es.po‎

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
# TIME AND DATE DESKLET
2+
# This file is put in the public domain.
3+
# nightflame, 2017
4+
#
5+
#, fuzzy
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: TimeAndDate@nightflame 2.0\n"
9+
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
10+
"issues\n"
11+
"POT-Creation-Date: 2025-11-05 19:28+0100\n"
12+
"PO-Revision-Date: \n"
13+
"Last-Translator: \n"
14+
"Language-Team: \n"
15+
"Language: es\n"
16+
"MIME-Version: 1.0\n"
17+
"Content-Type: text/plain; charset=UTF-8\n"
18+
"Content-Transfer-Encoding: 8bit\n"
19+
"X-Generator: Poedit 3.8\n"
20+
21+
#. metadata.json->description
22+
msgid ""
23+
"Themeable desklet that displays the time and date. New overhauled version."
24+
msgstr ""
25+
"Desklet personalizable que muestra la hora y la fecha. Nueva versión "
26+
"mejorada."
27+
28+
#. metadata.json->name
29+
msgid "Time and Date Desklet"
30+
msgstr "Desklet de hora y fecha"
31+
32+
#. settings-schema.json->preferences-page->title
33+
msgid "Preferences"
34+
msgstr "Preferencias"
35+
36+
#. settings-schema.json->theme-page->title
37+
#. settings-schema.json->theme-section->title
38+
msgid "Theme"
39+
msgstr "Tema"
40+
41+
#. settings-schema.json->general-preferences-section->title
42+
msgid "General"
43+
msgstr "General"
44+
45+
#. settings-schema.json->time-theme-section->title
46+
msgid "Time label font"
47+
msgstr "Fuente de la etiqueta de tiempo"
48+
49+
#. settings-schema.json->date-theme-section->title
50+
msgid "Date label font"
51+
msgstr "Fuente de la etiqueta de fecha"
52+
53+
#. settings-schema.json->desklet-decorations-section->title
54+
msgid "Desklet decorations"
55+
msgstr "Decoraciones del desklet"
56+
57+
#. settings-schema.json->time-format->description
58+
msgid "Time format"
59+
msgstr "Formato del tiempo"
60+
61+
#. settings-schema.json->time-format->tooltip
62+
msgid "Set your time format."
63+
msgstr "Configura tu formato de hora."
64+
65+
#. settings-schema.json->date-format->description
66+
msgid "Date format"
67+
msgstr "Formato de fecha"
68+
69+
#. settings-schema.json->date-format->tooltip
70+
msgid "Set the date format."
71+
msgstr "Configura el formato de fecha."
72+
73+
#. settings-schema.json->datetime-format-label->description
74+
msgid ""
75+
"Date/time format follows `strftime` formatting. Read more on desklet's "
76+
"webpage or `strftime` documentation: \n"
77+
"https://pubs.opengroup.org/onlinepubs/007908799/xsh/strftime.html"
78+
msgstr ""
79+
"El formato de fecha/hora sigue el formato `strftime`. Más información en la "
80+
"página web de desklet o en la documentación de `strftime`: \n"
81+
"https://pubs.opengroup.org/onlinepubs/007908799/xsh/strftime.html"
82+
83+
#. settings-schema.json->refresh-period->description
84+
msgid "Refresh period"
85+
msgstr "Periodo de actualización"
86+
87+
#. settings-schema.json->refresh-period->tooltip
88+
msgid "Set how quickly the clock should refresh itself."
89+
msgstr "Establezca la frecuencia con la que se debe actualizar el reloj."
90+
91+
#. settings-schema.json->is-order-reversed->description
92+
msgid "Reverse label order"
93+
msgstr "Invertir el orden de las etiquetas"
94+
95+
#. settings-schema.json->is-two-column->description
96+
msgid "Two column layout"
97+
msgstr "Diseño de dos columnas"
98+
99+
#. settings-schema.json->is-width-forced->description
100+
msgid "Force specific width"
101+
msgstr "Forzar ancho específico"
102+
103+
#. settings-schema.json->is-width-forced->tooltip
104+
msgid ""
105+
"Select if you want to force the desklet to have a certain width, so it won't "
106+
"scale with different date length."
107+
msgstr ""
108+
"Seleccione esta opción si desea forzar que el desklet tenga un ancho "
109+
"determinado, de modo que no se ajuste a diferentes longitudes de fecha."
110+
111+
#. settings-schema.json->forced-width-size->description
112+
msgid "Forced width size"
113+
msgstr "Tamaño de ancho forzado"
114+
115+
#. settings-schema.json->forced-width-size->tooltip
116+
msgid "Force desklet width."
117+
msgstr "Forzar el ancho del desklet."
118+
119+
#. settings-schema.json->time-font->description
120+
#. settings-schema.json->date-font->description
121+
msgid "Font name (choose regular versions)"
122+
msgstr "Nombre de la fuente (elija versiones normales)"
123+
124+
#. settings-schema.json->time-font->tooltip
125+
#. settings-schema.json->date-font->tooltip
126+
msgid "Change font family"
127+
msgstr "Cambiar la familia de fuentes"
128+
129+
#. settings-schema.json->time-font-bold->description
130+
#. settings-schema.json->date-font-bold->description
131+
msgid "Bold"
132+
msgstr "Negrita"
133+
134+
#. settings-schema.json->time-font-italic->description
135+
#. settings-schema.json->date-font-italic->description
136+
msgid "Italic"
137+
msgstr "Cursiva"
138+
139+
#. settings-schema.json->time-text-color->description
140+
#. settings-schema.json->date-text-color->description
141+
msgid "Text color"
142+
msgstr "Color del texto"
143+
144+
#. settings-schema.json->time-text-color->tooltip
145+
#. settings-schema.json->date-text-color->tooltip
146+
msgid "Set the text color."
147+
msgstr "Establecer el color del texto."
148+
149+
#. settings-schema.json->time-text-shadow->description
150+
#. settings-schema.json->date-text-shadow->description
151+
msgid "Text shadow"
152+
msgstr "Sombra de texto"
153+
154+
#. settings-schema.json->time-text-shadow-color->description
155+
#. settings-schema.json->date-text-shadow-color->description
156+
msgid "Text shadow color"
157+
msgstr "Color de la sombra del texto"
158+
159+
#. settings-schema.json->desklet-background->description
160+
msgid "Background color"
161+
msgstr "Color de fondo"
162+
163+
#. settings-schema.json->desklet-background->tooltip
164+
msgid "Set the desklet background."
165+
msgstr "Establecer el fondo del desklet."
166+
167+
#. settings-schema.json->desklet-border-radius->description
168+
msgid "Border radius"
169+
msgstr "Radio del borde"
170+
171+
#. settings-schema.json->desklet-border-radius->tooltip
172+
msgid "Increase or decrease border curvature."
173+
msgstr "Aumentar o disminuir la curvatura del borde."
174+
175+
#. settings-schema.json->desklet-border-width->description
176+
msgid "Border width (set to 0 to disable border)"
177+
msgstr "Ancho del borde (establecer en 0 para desactivar el borde)"
178+
179+
#. settings-schema.json->desklet-border-width->tooltip
180+
msgid "Increase or decrease the desklet border width."
181+
msgstr "Aumenta o disminuye el ancho del borde del desklet."
182+
183+
#. settings-schema.json->desklet-border-color->description
184+
msgid "Border color"
185+
msgstr "Color del borde"
186+
187+
#. settings-schema.json->desklet-border-color->tooltip
188+
msgid "Set the desklet border color."
189+
msgstr "Establecer el color del borde del desklet."
190+
191+
#. settings-schema.json->padding-scale->description
192+
msgid "Padding scale"
193+
msgstr "Escala de relleno"
194+
195+
#. settings-schema.json->padding-scale->tooltip
196+
msgid "Increase or decrease padding between elements."
197+
msgstr "Aumentar o disminuir el relleno entre elementos."
198+
199+
#. settings-schema.json->show-decorations->description
200+
msgid "Show desklet decorations"
201+
msgstr "Mostrar decoraciones del desklet"
202+
203+
#. settings-schema.json->desklet-decorations-note->description
204+
msgid ""
205+
"Following settings require desklet decorations to be enabled on your "
206+
"system.\n"
207+
"Desklet preferences are located in System Settings > Desklets > General "
208+
"Settings tab; there you will be able to enable border/header decorations."
209+
msgstr ""
210+
"Los siguientes ajustes requieren que las decoraciones de los Desklets estén "
211+
"habilitadas en su sistema.\n"
212+
"Las preferencias de Desklet se encuentran en Configuración del sistema > "
213+
"Desklets > pestaña Configuración general; allí podrá habilitar las "
214+
"decoraciones de borde/cabecera."
215+
216+
#. settings-schema.json->desklet-header->description
217+
msgid "Desklet header"
218+
msgstr "Cabecera de Desklet"
219+
220+
#. settings-schema.json->desklet-header->tooltip
221+
msgid ""
222+
"Set your desklet header. Make sure desklet headers are enabled in system "
223+
"settings."
224+
msgstr ""
225+
"Configure la cabecera de su desklet. Asegúrate de que los encabezados de "
226+
"desklet están activados en la configuración del sistema."

‎TimeAndDate@nightflame/files/TimeAndDate@nightflame/stylesheet.css‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
.time-container {
2-
padding: 0em;
3-
margin: 0em;
4-
}
1+
/* Please note that your custom CSS configuration (for version 2.0+) may break with future updates. Also, keep in mind that many CSS styles will NOT work here, because they're overridden by the desklet's code (with styles generated based on desklet's configuration). It's not an intended way of customizing your desklets anymore. If possible I'd recommend using the builtin desklet configuration (right click on desklet -> configure), it has many available options and is much easier to use than CSS. */
52

6-
.date-container {
7-
padding: 0em;
8-
margin: 0em;
9-
}
103

11-
.time-label {
12-
padding: 0em;
13-
margin: 0em;
14-
text-align: center;
4+
/* .clock-container {
5+
background: green; WILL NOT WORK, BECAUSE THE BACKGROUND IS SET BY THE CODE USING DESKLET'S CONFIG
6+
} */
7+
8+
/* .time-container {
9+
background: red;
10+
} */
11+
12+
/* .date-container {
13+
background: red;
14+
} */
15+
16+
/* .time-label {
17+
background: blue;
18+
border: yellow solid 2px;
1519
}
1620
1721
.date-label {
18-
padding: 0em;
19-
margin: 0em;
20-
text-align: center;
21-
}
22+
background: purple;
23+
border: red solid 2px;
24+
} */

‎diskspace@schorschii/files/diskspace@schorschii/desklet.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ MyDesklet.prototype = {
6969
this.random_circle_color_generated = true;
7070
}
7171

72+
// fallback to "/" if filesystem is not defined in the settings
73+
if (this.filesystem === undefined || this.filesystem === null) {
74+
this.filesystem = "/"
75+
}
76+
7277
// initialize desklet gui
7378
this.setupUI();
7479
},

0 commit comments

Comments
 (0)