Skip to content

Commit 399f363

Browse files
authored
[CassiaWindowList@klangman] 2.3.5 Fix for UI scale changes (#6450)
1. Fix the number bubble showing up incorrectly after changing the UI scale settings in display setting application. 2. Add a 2nd setting of the "runWizard" to "0" (this time in the window-list Javascript code rather than just in the wizard python code) to try an ensure that the welcome wizard does not reappear after a restart (I had a report of this happening but couldn't get to the bottom of why it occurred).
1 parent 985d034 commit 399f363

File tree

12 files changed

+405
-400
lines changed

12 files changed

+405
-400
lines changed

CassiaWindowList@klangman/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 2.3.5
4+
5+
* Fix for the "number bubble" showing up incorrectly after changing the UI scale settings in display setting application.
6+
* Add a 2nd layer of code to try and ensure that the "Welcome Wizard" dialog does not reappear after a restart
7+
38
## 2.3.4
49

510
* Saves new default thumbnail window sizes (adjusted using the mouse scroll-wheel) across cinnamon restarts

CassiaWindowList@klangman/files/CassiaWindowList@klangman/4.0/applet.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ const ICON_NAMES = {
124124
writer: 'x-office-document'
125125
}
126126

127-
const majorVersion = parseInt(Config.PACKAGE_VERSION.substring(0,1));
128-
129127
// The possible user setting for the caption contents
130128
const CaptionType = {
131129
Name: 0, // Caption is set to the Application Name (i.e. Firefox)
@@ -5369,10 +5367,12 @@ class WindowList extends Applet.Applet {
53695367
this._signalManager.connect(this._settings, "changed::show-windows-for-all-workspaces", this._onShowOnAllWorkspacesChanged, this);
53705368
this._signalManager.connect(this._settings, "changed::number-of-unshrunk-previews", this._updateGlobalPreviewSize, this);
53715369
this._signalManager.connect(this._settings, "settings-changed", this._onSettingsChanged, this);
5370+
this._signalManager.connect(global, "scale-changed", this._updateCurrentWorkspace, this);
53725371

53735372
if (this._settings.getValue("runWizard")===1) {
53745373
let command = GLib.get_home_dir() + "/.local/share/cinnamon/applets/" + this._uuid + "/setupWizard " + this._uuid + " " + this.instance_id;
53755374
Util.spawnCommandLineAsync(command);
5375+
this._settings.setValue("runWizard", 0);
53765376
}
53775377
}
53785378

CassiaWindowList@klangman/files/CassiaWindowList@klangman/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"max-instances": -1,
66
"multiversion": true,
77
"role": "panellauncher",
8-
"version": "2.3.4",
8+
"version": "2.3.5",
99
"author": "klangman"
1010
}

CassiaWindowList@klangman/files/CassiaWindowList@klangman/po/[email protected]

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#, fuzzy
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: CassiaWindowList@klangman 2.3.4\n"
8+
"Project-Id-Version: CassiaWindowList@klangman 2.3.5\n"
99
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-applets/"
1010
"issues\n"
11-
"POT-Creation-Date: 2024-09-15 16:02-0400\n"
11+
"POT-Creation-Date: 2024-09-28 12:56-0400\n"
1212
"PO-Revision-Date: \n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -17,32 +17,32 @@ msgstr ""
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919

20-
#. 4.0/applet.js:583 6.0/applet.js:583
20+
#. 4.0/applet.js:581 6.0/applet.js:581
2121
msgid "all buttons"
2222
msgstr ""
2323

24-
#. 4.0/applet.js:3174 6.0/applet.js:3174
24+
#. 4.0/applet.js:3172 6.0/applet.js:3172
2525
msgid "Applet Preferences"
2626
msgstr ""
2727

28-
#. 4.0/applet.js:3178 6.0/applet.js:3178
28+
#. 4.0/applet.js:3176 6.0/applet.js:3176
2929
msgid "About..."
3030
msgstr ""
3131

32-
#. 4.0/applet.js:3182 6.0/applet.js:3182
32+
#. 4.0/applet.js:3180 6.0/applet.js:3180
3333
msgid "Configure..."
3434
msgstr ""
3535

36-
#. 4.0/applet.js:3186 6.0/applet.js:3186
36+
#. 4.0/applet.js:3184 6.0/applet.js:3184
3737
msgid "Website"
3838
msgstr ""
3939

40-
#. 4.0/applet.js:3190 6.0/applet.js:3190
40+
#. 4.0/applet.js:3188 6.0/applet.js:3188
4141
#, javascript-format
4242
msgid "Remove '%s'"
4343
msgstr ""
4444

45-
#. 4.0/applet.js:3192 6.0/applet.js:3192
45+
#. 4.0/applet.js:3190 6.0/applet.js:3190
4646
msgid "Do you really want to remove this instance of CassiaWindowList?"
4747
msgstr ""
4848

@@ -58,75 +58,75 @@ msgstr ""
5858
#. 6.0->settings-schema.json->mouse-action-btn2->options
5959
#. 6.0->settings-schema.json->mouse-action-btn8->options
6060
#. 6.0->settings-schema.json->mouse-action-btn9->options
61-
#. 4.0/applet.js:3201 6.0/applet.js:3201
61+
#. 4.0/applet.js:3199 6.0/applet.js:3199
6262
msgid "Open new window"
6363
msgstr ""
6464

65-
#. 4.0/applet.js:3209 6.0/applet.js:3209
65+
#. 4.0/applet.js:3207 6.0/applet.js:3207
6666
msgid "Remove from panel"
6767
msgstr ""
6868

69-
#. 4.0/applet.js:3211 6.0/applet.js:3211
69+
#. 4.0/applet.js:3209 6.0/applet.js:3209
7070
msgid "Remove from this workspace"
7171
msgstr ""
7272

73-
#. 4.0/applet.js:3217 6.0/applet.js:3217
73+
#. 4.0/applet.js:3215 6.0/applet.js:3215
7474
msgid "Pin to panel"
7575
msgstr ""
7676

77-
#. 4.0/applet.js:3219 6.0/applet.js:3219
77+
#. 4.0/applet.js:3217 6.0/applet.js:3217
7878
msgid "Pin to this workspace"
7979
msgstr ""
8080

81-
#. 4.0/applet.js:3260 6.0/applet.js:3260
81+
#. 4.0/applet.js:3258 6.0/applet.js:3258
8282
msgid "Pin to other workspaces"
8383
msgstr ""
8484

85-
#. 4.0/applet.js:3281 6.0/applet.js:3281
85+
#. 4.0/applet.js:3279 6.0/applet.js:3279
8686
msgid "Pin to all workspaces"
8787
msgstr ""
8888

89-
#. 4.0/applet.js:3299 6.0/applet.js:3299
89+
#. 4.0/applet.js:3297 6.0/applet.js:3297
9090
msgid "Pin to launcher"
9191
msgstr ""
9292

93-
#. 4.0/applet.js:3317 4.0/applet.js:3520 6.0/applet.js:3317 6.0/applet.js:3520
93+
#. 4.0/applet.js:3315 4.0/applet.js:3518 6.0/applet.js:3315 6.0/applet.js:3518
9494
msgid "Add new Hotkey for"
9595
msgstr ""
9696

97-
#. 4.0/applet.js:3331 6.0/applet.js:3331
97+
#. 4.0/applet.js:3329 6.0/applet.js:3329
9898
msgid "Recent files"
9999
msgstr ""
100100

101-
#. 4.0/applet.js:3355 6.0/applet.js:3355
101+
#. 4.0/applet.js:3353 6.0/applet.js:3353
102102
msgid "Places"
103103
msgstr ""
104104

105-
#. 4.0/applet.js:3396 6.0/applet.js:3396
105+
#. 4.0/applet.js:3394 6.0/applet.js:3394
106106
msgid "Always on top"
107107
msgstr ""
108108

109-
#. 4.0/applet.js:3408 6.0/applet.js:3408
109+
#. 4.0/applet.js:3406 6.0/applet.js:3406
110110
msgid "Only on this workspace"
111111
msgstr ""
112112

113-
#. 4.0/applet.js:3410 6.0/applet.js:3410
113+
#. 4.0/applet.js:3408 6.0/applet.js:3408
114114
msgid "Visible on all workspaces"
115115
msgstr ""
116116

117-
#. 4.0/applet.js:3411 6.0/applet.js:3411
117+
#. 4.0/applet.js:3409 6.0/applet.js:3409
118118
msgid "Move to another workspace"
119119
msgstr ""
120120

121-
#. 4.0/applet.js:3420 6.0/applet.js:3420
121+
#. 4.0/applet.js:3418 6.0/applet.js:3418
122122
msgid " (this workspace)"
123123
msgstr ""
124124

125-
#. 4.0/applet.js:3433 6.0/applet.js:3433
125+
#. 4.0/applet.js:3431 6.0/applet.js:3431
126126
msgid "Move to another monitor"
127127
msgstr ""
128128

129-
#. 4.0/applet.js:3441 6.0/applet.js:3441
129+
#. 4.0/applet.js:3439 6.0/applet.js:3439
130130
msgid "Monitor"
131131
msgstr ""
132132

@@ -142,47 +142,47 @@ msgstr ""
142142
#. 6.0->settings-schema.json->mouse-action-btn2->options
143143
#. 6.0->settings-schema.json->mouse-action-btn8->options
144144
#. 6.0->settings-schema.json->mouse-action-btn9->options
145-
#. 4.0/applet.js:3458 6.0/applet.js:3458
145+
#. 4.0/applet.js:3456 6.0/applet.js:3456
146146
msgid "Move window here"
147147
msgstr ""
148148

149-
#. 4.0/applet.js:3475 6.0/applet.js:3475
149+
#. 4.0/applet.js:3473 6.0/applet.js:3473
150150
msgid "unassigned"
151151
msgstr ""
152152

153-
#. 4.0/applet.js:3486 4.0/applet.js:3517 6.0/applet.js:3486 6.0/applet.js:3517
153+
#. 4.0/applet.js:3484 4.0/applet.js:3515 6.0/applet.js:3484 6.0/applet.js:3515
154154
msgid "Assign window to a hotkey"
155155
msgstr ""
156156

157-
#. 4.0/applet.js:3540 6.0/applet.js:3540
157+
#. 4.0/applet.js:3538 6.0/applet.js:3538
158158
msgid "Change application label contents"
159159
msgstr ""
160160

161-
#. 4.0/applet.js:3543 6.0/applet.js:3543
161+
#. 4.0/applet.js:3541 6.0/applet.js:3541
162162
msgid "Remove custom setting"
163163
msgstr ""
164164

165-
#. 4.0/applet.js:3550 6.0/applet.js:3550
165+
#. 4.0/applet.js:3548 6.0/applet.js:3548
166166
msgid "Use window title"
167167
msgstr ""
168168

169-
#. 4.0/applet.js:3557 6.0/applet.js:3557
169+
#. 4.0/applet.js:3555 6.0/applet.js:3555
170170
msgid "Use application name"
171171
msgstr ""
172172

173-
#. 4.0/applet.js:3564 6.0/applet.js:3564
173+
#. 4.0/applet.js:3562 6.0/applet.js:3562
174174
msgid "No label"
175175
msgstr ""
176176

177-
#. 4.0/applet.js:3575 6.0/applet.js:3575
177+
#. 4.0/applet.js:3573 6.0/applet.js:3573
178178
msgid "Ungroup application windows"
179179
msgstr ""
180180

181-
#. 4.0/applet.js:3584 6.0/applet.js:3584
181+
#. 4.0/applet.js:3582 6.0/applet.js:3582
182182
msgid "Group application windows"
183183
msgstr ""
184184

185-
#. 4.0/applet.js:3597 6.0/applet.js:3597
185+
#. 4.0/applet.js:3595 6.0/applet.js:3595
186186
msgid "Automatic grouping/ungrouping"
187187
msgstr ""
188188

@@ -198,31 +198,31 @@ msgstr ""
198198
#. 6.0->settings-schema.json->mouse-action-btn2->options
199199
#. 6.0->settings-schema.json->mouse-action-btn8->options
200200
#. 6.0->settings-schema.json->mouse-action-btn9->options
201-
#. 4.0/applet.js:3627 6.0/applet.js:3627
201+
#. 4.0/applet.js:3625 6.0/applet.js:3625
202202
msgid "Move titlebar on to screen"
203203
msgstr ""
204204

205-
#. 4.0/applet.js:3632 6.0/applet.js:3632
205+
#. 4.0/applet.js:3630 6.0/applet.js:3630
206206
msgid "Restore"
207207
msgstr ""
208208

209-
#. 4.0/applet.js:3636 6.0/applet.js:3636
209+
#. 4.0/applet.js:3634 6.0/applet.js:3634
210210
msgid "Minimize"
211211
msgstr ""
212212

213-
#. 4.0/applet.js:3642 6.0/applet.js:3642
213+
#. 4.0/applet.js:3640 6.0/applet.js:3640
214214
msgid "Unmaximize"
215215
msgstr ""
216216

217-
#. 4.0/applet.js:3649 6.0/applet.js:3649
217+
#. 4.0/applet.js:3647 6.0/applet.js:3647
218218
msgid "Close others"
219219
msgstr ""
220220

221-
#. 4.0/applet.js:3660 6.0/applet.js:3660
221+
#. 4.0/applet.js:3658 6.0/applet.js:3658
222222
msgid "Close all"
223223
msgstr ""
224224

225-
#. 4.0/applet.js:3669 6.0/applet.js:3669
225+
#. 4.0/applet.js:3667 6.0/applet.js:3667
226226
msgid "Close"
227227
msgstr ""
228228

0 commit comments

Comments
 (0)