Merge branch 'main' into release-1.4.0

Author: danirabbit

data/quick-settings.metainfo.xml

@@ -40,6 +40,7 @@
       </description>
       <issues>
         <issue url="https://github.com/elementary/quick-settings/issues/45">End Session Dialog should pull visual focus</issue>
+        <issue url="https://github.com/elementary/quick-settings/issues/135">Ctrl+Alt+Del not available before opening Quick Settings for the first time</issue>
       </issues>
     </release>
 

po/POTFILES

@@ -5,7 +5,6 @@ src/DBus/LockInterface.vala
 src/DBus/SeatInterface.vala
 src/DBus/SensorProxy.vala
 src/DBus/SessionInterface.vala
-src/DBus/SystemInterface.vala
 src/DBus/UserInterface.vala
 src/Services/UserManager.vala
 src/Widgets/AvatarButton.vala

po/sl.po

@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: io.elementary.quick-settings\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-01-08 15:36+0000\n"
-"PO-Revision-Date: 2024-04-25 16:13+0000\n"
-"Last-Translator: anonymous <noreply@weblate.org>\n"
-"Language-Team: Slovenian <https://l10n.elementary.io/projects/wingpanel/"
+"PO-Revision-Date: 2026-01-19 15:55+0000\n"
+"Last-Translator: Jernej Virag <jernej@virag.si>\n"
+"Language-Team: Slovenian <https://l10n.elementaryos.org/projects/wingpanel/"
 "quick-settings/sl/>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.11.4\n"
 
 #: src/PopoverWidget.vala:28
 msgid "Screen Reader"
@@ -30,33 +30,34 @@ msgstr "Zaslonska tipkovnica"
 
 #: src/PopoverWidget.vala:160
 msgid "On Screen keyboard is unavailable in the Secure session"
-msgstr ""
+msgstr "Zaslonska tipkovnica ni na voljo v varni seji"
 
 #: src/PopoverWidget.vala:161
 msgid "Log out and select “Classic session” to use the On Screen Keyboard."
 msgstr ""
+"Odjavite se in izberite \"Klasična seja\" za uporabo zaslonske tipkovnice."
 
 #: src/PopoverWidget.vala:188
 msgid "Not logged in"
-msgstr ""
+msgstr "Brez prijave"
 
 #: src/Services/UserManager.vala:135
 #, c-format
 msgid "Logged in as “%s”"
-msgstr ""
+msgstr "Prijavljen kot “%s”"
 
 #: src/Services/UserManager.vala:158
 #, c-format
 msgid "%i other person logged in"
 msgid_plural "%i other people logged in"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "prijavljena %i druga oseba"
+msgstr[1] "prijavljeni %i drugi osebi"
+msgstr[2] "prijavljene %i druge osebe"
+msgstr[3] "prijavljenih %i drugih oseb"
 
 #: src/Widgets/DarkModeToggle.vala:9
 msgid "Dark Mode"
-msgstr ""
+msgstr "Temni način"
 
 #: src/Widgets/EndSessionDialog.vala:37
 msgid "Are you sure you want to Log Out?"
@@ -93,19 +94,19 @@ msgstr "Prekliči"
 
 #: src/Widgets/EndSessionDialog.vala:87
 msgid "Install pending system updates"
-msgstr ""
+msgstr "Namesti čakajoče sistemske posodobitve"
 
 #: src/Widgets/PreventSleepToggle.vala:12
 msgid "Prevent Sleep"
-msgstr ""
+msgstr "Prepreči spanje"
 
 #: src/Widgets/RotationToggle.vala:9
 msgid "Rotation Lock"
-msgstr ""
+msgstr "Zaklep obračanja"
 
 #: src/Widgets/SessionBox.vala:19
 msgid "System Settings…"
-msgstr ""
+msgstr "Sistemske nastavitve…"
 
 #: src/Widgets/SessionBox.vala:24
 msgid "Suspend"
@@ -130,7 +131,7 @@ msgstr "Povečaj velikost besedila"
 
 #: src/Widgets/UserList.vala:43
 msgid "User Accounts Settings…"
-msgstr ""
+msgstr "Nastavitve uporabniških računov…"
 
 #: src/Widgets/UserRow.vala:82 src/Widgets/UserRow.vala:94
 #: src/Widgets/UserRow.vala:99
@@ -139,18 +140,16 @@ msgstr "Odjava…"
 
 #: src/Widgets/UserRow.vala:136
 msgid "Logged in"
-msgstr ""
+msgstr "Prijavljen"
 
 #: src/Widgets/UserRow.vala:138
 msgid "Logged out"
-msgstr ""
+msgstr "Odjavljen"
 
 #: src/Widgets/UserRow.vala:148
-#, fuzzy
-#| msgid "Lock"
 msgid "Locked"
-msgstr "Zakleni"
+msgstr "Zaklenjen"
 
 #: src/Widgets/UserRow.vala:151
 msgid "Guest"
-msgstr ""
+msgstr "Gost"

src/DBus/EndSessionDialogServer.vala

@@ -30,7 +30,7 @@ public class QuickSettings.EndSessionDialogServer : Object {
     }
 
     [DBus (visible = false)]
-    public signal void show_dialog (uint type, uint32 triggering_event_timestamp);
+    public signal void show_dialog (uint type);
 
     public signal void confirmed_logout ();
     public signal void confirmed_reboot ();
@@ -47,6 +47,6 @@ public class QuickSettings.EndSessionDialogServer : Object {
             throw new DBusError.NOT_SUPPORTED ("Hibernate, suspend and hybrid sleep are not supported actions yet");
         }
 
-        show_dialog (type, timestamp);
+        show_dialog (type);
     }
 }

src/DBus/Login1Manager.vala

@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2024-2026 elementary, Inc. (https://elementary.io)
+ */
+
+public class QuickSettings.Login1Manager : Object {
+    public struct UserInfo {
+        uint32 uid;
+        string user_name;
+        ObjectPath? user_object;
+    }
+
+    [DBus (name = "org.freedesktop.login1.Manager")]
+    public interface Login1ManagerInterface : Object {
+        public abstract void suspend (bool interactive) throws GLib.Error;
+        public abstract void reboot (bool interactive) throws GLib.Error;
+        public abstract void power_off (bool interactive) throws GLib.Error;
+        public abstract void reboot_with_flags (uint64 flags) throws GLib.Error;
+        public abstract void power_off_with_flags (uint64 flags) throws GLib.Error;
+
+        public abstract UserInfo[] list_users () throws GLib.Error;
+        public abstract string can_suspend () throws GLib.Error;
+    }
+
+    public Login1ManagerInterface proxy { get; private set; }
+
+    private static GLib.Once<Login1Manager> instance;
+    public static unowned Login1Manager get_default () {
+        return instance.once (() => new Login1Manager ());
+    }
+
+    private Login1Manager () {}
+
+    construct {
+        try {
+            proxy = Bus.get_proxy_sync<Login1ManagerInterface> (
+                SYSTEM,
+                "org.freedesktop.login1",
+                "/org/freedesktop/login1"
+            );
+        } catch (Error e) {
+            critical (e.message);
+        }
+    }
+}

src/DBus/SystemInterface.vala

@@ -6,6 +6,7 @@
 public class QuickSettings.Indicator : Wingpanel.Indicator {
     public Wingpanel.IndicatorManager.ServerType server_type { get; construct; }
 
+    private EndSessionDialog? current_dialog;
     private PopoverWidget? popover_widget;
 
     public Indicator (Wingpanel.IndicatorManager.ServerType server_type) {
@@ -23,6 +24,55 @@ public class QuickSettings.Indicator : Wingpanel.Indicator {
         // Prevent a race that skips automatic resource loading
         // https://github.com/elementary/wingpanel-indicator-bluetooth/issues/203
         Gtk.IconTheme.get_default ().add_resource_path ("/org/elementary/wingpanel/icons");
+
+        EndSessionDialogServer.init ();
+        EndSessionDialogServer.get_default ().show_dialog.connect (
+            (type) => show_dialog ((EndSessionDialogType) type)
+        );
+    }
+
+    private void show_dialog (EndSessionDialogType type) {
+        ((Gtk.Popover?) popover_widget?.get_ancestor (typeof (Gtk.Popover)))?.popdown ();
+
+        if (current_dialog != null) {
+            if (current_dialog.dialog_type != type) {
+                current_dialog.destroy ();
+            } else {
+                return;
+            }
+        }
+
+        unowned var server = EndSessionDialogServer.get_default ();
+
+        current_dialog = new EndSessionDialog (type);
+        current_dialog.destroy.connect (() => {
+            server.closed ();
+            current_dialog = null;
+        });
+
+        current_dialog.cancelled.connect (() => server.canceled ());
+        current_dialog.logout.connect (() => server.confirmed_logout ());
+        current_dialog.shutdown.connect (() => {
+            try {
+                // See https://www.freedesktop.org/software/systemd/man/latest/org.freedesktop.login1.html for flags values
+                // #define SD_LOGIND_ROOT_CHECK_INHIBITORS (UINT64_C(1) << 0) == 1
+                Login1Manager.get_default ().proxy.power_off_with_flags (1);
+            } catch (Error e) {
+                warning ("Unable to shutdown: %s", e.message);
+            }
+        });
+
+        current_dialog.reboot.connect (() => {
+            try {
+                // See https://www.freedesktop.org/software/systemd/man/latest/org.freedesktop.login1.html for flags values
+                // #define SD_LOGIND_KEXEC_REBOOT (UINT64_C(1) << 1) == 2
+                Login1Manager.get_default ().proxy.reboot_with_flags (2);
+            } catch (Error e) {
+                warning ("Unable to reboot: %s", e.message);
+            }
+        });
+
+        current_dialog.present ();
     }
 
     public override Gtk.Widget get_display_widget () {

src/Indicator.vala

@@ -21,44 +21,35 @@ public enum UserState {
 }
 
 public class QuickSettings.UserManager : Object {
-    private const string LOGIN_IFACE = "org.freedesktop.login1";
-    private const string LOGIN_PATH = "/org/freedesktop/login1";
-
-    private static string active_user_real_name;
-    private static SystemInterface? login_proxy;
-
-    private static async void init_login_proxy () {
-        try {
-            login_proxy = yield Bus.get_proxy (BusType.SYSTEM, LOGIN_IFACE, LOGIN_PATH, DBusProxyFlags.NONE);
-        } catch (IOError e) {
-            critical ("Failed to create login1 dbus proxy: %s", e.message);
-        }
-    }
+    private static string? active_user_real_name;
 
     public static async UserState get_user_state (uid_t uuid) {
-        if (login_proxy == null) {
-            yield init_login_proxy ();
-        }
-
         try {
-            UserInfo[] users = login_proxy.list_users ();
+            var users = Login1Manager.get_default ().proxy.list_users ();
             if (users == null) {
                 return UserState.OFFLINE;
             }
 
-            foreach (UserInfo user in users) {
-                if (((uid_t) user.uid) == uuid) {
-                    if (user.user_object == null) {
-                        return UserState.OFFLINE;
-                    }
-                    UserInterface? user_interface = yield Bus.get_proxy (BusType.SYSTEM, LOGIN_IFACE, user.user_object, DBusProxyFlags.NONE);
-                    if (user_interface == null) {
-                        return UserState.OFFLINE;
-                    }
-                    return UserState.to_enum (user_interface.state);
+            foreach (var user in users) {
+                if (((uid_t) user.uid) != uuid) {
+                    continue;
+                }
+
+                if (user.user_object == null) {
+                    return UserState.OFFLINE;
+                }
+
+                var user_interface = yield Bus.get_proxy<UserInterface> (
+                    SYSTEM,
+                    "org.freedesktop.login1",
+                    user.user_object
+                );
+                if (user_interface == null) {
+                    return UserState.OFFLINE;
                 }
-            }
 
+                return UserState.to_enum (user_interface.state);
+            }
         } catch (GLib.Error e) {
             critical ("Failed to get user state: %s", e.message);
         }
@@ -67,13 +58,9 @@ public class QuickSettings.UserManager : Object {
     }
 
     public static async UserState get_guest_state () {
-        if (login_proxy == null) {
-            return UserState.OFFLINE;
-        }
-
         try {
-            UserInfo[] users = login_proxy.list_users ();
-            foreach (UserInfo user in users) {
+            var users = Login1Manager.get_default ().proxy.list_users ();
+            foreach (var user in users) {
                 var state = yield get_user_state (user.uid);
                 if (user.user_name.has_prefix ("guest-")
                     && state == UserState.ACTIVE) {