Merge lp:~tintou/pantheon-greeter/greeter-no-pixbuf into lp:~elementary-pantheon/pantheon-greeter/trunk

[Corentin Noël]

Use widgets instead of pixbufs

[lp:~tintou/pantheon-greeter/greeter-no-pixbuf]

511. By Corentin Noël on 2016-12-17

Use widgets instead of pixbufs

=== modified file 'src/Avatar.vala'
--- src/Avatar.vala	2016-09-25 22:28:27 +0000
+++ src/Avatar.vala	2016-12-17 22:20:38 +0000
@@ -28,8 +28,13 @@
     construct {
         var container_widget = (Gtk.Container)this.get_widget ();
 
-        var avatar = new Granite.Widgets.Avatar ();
-        avatar.pixbuf = user.avatar;
+        var path = user.avatar_path;
+        Granite.Widgets.Avatar avatar;
+        if (path != null) {
+            avatar = new Granite.Widgets.Avatar.from_file (path, 96);
+        } else {
+            avatar = new Granite.Widgets.Avatar.with_default_icon (96);
+        }
 
         container_widget.add (avatar);
 

=== modified file 'src/LoginBox.vala'
--- src/LoginBox.vala	2016-10-26 21:05:40 +0000
+++ src/LoginBox.vala	2016-12-17 22:20:38 +0000
@@ -20,7 +20,6 @@
 */
 
 public class LoginBox : GtkClutter.Actor, LoginMask {
-    private Avatar avatar;
     private CredentialsAreaActor credentials_actor;
 
     bool _selected = false;
@@ -74,13 +73,8 @@
             start_login ();
         });
 
-        if (user.avatar_ready) {
-            create_avatar ();
-        } else {
-            user.avatar_updated.connect (() => {
-                create_avatar ();
-            });
-        }
+        var avatar = new Avatar (user);
+        add_child (avatar);
     }
 
     /**
@@ -92,11 +86,6 @@
         PantheonGreeter.login_gateway.login_with_mask (this, user.is_guest);
     }
 
-    private void create_avatar () {
-        avatar = new Avatar (user);
-        add_child (avatar);
-    }
-
     public void pass_focus () {
         // We can't start the login when the login option isn't
         // providing a name without user interaction.

=== modified file 'src/LoginOptions/LoginOption.vala'
--- src/LoginOptions/LoginOption.vala	2016-09-25 14:23:22 +0000
+++ src/LoginOptions/LoginOption.vala	2016-12-17 22:20:38 +0000
@@ -19,32 +19,10 @@
 */
 
 public abstract class LoginOption : Object {
-
-    protected static Gdk.Pixbuf default_avatar;
-
-
-    private Gdk.Pixbuf _avatar;
-    public Gdk.Pixbuf avatar {
-        get {
-            lock (_avatar) return _avatar;
-        }
-        protected set {
-            lock (_avatar) _avatar = value;
-        }
-    }
-    /**
-     * True if and only if the avatar of this login option is from now on
-     * considered constant and you can safely ignore the avatar_updated
-     * signal.
-     */
-    public bool avatar_ready { get; protected set; default = true; }
-    public signal void avatar_updated ();
-
     public int index { get; private set; }
 
     protected LoginOption (int index) {
         this.index = index;
-        _avatar = default_avatar;
     }
 
     public string get_markup () {
@@ -52,28 +30,21 @@
     }
 
     /**
-     * Loads the default avatar and is called once at startup.
-     */
-    public static void load_default_avatar () {
-        try {
-            default_avatar = Gtk.IconTheme.get_default ().
-                load_icon ("avatar-default", 96, 0);
-        } catch {
-            warning ("Couldn't load default wallpaper");
-        }
-    }
-
-    /**
-     * Each LoginOption can load their own avatar-image here.
-     */
-    public virtual async void load_avatar () { }
-
-    /**
      * The name of this login how it shall be presented to the user.
      */
     public abstract string display_name { get; }
 
     /**
+     * Path to the avatar of this user or null
+     * in case he has none.
+     */
+    public virtual string? avatar_path {
+        get {
+            return null;
+        }
+    }
+
+    /**
      * Path to the background-image of this user or ""
      * in case he has none.
      */

=== modified file 'src/LoginOptions/UserLogin.vala'
--- src/LoginOptions/UserLogin.vala	2016-09-25 14:23:22 +0000
+++ src/LoginOptions/UserLogin.vala	2016-12-17 22:20:38 +0000
@@ -25,7 +25,12 @@
     public UserLogin (int index, LightDM.User user) {
         base (index);
         this.lightdm_user = user;
-        avatar_ready = false;
+    }
+
+    public override string? avatar_path {
+        get {
+            return lightdm_user.image;
+        }
     }
 
     public override string background {
@@ -57,20 +62,4 @@
             return lightdm_user.session;
         }
     }
-
-    public override async void load_avatar () {
-        try {
-            File file = File.new_for_path (lightdm_user.image);
-            InputStream stream = yield file.read_async (GLib.Priority.DEFAULT);
-            var buf = new Gdk.Pixbuf.from_stream_at_scale (stream, 96, 96, true);
-            avatar = buf;
-        } catch (Error e) {
-            message ("Using default-avatar instead of " + lightdm_user.image);
-        }
-        Idle.add (() => {
-            avatar_ready = true;
-            avatar_updated ();
-            return false;
-        });
-    }
 }

=== modified file 'src/PantheonGreeter.vala'
--- src/PantheonGreeter.vala	2016-06-18 22:54:03 +0000
+++ src/PantheonGreeter.vala	2016-12-17 22:20:38 +0000
@@ -109,9 +109,6 @@
             warning (e.message);
         }
 
-        message ("Loading default-avatar...");
-        LoginOption.load_default_avatar ();
-
         message ("Building UI...");
 
         clutter = new GtkClutter.Embed ();

=== modified file 'src/UserList.vala'
--- src/UserList.vala	2016-02-25 21:46:48 +0000
+++ src/UserList.vala	2016-12-17 22:20:38 +0000
@@ -76,10 +76,6 @@
             index++;
         }
         size = index;
-
-        foreach (LoginOption user in users) {
-            user.load_avatar.begin ();
-        }
     }
 
     public LoginOption get_user (int i) {