Skip to content

Commit e7a35bc

Browse files
MantveMantve
authored
Merge branch 'linuxmint:master' into master
2 parents 2222342 + 7bbbef3 commit e7a35bc

324 files changed

Lines changed: 42939 additions & 5795 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ commandResult@ZimiZones/* @ZimiZones
2222
cpuload@kimse/* @schorschii
2323
cryptocoins@pbojan/* @pbojan
2424
daily-agenda@alexmakessoftware/* @AlexMakesSoftware
25-
daysCountdown@KopfDesDaemons/* @KopfDesDaemons
25+
daysCountdown@KopfDesDaemons/* @KopfdesDaemons
2626
deskNote@BrainAxe/* @BrainAxe
2727
devTools@scollins/* @collinss
2828
diskspace@schorschii/* @schorschii
29+
docker@wilkesreid/* @wilkesreid
2930
dual-datetime@rcalixte/* @rcalixte
3031
eKreta@thegergo02/* @thegergo02
3132
ganjine@mohammad-sn/* @mohammad-sn
@@ -37,13 +38,16 @@ jira@codeunifier/* @codeunifier
3738
kdecdesklet@joejoetv/* @JoeJoeTV
3839
mintoo@sujitagarwal/* @sujitagarwal
3940
moonlight-clock@torchipeppo/* @torchipeppo
41+
nepali-date@khumnath/* @khumnath
4042
nepalipatro@deeppradhan/* @kanchudeep
4143
netusage@30yavash.com/* @pdcurtis
44+
newsfeed@Paul163-ai/* @Paul163-ai
4245
notes@schorschii/* @schorschii
4346
nvidia-gpu-monitor@hierakonpolis/* @Hierakonpolis
4447
panchang@india/* @OnlineLearningTutorials
4548
picture-frames@KopfdesDaemons/* @KopfdesDaemons
4649
prayertimes@linworx.org/* @mkessas
50+
procmon@ksmith/* @masterdecaf
4751
quicklinks@NotSirius-A/* @NotSirius-A
4852
quoteOfTheDay@tinnu/* @JessW
4953
serverstatus@maksmokriev/* @maksmokriev
@@ -52,15 +56,18 @@ shutdown@phpdreamer/* @NotSirius-A
5256
simple-system-monitor@ariel/* @arielandrade
5357
soundBox@scollins/* @kawashiro
5458
steamGamesStarter@KopfdesDaemons/* @KopfdesDaemons
59+
stoic-quote@orion/* @WanderingBread0
5560
stopwatch@KopfdesDaemons/* @KopfdesDaemons
5661
swatchtime@kdawson/* @kendawson-online
62+
sys-monitor@Paul163-ai/* @Paul163-ai
5763
system-monitor-graph@rcassani/* @rcassani
58-
systemTemperature@KopfDesDaemons/* @KopfDesDaemons
64+
systemTemperature@KopfDesDaemons/* @KopfdesDaemons
5965
systemUptime@KopfDesDaemons/* @KopfdesDaemons
6066
temperature@india/* @OnlineLearningTutorials
6167
timelet@linuxedo.com/* @slgobinath
6268
todo@NotSirius-A/* @NotSirius-A
6369
top@ryannerd/* @ryannerd
70+
trading-positions@trading-journal/* @Mouses007
6471
ttv-status@francisco-saez/* @francisco-saez
6572
vaktija-desklet@MuxBH28/* @MuxBH28
6673
wifi@SarangShelke2304/* @SarangShelke2304

‎.github/ISSUE_TEMPLATE/01_bug_report.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ body:
6262
- cpuload@kimse @schorschii
6363
- cryptocoins@pbojan @pbojan
6464
- daily-agenda@alexmakessoftware @AlexMakesSoftware
65-
- daysCountdown@KopfDesDaemons @KopfDesDaemons
65+
- daysCountdown@KopfDesDaemons @KopfdesDaemons
6666
- deskNote@BrainAxe @BrainAxe
6767
- devTools@scollins @collinss
6868
- diskspace@schorschii @schorschii
69+
- docker@wilkesreid @wilkesreid
6970
- dual-datetime@rcalixte @rcalixte
7071
- eKreta@thegergo02 @thegergo02
7172
- ganjine@mohammad-sn @mohammad-sn
@@ -79,14 +80,17 @@ body:
7980
- kdecdesklet@joejoetv @JoeJoeTV
8081
- mintoo@sujitagarwal @sujitagarwal
8182
- moonlight-clock@torchipeppo @torchipeppo
83+
- nepali-date@khumnath @khumnath
8284
- nepalipatro@deeppradhan @kanchudeep
8385
- netusage@30yavash.com @pdcurtis
86+
- newsfeed@Paul163-ai @Paul163-ai
8487
- notes@schorschii @schorschii
8588
- NumericBinaryClock@ozymandiaslone @ozymandiaslone
8689
- nvidia-gpu-monitor@hierakonpolis @Hierakonpolis
8790
- panchang@india @OnlineLearningTutorials
8891
- picture-frames@KopfdesDaemons @KopfdesDaemons
8992
- prayertimes@linworx.org @mkessas
93+
- procmon@ksmith @masterdecaf
9094
- quicklinks@NotSirius-A @NotSirius-A
9195
- quoteOfTheDay@tinnu @JessW
9296
- reddit-reader@orangeshark
@@ -97,16 +101,19 @@ body:
97101
- simple-system-monitor@ariel @arielandrade
98102
- soundBox@scollins @kawashiro
99103
- steamGamesStarter@KopfdesDaemons @KopfdesDaemons
104+
- stoic-quote@orion @WanderingBread0
100105
- stopwatch@KopfdesDaemons @KopfdesDaemons
101106
- swatchtime@kdawson @kendawson-online
107+
- sys-monitor@Paul163-ai @Paul163-ai
102108
- system-monitor-graph@rcassani @rcassani
103-
- systemTemperature@KopfDesDaemons @KopfDesDaemons
109+
- systemTemperature@KopfDesDaemons @KopfdesDaemons
104110
- systemUptime@KopfDesDaemons @KopfdesDaemons
105111
- temperature@india @OnlineLearningTutorials
106112
- TimeAndDate@nightflame @NotSirius-A
107113
- timelet@linuxedo.com @slgobinath
108114
- todo@NotSirius-A @NotSirius-A
109115
- top@ryannerd @ryannerd
116+
- trading-positions@trading-journal @Mouses007
110117
- ttv-status@francisco-saez @francisco-saez
111118
- vaktija-desklet@MuxBH28 @MuxBH28
112119
- ViennaTextBasedWeather@f-istvan @f-istvan

‎.github/ISSUE_TEMPLATE/02_feature_request.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ body:
3030
- cpuload@kimse @schorschii
3131
- cryptocoins@pbojan @pbojan
3232
- daily-agenda@alexmakessoftware @AlexMakesSoftware
33-
- daysCountdown@KopfDesDaemons @KopfDesDaemons
33+
- daysCountdown@KopfDesDaemons @KopfdesDaemons
3434
- deskNote@BrainAxe @BrainAxe
3535
- devTools@scollins @collinss
3636
- diskspace@schorschii @schorschii
37+
- docker@wilkesreid @wilkesreid
3738
- dual-datetime@rcalixte @rcalixte
3839
- eKreta@thegergo02 @thegergo02
3940
- ganjine@mohammad-sn @mohammad-sn
@@ -47,14 +48,17 @@ body:
4748
- kdecdesklet@joejoetv @JoeJoeTV
4849
- mintoo@sujitagarwal @sujitagarwal
4950
- moonlight-clock@torchipeppo @torchipeppo
51+
- nepali-date@khumnath @khumnath
5052
- nepalipatro@deeppradhan @kanchudeep
5153
- netusage@30yavash.com @pdcurtis
54+
- newsfeed@Paul163-ai @Paul163-ai
5255
- notes@schorschii @schorschii
5356
- NumericBinaryClock@ozymandiaslone @ozymandiaslone
5457
- nvidia-gpu-monitor@hierakonpolis @Hierakonpolis
5558
- panchang@india @OnlineLearningTutorials
5659
- picture-frames@KopfdesDaemons @KopfdesDaemons
5760
- prayertimes@linworx.org @mkessas
61+
- procmon@ksmith @masterdecaf
5862
- quicklinks@NotSirius-A @NotSirius-A
5963
- quoteOfTheDay@tinnu @JessW
6064
- reddit-reader@orangeshark
@@ -65,16 +69,19 @@ body:
6569
- simple-system-monitor@ariel @arielandrade
6670
- soundBox@scollins @kawashiro
6771
- steamGamesStarter@KopfdesDaemons @KopfdesDaemons
72+
- stoic-quote@orion @WanderingBread0
6873
- stopwatch@KopfdesDaemons @KopfdesDaemons
6974
- swatchtime@kdawson @kendawson-online
75+
- sys-monitor@Paul163-ai @Paul163-ai
7076
- system-monitor-graph@rcassani @rcassani
71-
- systemTemperature@KopfDesDaemons @KopfDesDaemons
77+
- systemTemperature@KopfDesDaemons @KopfdesDaemons
7278
- systemUptime@KopfDesDaemons @KopfdesDaemons
7379
- temperature@india @OnlineLearningTutorials
7480
- TimeAndDate@nightflame @NotSirius-A
7581
- timelet@linuxedo.com @slgobinath
7682
- todo@NotSirius-A @NotSirius-A
7783
- top@ryannerd @ryannerd
84+
- trading-positions@trading-journal @Mouses007
7885
- ttv-status@francisco-saez @francisco-saez
7986
- vaktija-desklet@MuxBH28 @MuxBH28
8087
- ViennaTextBasedWeather@f-istvan @f-istvan

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
29-
- uses: actions/checkout@v6
29+
- uses: actions/checkout@v7
3030

3131
# Runs a set of commands using the runners shell
3232
- name: Validate spices
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout github-actions
47-
uses: actions/checkout@v6
47+
uses: actions/checkout@v7
4848
with:
4949
repository: linuxmint/github-actions
5050
path: _github-actions

‎.github/workflows/tst.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Steps represent a sequence of tasks that will be executed as part of the job
2222
steps:
2323
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
24-
- uses: actions/checkout@v6
24+
- uses: actions/checkout@v7
2525

2626
# Runs a set of commands using the runners shell
2727
- name: Generate Translation Status Tables

‎AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### v2.4.1~20260610
2+
* Ready for Linux Mint 23.
3+
14
### v2.4.0~20251122
25
* Correctly resizes the album cover.
36
* Fixes [#1674](https://github.com/linuxmint/cinnamon-spices-desklets/issues/1674)

‎AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/desklet.js‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ const Tweener = imports.ui.tweener;
1111
const Util = imports.misc.util;
1212
const Settings = imports.ui.settings;
1313
const Gettext = imports.gettext;
14+
const Extension = imports.ui.extension;
15+
function _require(relPath) {
16+
if (Extension.getCurrentExtension) {
17+
var Me = Extension.getCurrentExtension();
18+
return Me.imports[relPath];
19+
} else {
20+
return require(relPath);
21+
}
22+
}
23+
1424
//Mainloop:
1525
const { timeout_add_seconds,
1626
timeout_add,
@@ -21,8 +31,8 @@ const { timeout_add_seconds,
2131
source_exists,
2232
source_remove,
2333
remove_all_sources
24-
} = require("./lib/mainloopTools");
25-
const { to_string } = require("./lib/to-string");
34+
} = _require("./lib/mainloopTools");
35+
const { to_string } = _require("./lib/to-string");
2636

2737

2838
const UUID = "AlbumArt3.0@claudiux";
@@ -49,17 +59,18 @@ Gettext.bindtextdomain(UUID, HOME_DIR + "/.local/share/locale");
4959
Gettext.bindtextdomain("cinnamon", "/usr/share/locale");
5060
function _(str) {
5161
let customTrans = Gettext.dgettext(UUID, str);
52-
if (customTrans.length > 0 && customTrans !== str)
53-
return customTrans;
54-
customTrans = Gettext.dgettext("cinnamon", str);
55-
if (customTrans.length > 0 && customTrans !== str)
56-
return customTrans;
57-
return Gettext.gettext(str);
62+
return customTrans;
63+
//~ if (customTrans.length > 0 && customTrans !== str)
64+
//~ return customTrans;
65+
//~ customTrans = Gettext.dgettext("cinnamon", str);
66+
//~ if (customTrans.length > 0 && customTrans !== str)
67+
//~ return customTrans;
68+
//~ return Gettext.gettext(str);
5869
}
5970

6071

6172

62-
class AlbumArtRadio30 extends Desklet.Desklet {
73+
var AlbumArtRadio30 = class AlbumArtRadio30 extends Desklet.Desklet {
6374
constructor(metadata, desklet_id) {
6475
super(metadata, desklet_id);
6576

@@ -295,14 +306,14 @@ class AlbumArtRadio30 extends Desklet.Desklet {
295306

296307
if (!this.isLooping) return false;
297308
this._update();
298-
309+
299310
if (this.isLooping) {
300311
if (this.oldRealWidth != this.realWidth || this.oldRealHeight != this.realHeight) {
301312
this.oldRealWidth = this.realWidth;
302313
this.oldRealHeight = this.realHeight;
303314
this.on_setting_changed();
304315
}
305-
316+
306317
this.update_id = timeout_add_seconds(this.delay, () => { this._update_loop() });
307318
} else {
308319
return false;
@@ -432,7 +443,7 @@ class AlbumArtRadio30 extends Desklet.Desklet {
432443
} else {
433444
if (this._bin != null) this._bin.set_child(this.currentPicture);
434445
}
435-
446+
436447
this.updateInProgress = false;
437448
}
438449

‎AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/lib/mainloopTools.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const GLib = imports.gi.GLib;
2+
const Extension = imports.ui.extension;
23

34
/**
45
* _sourceIds
@@ -165,7 +166,7 @@ function remove_all_sources() {
165166
}
166167
}
167168

168-
module.exports = {
169+
if (!Extension.getCurrentExtension) module.exports = {
169170
_sourceIds,
170171
timeout_add_seconds,
171172
timeout_add,

‎AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/lib/to-string.js‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const ByteArray = imports.byteArray;
2+
const Extension = imports.ui.extension;
23

34
const to_string = function(data) {
45
if (ByteArray.hasOwnProperty("toString")) {
@@ -8,41 +9,6 @@ const to_string = function(data) {
89
}
910
}
1011

11-
//~ const to_string = function(data) {
12-
//~ return stringFromUTF8Array(data);
13-
//~ }
14-
15-
//~ const stringFromUTF8Array = function(data) {
16-
//~ const extraByteMap = [ 1, 1, 1, 1, 2, 2, 3, 0 ];
17-
//~ var count = data.length;
18-
//~ var str = "";
19-
20-
//~ for (var index = 0;index < count;)
21-
//~ {
22-
//~ var ch = data[index++];
23-
//~ if (ch & 0x80)
24-
//~ {
25-
//~ var extra = extraByteMap[(ch >> 3) & 0x07];
26-
//~ if (!(ch & 0x40) || !extra || ((index + extra) > count))
27-
//~ return null;
28-
29-
//~ ch = ch & (0x3F >> extra);
30-
//~ for (;extra > 0;extra -= 1)
31-
//~ {
32-
//~ var chx = data[index++];
33-
//~ if ((chx & 0xC0) != 0x80)
34-
//~ return null;
35-
36-
//~ ch = (ch << 6) | (chx & 0x3F);
37-
//~ }
38-
//~ }
39-
40-
//~ str += String.fromCharCode(ch);
41-
//~ }
42-
43-
//~ return str;
44-
//~ }
45-
46-
module.exports = {
12+
if (!Extension.getCurrentExtension) module.exports = {
4713
to_string
4814
}

‎AlbumArt3.0@claudiux/files/AlbumArt3.0@claudiux/metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"name": "Album Art for Radio3.0 and Enhanced Sound applets",
55
"description": "A digital photo frame desklet to display an album art, if available",
66
"prevent-decorations": true,
7-
"version": "2.4.0",
7+
"version": "2.4.1",
88
"author": "claudiux"
99
}

0 commit comments

Comments
 (0)