Merge lp:~donadigo/wingpanel-indicator-session/switch-to-user into lp:~wingpanel-devs/wingpanel-indicator-session/trunk

[Adam Bieńkowski]

* Fix bug #1508584: "Switch to another user".
* Remove warnings.

Fix bug #1508584: "Switch to another user".

Switch to user is now implemented and I removed a --save-temps warning from CMake.

NOTE: switch_to_guest currently does not work because of Greeter not handling it yet.

[lp:~donadigo/wingpanel-indicator-session/switch-to-user]

67. By Adam Bieńkowski on 2016-02-22

Switch to guest is now working properly

[Adam Bieńkowski (donadigo)]

Updated.

[lp:~donadigo/wingpanel-indicator-session/switch-to-user]

68. By Adam Bieńkowski on 2016-02-22

Set the has_guest variable in construct

[Felipe Escoto (philip.scott)]

Alright, so buttons do work! But two things...

Buttons should maybe be non-focusable (Looks very ugly when they're either blue or gray depending on their focus)

there is also a lot of white space around each of the userboxes, if you could get them closer to how the battery or sound plug look it would be awesome!.

Im glad you were able to get switching to other users working :)

review: Needs Fixing

[lp:~donadigo/wingpanel-indicator-session/switch-to-user]

69. By Adam Bieńkowski on 2016-04-09

Remove button class

[Adam Bieńkowski (donadigo)]

Updated.

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2015-04-26 18:48:58 +0000
+++ cmake/ValaPrecompile.cmake	2016-04-09 15:57:33 +0000
@@ -229,7 +229,6 @@
         ${vala_pkg_opts} 
         ${ARGS_OPTIONS} 
         "-g"
-        "--save-temps"
         ${in_files} 
         ${custom_vapi_arguments}
     COMMAND

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-01-15 17:52:30 +0000
+++ src/CMakeLists.txt	2016-04-09 15:57:33 +0000
@@ -15,6 +15,7 @@
 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
   Indicator.vala
   Widgets/UserBox.vala
+  Widgets/UserListBox.vala
   Widgets/EndSessionDialog.vala
   Services/User.vala
   Services/UserManager.vala

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-01-19 03:11:06 +0000
+++ src/Indicator.vala	2016-04-09 15:57:33 +0000
@@ -67,7 +67,7 @@
                 main_grid.add (manager.user_grid);
 
                 if (manager.has_guest) {
-                    main_grid.add (manager.guest (false));
+                    manager.user_grid.add_guest (manager.guest (false));
                 }
 
                 main_grid.add (new Wingpanel.Widgets.Separator ());

=== modified file 'src/Services/DbusInterfaces.vala'
--- src/Services/DbusInterfaces.vala	2016-01-15 17:52:30 +0000
+++ src/Services/DbusInterfaces.vala	2016-04-09 15:57:33 +0000
@@ -48,8 +48,8 @@
 [DBus (name = "org.freedesktop.DisplayManager.Seat")]
 interface SeatInterface : Object {
     //public abstract void SwitchToGreeter () throws IOError;
-    //public abstract void SwitchToGuest (string session_name) throws IOError;
-    //public abstract void SwitchToUser (string username, string session_name) throws IOError;
+    public abstract void switch_to_guest (string session_name) throws IOError;
+    public abstract void switch_to_user (string username, string session_name) throws IOError;
 }
 
 /* for User.vala, to get the user properties */

=== modified file 'src/Services/UserManager.vala'
--- src/Services/UserManager.vala	2016-01-15 17:52:30 +0000
+++ src/Services/UserManager.vala	2016-04-09 15:57:33 +0000
@@ -22,7 +22,7 @@
     private AccountsInterface accounts_interface;
     private PropertiesInterface state_properties;
 
-    public Gtk.Grid user_grid;
+    public Session.Widgets.UserListBox user_grid;
     public Session.Widgets.Userbox current_user;
     
     public bool has_guest {public get; private set; default = false;}
@@ -32,12 +32,11 @@
     }
 
     private void init () {
-        user_grid = new Gtk.Grid ();
-        user_grid.set_orientation (Gtk.Orientation.VERTICAL);
+        user_grid = new Session.Widgets.UserListBox ();
 
         try {
             accounts_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.Accounts", "/org/freedesktop/Accounts", DBusProxyFlags.NONE);
-            state_properties = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.DisplayManager", "/org/freedesktop/DisplayManager/Seat0", DBusProxyFlags.NONE);
+            state_properties = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.DisplayManager", Environment.get_variable ("XDG_SEAT_PATH"), DBusProxyFlags.NONE);
             has_guest = state_properties.get ("org.freedesktop.DisplayManager.Seat", "HasGuestAccount").get_boolean ();
 
             connect_signals ();
@@ -94,7 +93,7 @@
     }
 
     public Session.Widgets.Userbox guest (bool logged_in) {
-        var userbox = new Session.Widgets.Userbox.from_data (_("Guest"), logged_in);
+        var userbox = new Session.Widgets.Userbox.from_data (_("Guest"), logged_in, true);
         userbox.visible = true;
 
         return userbox;

=== modified file 'src/Widgets/UserBox.vala'
--- src/Widgets/UserBox.vala	2016-02-25 02:11:40 +0000
+++ src/Widgets/UserBox.vala	2016-04-09 15:57:33 +0000
@@ -17,12 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-public class Session.Widgets.Userbox : Gtk.Grid {
+public class Session.Widgets.Userbox : Gtk.ListBoxRow {
     private const string LOGGED_IN = _("Logged in");
     private const string LOGGED_OFF = _("Logged out");
     private const int ICON_SIZE = 48;
 
     public Session.Services.User user { public get; private set; }
+    public bool is_guest = false;
 
     private Granite.Widgets.Avatar avatar;
     private Gtk.Label fullname_label;
@@ -35,13 +36,16 @@
         user.update_properties ();
     }
 
-    public Userbox.from_data (string fullname, bool logged_in) {
+    public Userbox.from_data (string fullname, bool logged_in, bool is_guest = false) {
+        this.is_guest = is_guest;
         build_ui (false);
         fullname_label.label = "<b>" + fullname + "</b>";
         update_state (logged_in);
     }
 
     private void build_ui (bool load_icon = true) {
+        var grid = new Gtk.Grid ();
+
         fullname_label = new Gtk.Label ("");
         fullname_label.use_markup = true;
         fullname_label.valign = Gtk.Align.END;
@@ -61,9 +65,10 @@
         avatar.margin_bottom = 3;
         avatar.margin_start = 6;
 
-        this.attach (avatar, 0, 0, 3, 3);
-        this.attach (fullname_label, 3, 0, 2, 1);
-        this.attach (status_label, 3, 1, 2, 1);
+        grid.attach (avatar, 0, 0, 3, 3);
+        grid.attach (fullname_label, 3, 0, 2, 1);
+        grid.attach (status_label, 3, 1, 2, 1);
+        this.add (grid);
     }
 
     public void update (string? fullname, string icon) {

=== added file 'src/Widgets/UserListBox.vala'
--- src/Widgets/UserListBox.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/UserListBox.vala	2016-04-09 15:57:33 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+ public class Session.Widgets.UserListBox : Gtk.ListBox {
+    private SeatInterface? seat = null;
+    private string session_path;
+    private bool has_guest;
+
+    public UserListBox () {
+        has_guest = false;
+        session_path = Environment.get_variable ("XDG_SESSION_PATH");
+
+        try {
+            seat = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.DisplayManager", Environment.get_variable ("XDG_SEAT_PATH"), DBusProxyFlags.NONE);
+        } catch (IOError e) {
+            stderr.printf ("DisplayManager.Seat error: %s\n", e.message);
+        }
+
+        this.set_activate_on_single_click (true);
+    }
+
+    public void add_guest (Userbox user) {
+        if (!has_guest) {
+            this.add (user);
+            has_guest = true;
+        }
+    }
+
+    public override void row_activated (Gtk.ListBoxRow row) {
+        var userbox = (Userbox)row;
+        if (userbox == null 
+            || seat == null
+            || session_path == "") {
+            return;
+        }
+
+        try {
+            if (userbox.is_guest) {
+                seat.switch_to_guest ("");
+            } else {
+                seat.switch_to_user (userbox.user.user_name, session_path);
+            }            
+        } catch (IOError e) {
+            stderr.printf ("DisplayManager.Seat error: %s\n", e.message);
+        }
+    }
+ }
\ No newline at end of file