Skip to content

Commit fa27445

Browse files
authored
Merge branch 'master' into leolost/make-modal
2 parents 3fb108d + 2d3fdbe commit fa27445

Some content is hidden

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

212 files changed

+20604
-19495
lines changed

lib/DragDropAction.vala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ namespace Gala {
8686
*/
8787
public string drag_id { get; construct; }
8888

89-
public Actor handle { get; private set; }
89+
public Actor? handle { get; private set; }
9090
/**
9191
* Indicates whether a drag action is currently active
9292
*/
@@ -241,6 +241,7 @@ namespace Gala {
241241
} else if (dragging) {
242242
if (hovered != null) {
243243
finish ();
244+
hovered = null;
244245
} else {
245246
cancel ();
246247
}
@@ -460,6 +461,7 @@ namespace Gala {
460461
}
461462

462463
dragging = false;
464+
handle = null;
463465
}
464466

465467
private bool is_valid_touch_event (Clutter.Event event) {

po/POTFILES

Lines changed: 96 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,102 @@
1-
src/Dialogs.vala
2-
src/PantheonShell.vala
3-
src/ScreenshotManager.vala
4-
src/WindowManager.vala
5-
daemon/BackgroundMenu.vala
61
daemon/DBus.vala
2+
daemon-gtk3/BackgroundMenu.vala
3+
daemon-gtk3/DBus.vala
4+
daemon-gtk3/Main.vala
5+
daemon-gtk3/MonitorLabel.vala
6+
daemon-gtk3/WindowMenu.vala
7+
daemon-gtk3/Window.vala
78
daemon/Main.vala
8-
daemon/Window.vala
9+
daemon/MonitorLabel.vala
910
daemon/WindowMenu.vala
11+
daemon/Window.vala
1012
data/gala.metainfo.xml.in
1113
data/gala-multitaskingview.desktop.in
1214
data/gala-other.desktop.in
15+
lib/ActivatableComponent.vala
16+
lib/AppCache.vala
17+
lib/AppSystem.vala
18+
lib/App.vala
19+
lib/BackgroundManager.vala
20+
lib/CanvasActor.vala
21+
lib/CloseButton.vala
22+
lib/Constants.vala
23+
lib/DragDropAction.vala
24+
lib/Drawing/BufferSurface.vala
25+
lib/Drawing/Canvas.vala
26+
lib/Drawing/Color.vala
27+
lib/Drawing/StyleManager.vala
28+
lib/Drawing/Utilities.vala
29+
lib/Plugin.vala
30+
lib/ShadowEffect.vala
31+
lib/Utils.vala
32+
lib/WindowIcon.vala
33+
lib/WindowManager.vala
34+
plugins/pip/Main.vala
35+
plugins/pip/PopupWindow.vala
36+
plugins/pip/SelectionArea.vala
37+
src/Background/Animation.vala
38+
src/Background/BackgroundCache.vala
39+
src/Background/BackgroundContainer.vala
40+
src/Background/BackgroundManager.vala
41+
src/Background/BackgroundSource.vala
42+
src/Background/Background.vala
43+
src/Background/BlurEffect.vala
44+
src/Background/SystemBackground.vala
45+
src/ColorFilters/ColorblindnessCorrectionEffect.vala
46+
src/ColorFilters/FilterManager.vala
47+
src/ColorFilters/MonochromeEffect.vala
48+
src/DaemonManager.vala
49+
src/DBusAccelerator.vala
50+
src/DBus.vala
51+
src/DesktopIntegration.vala
52+
src/Dialogs.vala
53+
src/Gestures/GestureSettings.vala
54+
src/Gestures/GestureTracker.vala
55+
src/Gestures/Gesture.vala
56+
src/Gestures/ScrollBackend.vala
57+
src/Gestures/ToucheggBackend.vala
58+
src/HotCorners/Barrier.vala
59+
src/HotCorners/HotCornerManager.vala
60+
src/HotCorners/HotCorner.vala
61+
src/InternalUtils.vala
62+
src/KeyboardManager.vala
63+
src/Main.vala
64+
src/MediaFeedback.vala
65+
src/NotificationStack.vala
66+
src/PantheonShell.vala
67+
src/PluginManager.vala
68+
src/ScreenSaverManager.vala
69+
src/ScreenshotManager.vala
70+
src/SessionManager.vala
71+
src/ShellClients/HideTracker.vala
72+
src/ShellClients/ManagedClient.vala
73+
src/ShellClients/NotificationsClient.vala
74+
src/ShellClients/PanelClone.vala
75+
src/ShellClients/PanelWindow.vala
76+
src/ShellClients/ShellClientsManager.vala
77+
src/Widgets/DwellClickTimer.vala
78+
src/Widgets/IconGroupContainer.vala
79+
src/Widgets/IconGroup.vala
80+
src/Widgets/MonitorClone.vala
81+
src/Widgets/MultitaskingView.vala
82+
src/Widgets/PixelPicker.vala
83+
src/Widgets/PointerLocator.vala
84+
src/Widgets/SafeWindowClone.vala
85+
src/Widgets/ScreenShield.vala
86+
src/Widgets/SelectionArea.vala
87+
src/Widgets/Tooltip.vala
88+
src/Widgets/WindowCloneContainer.vala
89+
src/Widgets/WindowClone.vala
90+
src/Widgets/WindowIconActor.vala
91+
src/Widgets/WindowOverview.vala
92+
src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala
93+
src/Widgets/WindowSwitcher/WindowSwitcher.vala
94+
src/Widgets/WorkspaceClone.vala
95+
src/Widgets/WorkspaceInsertThumb.vala
96+
src/WindowGrabTracker.vala
97+
src/WindowListener.vala
98+
src/WindowManager.vala
99+
src/WindowStateSaver.vala
100+
src/WindowTracker.vala
101+
src/WorkspaceManager.vala
102+
src/Zoom.vala

po/aa.po

Lines changed: 100 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gala 3.2.0\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
10-
"POT-Creation-Date: 2024-06-17 17:08+0000\n"
10+
"POT-Creation-Date: 2024-07-08 13:44+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -16,148 +16,71 @@ msgstr ""
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
1818

19-
#: src/Dialogs.vala:144
20-
#, c-format
21-
msgid "“%s” is not responding"
22-
msgstr ""
23-
24-
#: src/Dialogs.vala:146
25-
msgid "Application is not responding"
26-
msgstr ""
27-
28-
#: src/Dialogs.vala:149
29-
msgid ""
30-
"You may choose to wait a short while for the application to continue, or "
31-
"force it to quit entirely."
32-
msgstr ""
33-
34-
#: src/Dialogs.vala:150
35-
msgid "Force Quit"
36-
msgstr ""
37-
38-
#: src/Dialogs.vala:151
39-
msgid "Wait"
40-
msgstr ""
41-
42-
#: src/Dialogs.vala:217
43-
#, c-format
44-
msgid "“%s” wants to inhibit system shortcuts"
45-
msgstr ""
46-
47-
#: src/Dialogs.vala:219
48-
msgid "An application wants to inhibit system shortcuts"
49-
msgstr ""
50-
51-
#: src/Dialogs.vala:222
52-
msgid "All system shortcuts will be redirected to the application."
53-
msgstr ""
54-
55-
#: src/Dialogs.vala:223
56-
msgid "Allow"
57-
msgstr ""
58-
59-
#: src/Dialogs.vala:224
60-
msgid "Deny"
61-
msgstr ""
62-
63-
#: src/ScreenshotManager.vala:285
64-
msgid "Screenshots"
65-
msgstr ""
66-
67-
#: src/ScreenshotManager.vala:364
68-
msgid "Screenshot taken"
69-
msgstr ""
70-
71-
#: src/WindowManager.vala:2299
72-
#, c-format
73-
msgid "Changes will automatically revert after %i second."
74-
msgid_plural "Changes will automatically revert after %i seconds."
75-
msgstr[0] ""
76-
msgstr[1] ""
77-
78-
#: src/WindowManager.vala:2306
79-
msgid "Keep new display settings?"
80-
msgstr ""
81-
82-
#: src/WindowManager.vala:2310
83-
msgid "Keep Settings"
84-
msgstr ""
85-
86-
#: src/WindowManager.vala:2311
87-
msgid "Use Previous Settings"
88-
msgstr ""
89-
90-
#. / TRANSLATORS: %s represents a timestamp here
91-
#: src/WindowManager.vala:2350
92-
#, c-format
93-
msgid "Screenshot from %s"
94-
msgstr ""
95-
96-
#: daemon/BackgroundMenu.vala:11
19+
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
9720
msgid "Change Wallpaper…"
9821
msgstr ""
9922

100-
#: daemon/BackgroundMenu.vala:16
23+
#: daemon/DBus.vala:86 daemon-gtk3/BackgroundMenu.vala:16
10124
msgid "Display Settings…"
10225
msgstr ""
10326

104-
#: daemon/BackgroundMenu.vala:22
27+
#: daemon/DBus.vala:92 daemon-gtk3/BackgroundMenu.vala:22
10528
msgid "System Settings…"
10629
msgstr ""
10730

108-
#: daemon/BackgroundMenu.vala:47
31+
#: daemon/DBus.vala:207 daemon-gtk3/BackgroundMenu.vala:47
10932
msgid "Failed to open System Settings"
11033
msgstr ""
11134

112-
#: daemon/BackgroundMenu.vala:48
35+
#: daemon/DBus.vala:208 daemon-gtk3/BackgroundMenu.vala:48
11336
msgid "A handler for the “settings://” URI scheme must be installed."
11437
msgstr ""
11538

116-
#: daemon/WindowMenu.vala:36
39+
#: daemon-gtk3/WindowMenu.vala:36 daemon/WindowMenu.vala:38
11740
msgid "Hide"
11841
msgstr ""
11942

120-
#: daemon/WindowMenu.vala:49
43+
#: daemon-gtk3/WindowMenu.vala:49 daemon/WindowMenu.vala:54
12144
msgid "Move"
12245
msgstr ""
12346

124-
#: daemon/WindowMenu.vala:57
47+
#: daemon-gtk3/WindowMenu.vala:57 daemon/WindowMenu.vala:64
12548
msgid "Resize"
12649
msgstr ""
12750

128-
#: daemon/WindowMenu.vala:65
51+
#: daemon-gtk3/WindowMenu.vala:65 daemon/WindowMenu.vala:74
12952
msgid "Always on Top"
13053
msgstr ""
13154

132-
#: daemon/WindowMenu.vala:73
55+
#: daemon-gtk3/WindowMenu.vala:73 daemon/WindowMenu.vala:84
13356
msgid "Always on Visible Workspace"
13457
msgstr ""
13558

136-
#: daemon/WindowMenu.vala:81
59+
#: daemon-gtk3/WindowMenu.vala:81 daemon/WindowMenu.vala:94
13760
msgid "Move to Workspace Left"
13861
msgstr ""
13962

140-
#: daemon/WindowMenu.vala:89
63+
#: daemon-gtk3/WindowMenu.vala:89 daemon/WindowMenu.vala:104
14164
msgid "Move to Workspace Right"
14265
msgstr ""
14366

144-
#: daemon/WindowMenu.vala:97
67+
#: daemon-gtk3/WindowMenu.vala:97 daemon/WindowMenu.vala:114
14568
msgid "Take Screenshot"
14669
msgstr ""
14770

148-
#: daemon/WindowMenu.vala:105
71+
#: daemon-gtk3/WindowMenu.vala:105 daemon/WindowMenu.vala:124
14972
msgid "Close"
15073
msgstr ""
15174

152-
#: daemon/WindowMenu.vala:138
75+
#: daemon-gtk3/WindowMenu.vala:138 daemon/WindowMenu.vala:167
15376
msgid "Untile"
15477
msgstr ""
15578

156-
#: daemon/WindowMenu.vala:138
79+
#: daemon-gtk3/WindowMenu.vala:138 daemon/WindowMenu.vala:167
15780
msgid "Unmaximize"
15881
msgstr ""
15982

160-
#: daemon/WindowMenu.vala:140
83+
#: daemon-gtk3/WindowMenu.vala:140 daemon/WindowMenu.vala:169
16184
msgid "Maximize"
16285
msgstr ""
16386

@@ -269,3 +192,85 @@ msgstr ""
269192
#: data/gala-other.desktop.in:5
270193
msgid "Fallback desktop file for notifications from outdated applications."
271194
msgstr ""
195+
196+
#: lib/App.vala:51
197+
msgctxt "program"
198+
msgid "Unknown"
199+
msgstr ""
200+
201+
#: src/Dialogs.vala:144
202+
#, c-format
203+
msgid "“%s” is not responding"
204+
msgstr ""
205+
206+
#: src/Dialogs.vala:146
207+
msgid "Application is not responding"
208+
msgstr ""
209+
210+
#: src/Dialogs.vala:149
211+
msgid ""
212+
"You may choose to wait a short while for the application to continue, or "
213+
"force it to quit entirely."
214+
msgstr ""
215+
216+
#: src/Dialogs.vala:150
217+
msgid "Force Quit"
218+
msgstr ""
219+
220+
#: src/Dialogs.vala:151
221+
msgid "Wait"
222+
msgstr ""
223+
224+
#: src/Dialogs.vala:217
225+
#, c-format
226+
msgid "“%s” wants to inhibit system shortcuts"
227+
msgstr ""
228+
229+
#: src/Dialogs.vala:219
230+
msgid "An application wants to inhibit system shortcuts"
231+
msgstr ""
232+
233+
#: src/Dialogs.vala:222
234+
msgid "All system shortcuts will be redirected to the application."
235+
msgstr ""
236+
237+
#: src/Dialogs.vala:223
238+
msgid "Allow"
239+
msgstr ""
240+
241+
#: src/Dialogs.vala:224
242+
msgid "Deny"
243+
msgstr ""
244+
245+
#: src/ScreenshotManager.vala:290
246+
msgid "Screenshots"
247+
msgstr ""
248+
249+
#: src/ScreenshotManager.vala:369
250+
msgid "Screenshot taken"
251+
msgstr ""
252+
253+
#: src/WindowManager.vala:2318
254+
#, c-format
255+
msgid "Changes will automatically revert after %i second."
256+
msgid_plural "Changes will automatically revert after %i seconds."
257+
msgstr[0] ""
258+
msgstr[1] ""
259+
260+
#: src/WindowManager.vala:2325
261+
msgid "Keep new display settings?"
262+
msgstr ""
263+
264+
#: src/WindowManager.vala:2329
265+
msgid "Keep Settings"
266+
msgstr ""
267+
268+
#: src/WindowManager.vala:2330
269+
msgid "Use Previous Settings"
270+
msgstr ""
271+
272+
#. / TRANSLATORS: %s represents a timestamp here
273+
#: src/WindowManager.vala:2369
274+
#, c-format
275+
msgid "Screenshot from %s"
276+
msgstr ""

0 commit comments

Comments
 (0)