Merge lp:~fabiozaramella/slingshot/add-logout-lock-actions into lp:~elementary-pantheon/slingshot/trunk

[Fabio Zaramella]

Add lock and logout actions

This branch adds logout and lock actions.

[Danielle Foré (danrabbit)]

Instead of "Lock your computer", we should probably use device-agnostic terms and avoid questions about formal/informal "you" in translations with "Lock this device".

[Danielle Foré (danrabbit)]

I can confirm that both the lock and logout functions work as expected. Nice work :)

review: Approve

[lp:~fabiozaramella/slingshot/add-logout-lock-actions]

730. By Fabio Zaramella on 2017-01-31

Use correct terminology

=== modified file 'lib/synapse-plugins/system-managment.vala'
--- lib/synapse-plugins/system-managment.vala	2017-01-26 19:54:30 +0000
+++ lib/synapse-plugins/system-managment.vala	2017-01-31 18:58:37 +0000
@@ -45,6 +45,23 @@
         public abstract async bool can_stop () throws IOError;
     }
 
+    [DBus (name = "org.freedesktop.ScreenSaver")]
+    public interface LockObject : Object {
+        public const string UNIQUE_NAME = "org.freedesktop.ScreenSaver";
+        public const string OBJECT_PATH = "/org/freedesktop/ScreenSaver";
+
+        public abstract void lock () throws IOError;
+        public abstract bool get_active () throws IOError;
+    }
+
+    [DBus (name = "org.freedesktop.login1.User")]
+    interface LogOutObject : Object {
+        public const string UNIQUE_NAME = "org.freedesktop.login1";
+        public const string OBJECT_PATH = "/org/freedesktop/login1/user/self";
+
+        public abstract void terminate () throws IOError;
+    }
+
     [DBus (name = "org.freedesktop.login1.Manager")]
     public interface SystemdObject : Object {
         public const string UNIQUE_NAME = "org.freedesktop.login1";
@@ -85,6 +102,60 @@
             }
         }
 
+        private class LockAction : SystemAction {
+            public LockAction () {
+                Object (title: _("Lock"), match_type: MatchType.ACTION,
+                        description: _("Lock this device"),
+                        icon_name: "system-lock-screen", has_thumbnail: false);
+            }
+
+            public override bool action_allowed () {
+                return true;
+            }
+
+            private async void do_lock () {
+                try {
+                    LockObject dbus_interface = Bus.get_proxy_sync (BusType.SESSION, LockObject.UNIQUE_NAME, LockObject.OBJECT_PATH);
+
+                    dbus_interface.lock ();
+                    return;
+                } catch (IOError err) {
+                    warning ("%s", err.message);
+                }
+            }
+
+            public override void do_action () {
+                do_lock.begin ();
+            }
+        }
+
+        private class LogOutAction : SystemAction {
+            public LogOutAction () {
+                Object (title: _("Log Out"), match_type: MatchType.ACTION,
+                        description: _("Close all open applications and quit"),
+                        icon_name: "system-log-out", has_thumbnail: false);
+            }
+
+            public override bool action_allowed () {
+                return true;
+            }
+
+            private async void do_log_out () {
+                try {
+                    LogOutObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, LogOutObject.UNIQUE_NAME, LogOutObject.OBJECT_PATH);
+
+                    dbus_interface.terminate ();
+                    return;
+                } catch (IOError err) {
+                    warning ("%s", err.message);
+                }
+            }
+
+            public override void do_action () {
+                do_log_out.begin ();
+            }
+        }
+
         private class SuspendAction : SystemAction {
             public SuspendAction () {
                 Object (title: _("Suspend"), match_type: MatchType.ACTION,
@@ -98,9 +169,7 @@
 
             private async void check_allowed (){
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     allowed = (dbus_interface.can_suspend () == "yes");
                     return;
@@ -110,9 +179,7 @@
                 }
 
                 try {
-                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    UPowerObject.UNIQUE_NAME,
-                    UPowerObject.OBJECT_PATH);
+                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, UPowerObject.UNIQUE_NAME, UPowerObject.OBJECT_PATH);
 
                     allowed = yield dbus_interface.suspend_allowed ();
                 } catch (IOError err) {
@@ -129,9 +196,7 @@
 
             private async void do_suspend () {
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     dbus_interface.suspend (true);
                     return;
@@ -140,9 +205,7 @@
                 }
 
                 try {
-                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    UPowerObject.UNIQUE_NAME,
-                    UPowerObject.OBJECT_PATH);
+                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, UPowerObject.UNIQUE_NAME, UPowerObject.OBJECT_PATH);
 
                     try {
                         yield dbus_interface.about_to_sleep ();
@@ -177,9 +240,7 @@
 
             private async void check_allowed () {
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     allowed = (dbus_interface.can_hibernate () == "yes");
                     return;
@@ -189,9 +250,7 @@
                 }
 
                 try {
-                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    UPowerObject.UNIQUE_NAME,
-                    UPowerObject.OBJECT_PATH);
+                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, UPowerObject.UNIQUE_NAME, UPowerObject.OBJECT_PATH);
 
                     allowed = yield dbus_interface.hibernate_allowed ();
                 } catch (IOError err) {
@@ -208,9 +267,7 @@
 
             private async void do_hibernate () {
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     dbus_interface.hibernate (true);
                     return;
@@ -219,9 +276,7 @@
                 }
 
                 try {
-                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    UPowerObject.UNIQUE_NAME,
-                    UPowerObject.OBJECT_PATH);
+                    UPowerObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, UPowerObject.UNIQUE_NAME, UPowerObject.OBJECT_PATH);
 
                     try {
                         yield dbus_interface.about_to_sleep ();
@@ -255,9 +310,7 @@
 
             private async void check_allowed () {
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     allowed = (dbus_interface.can_power_off () == "yes");
                     return;
@@ -267,9 +320,7 @@
                 }
 
                 try {
-                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    ConsoleKitObject.UNIQUE_NAME,
-                    ConsoleKitObject.OBJECT_PATH);
+                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, ConsoleKitObject.UNIQUE_NAME, ConsoleKitObject.OBJECT_PATH);
 
                     allowed = yield dbus_interface.can_stop ();
                 } catch (IOError err) {
@@ -286,9 +337,7 @@
 
             public override void do_action () {
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     dbus_interface.power_off (true);
                     return;
@@ -297,9 +346,7 @@
                 }
 
                 try {
-                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    ConsoleKitObject.UNIQUE_NAME,
-                    ConsoleKitObject.OBJECT_PATH);
+                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, ConsoleKitObject.UNIQUE_NAME, ConsoleKitObject.OBJECT_PATH);
 
                     dbus_interface.stop ();
                 } catch (IOError err) {
@@ -321,9 +368,7 @@
 
             private async void check_allowed () {
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     allowed = (dbus_interface.can_reboot () == "yes");
                 return;
@@ -333,9 +378,7 @@
                 }
 
                 try {
-                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    ConsoleKitObject.UNIQUE_NAME,
-                    ConsoleKitObject.OBJECT_PATH);
+                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, ConsoleKitObject.UNIQUE_NAME, ConsoleKitObject.OBJECT_PATH);
 
                     allowed = yield dbus_interface.can_restart ();
                 } catch (IOError err) {
@@ -352,9 +395,7 @@
 
             public override void do_action () {
                 try {
-                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    SystemdObject.UNIQUE_NAME,
-                    SystemdObject.OBJECT_PATH);
+                    SystemdObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, SystemdObject.UNIQUE_NAME, SystemdObject.OBJECT_PATH);
 
                     dbus_interface.reboot (true);
                     return;
@@ -363,9 +404,7 @@
                 }
 
                 try {
-                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM,
-                    ConsoleKitObject.UNIQUE_NAME,
-                    ConsoleKitObject.OBJECT_PATH);
+                    ConsoleKitObject dbus_interface = Bus.get_proxy_sync (BusType.SYSTEM, ConsoleKitObject.UNIQUE_NAME, ConsoleKitObject.OBJECT_PATH);
 
                     dbus_interface.restart ();
                 } catch (IOError err) {
@@ -377,7 +416,7 @@
         static void register_plugin () {
         DataSink.PluginRegistry.get_default ().register_plugin (typeof (SystemManagementPlugin),
                                                                 "System Management",
-                                                                _("Suspend, hibernate, restart or shutdown your computer."),
+                                                                _("Lock the session or Log Out from it. Suspend, hibernate, restart or shutdown your computer."),
                                                                 "system-restart",
                                                                 register_plugin,
                                                                 DBusService.get_default ().service_is_available (SystemdObject.UNIQUE_NAME) ||
@@ -393,6 +432,8 @@
 
         construct {
             actions = new Gee.LinkedList<SystemAction> ();
+            actions.add (new LockAction ());
+            actions.add (new LogOutAction ());
             actions.add (new SuspendAction ());
             actions.add (new HibernateAction ());
             actions.add (new ShutdownAction ());
 
=== modified file 'po/slingshot.pot'
--- po/slingshot.pot	2017-01-24 20:34:49 +0000
+++ po/slingshot.pot	2017-01-31 18:58:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 21:34+0100\n"
+"POT-Creation-Date: 2017-01-31 19:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,18 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../src/Slingshot.vala:31
+msgid "Slingshot"
+msgstr ""
+
+#: ../src/Slingshot.vala:32
+msgid "The app-menu indicator"
+msgstr ""
+
+#: ../src/Slingshot.vala:67 ../src/Widgets/SearchView.vala:222
+msgid "Applications"
+msgstr ""
+
 #: ../src/SlingshotView.vala:161
 msgid "View as Grid"
 msgstr ""
@@ -37,6 +49,14 @@
 msgid "Add to _Dock"
 msgstr ""
 
+#: ../src/Widgets/CategoryView.vala:27
+msgid "All Applications"
+msgstr ""
+
+#: ../src/Widgets/CategoryView.vala:28
+msgid "Create a new Filter"
+msgstr ""
+
 #: ../src/Widgets/SearchView.vala:110
 msgid "Try changing search terms."
 msgstr ""
@@ -49,10 +69,6 @@
 msgid "Text"
 msgstr ""
 
-#: ../src/Widgets/SearchView.vala:222 ../src/Slingshot.vala:67
-msgid "Applications"
-msgstr ""
-
 #: ../src/Widgets/SearchView.vala:225
 msgid "Files"
 msgstr ""
@@ -85,22 +101,6 @@
 msgid "Other"
 msgstr ""
 
-#: ../src/Widgets/CategoryView.vala:27
-msgid "All Applications"
-msgstr ""
-
-#: ../src/Widgets/CategoryView.vala:28
-msgid "Create a new Filter"
-msgstr ""
-
-#: ../src/Slingshot.vala:31
-msgid "Slingshot"
-msgstr ""
-
-#: ../src/Slingshot.vala:32
-msgid "The app-menu indicator"
-msgstr ""
-
 #: ../src/Backend/App.vala:91
 msgid "Run this command…"
 msgstr ""
@@ -145,106 +145,124 @@
 msgid "Copy selection to clipboard"
 msgstr ""
 
-#: ../lib/synapse-plugins/link-plugin.vala:46
-msgid "Open %s in default web browser"
-msgstr ""
-
-#: ../lib/synapse-plugins/link-plugin.vala:51
-msgid "Open %s in %s"
-msgstr ""
-
-#: ../lib/synapse-plugins/link-plugin.vala:57
-msgid "Open this link in default browser"
-msgstr ""
-
-#: ../lib/synapse-plugins/link-plugin.vala:79
-msgid "Link"
-msgstr ""
-
-#: ../lib/synapse-plugins/link-plugin.vala:80
-msgid "Open link in default browser"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:89
+#: ../lib/synapse-plugins/desktop-file-plugin.vala:127
+msgid "Search for and run applications on your computer."
+msgstr ""
+
+#: ../lib/synapse-plugins/desktop-file-plugin.vala:332
+msgid "Open with %s"
+msgstr ""
+
+#: ../lib/synapse-plugins/desktop-file-plugin.vala:334
+msgid "Opens current selection using %s"
+msgstr ""
+
+#: ../lib/synapse-plugins/calculator-plugin.vala:51
+msgid "Calculator"
+msgstr ""
+
+#: ../lib/synapse-plugins/calculator-plugin.vala:52
+msgid "Calculate basic expressions."
+msgstr ""
+
+#: ../lib/synapse-plugins/calculator-plugin.vala:56
+msgid "bc is not installed"
+msgstr ""
+
+#: ../lib/synapse-plugins/command-plugin.vala:47
+msgid "Execute '%s'"
+msgstr ""
+
+#: ../lib/synapse-plugins/command-plugin.vala:47
+msgid "Run command"
+msgstr ""
+
+#: ../lib/synapse-plugins/command-plugin.vala:63
+msgid "Find and execute arbitrary commands."
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:107
+msgid "Lock"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:108
+msgid "Lock this device"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:134
+msgid "Log Out"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:135
+msgid "Close all open applications and quit"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:161
 msgid "Suspend"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:90
+#: ../lib/synapse-plugins/system-managment.vala:162
 msgid "Put your computer into suspend mode"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:168
+#: ../lib/synapse-plugins/system-managment.vala:232
 msgid "Hibernate"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:169
+#: ../lib/synapse-plugins/system-managment.vala:233
 msgid "Put your computer into hibernation mode"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:246
+#: ../lib/synapse-plugins/system-managment.vala:302
 msgid "Shut Down"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:247
+#: ../lib/synapse-plugins/system-managment.vala:303
 msgid "Turn your computer off"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:312
+#: ../lib/synapse-plugins/system-managment.vala:360
 msgid "Restart"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:313
+#: ../lib/synapse-plugins/system-managment.vala:361
 msgid "Restart your computer"
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:379
-msgid "Suspend, hibernate, restart or shutdown your computer."
+#: ../lib/synapse-plugins/system-managment.vala:419
+msgid ""
+"Lock the session or Log Out from it. Suspend, hibernate, restart or shutdown "
+"your computer."
 msgstr ""
 
-#: ../lib/synapse-plugins/system-managment.vala:384
+#: ../lib/synapse-plugins/system-managment.vala:424
 msgid "ConsoleKit wasn't found"
 msgstr ""
 
-#: ../lib/synapse-plugins/calculator-plugin.vala:50
-msgid "Calculator"
-msgstr ""
-
-#: ../lib/synapse-plugins/calculator-plugin.vala:51
-msgid "Calculate basic expressions."
-msgstr ""
-
-#: ../lib/synapse-plugins/calculator-plugin.vala:55
-msgid "bc is not installed"
-msgstr ""
-
-#: ../lib/synapse-plugins/desktop-file-plugin.vala:126
-msgid "Search for and run applications on your computer."
-msgstr ""
-
-#: ../lib/synapse-plugins/desktop-file-plugin.vala:331
-msgid "Open with %s"
-msgstr ""
-
-#: ../lib/synapse-plugins/desktop-file-plugin.vala:333
-msgid "Opens current selection using %s"
-msgstr ""
-
-#: ../lib/synapse-plugins/switchboard-plugin.vala:45
+#: ../lib/synapse-plugins/link-plugin.vala:47
+msgid "Open %s in default web browser"
+msgstr ""
+
+#: ../lib/synapse-plugins/link-plugin.vala:52
+msgid "Open %s in %s"
+msgstr ""
+
+#: ../lib/synapse-plugins/link-plugin.vala:58
+msgid "Open this link in default browser"
+msgstr ""
+
+#: ../lib/synapse-plugins/link-plugin.vala:80
+msgid "Link"
+msgstr ""
+
+#: ../lib/synapse-plugins/link-plugin.vala:81
+msgid "Open link in default browser"
+msgstr ""
+
+#: ../lib/synapse-plugins/switchboard-plugin.vala:46
 msgid "Open %s settings"
 msgstr ""
 
-#: ../lib/synapse-plugins/switchboard-plugin.vala:61
+#: ../lib/synapse-plugins/switchboard-plugin.vala:62
 msgid "Find switchboard plugs and open them."
 msgstr ""
-
-#: ../lib/synapse-plugins/command-plugin.vala:46
-msgid "Execute '%s'"
-msgstr ""
-
-#: ../lib/synapse-plugins/command-plugin.vala:46
-msgid "Run command"
-msgstr ""
-
-#: ../lib/synapse-plugins/command-plugin.vala:62
-msgid "Find and execute arbitrary commands."
-msgstr ""