Merge lp:~robert-ancell/unity-greeter/session-badges into lp:unity-greeter

[Robert Ancell]

[Michael Terry (mterry)]

Two things:
1) As you know, Otto just gave us a new generic icon to use instead of the cog.

2) Do the following: Change a user's session to something like KDE. Then press the up arrow key. The name/cog will scroll as expected, but the cog image will change as it scrolls away back to the default instead of KDE. It should stay as KDE as it scrolls off.

Also, this is just a note for us that doesn't need to be fixed in this branch, but test-mode users should have different default sessions. Right now they all use the default.

review: Needs Fixing

[Michael Terry (mterry)]

I'm fixing the 'test users should have different default sessions' issue in my session-change-animation branch, FYI.

[lp:~robert-ancell/unity-greeter/session-badges]

313. By Robert Ancell on 2012-02-20

Add unknown badge, draw correct badge when scrolling

[Robert Ancell (robert-ancell)]

Updated, please re-review.

It seems we should make the session a parameter of the UserEntry class, but I'll leave the code as-is for this patch.

[Robert Ancell (robert-ancell)]

review: Needs Resubmitting

[Michael Terry (mterry)]

Better! Now I'm noticing that the session icon bounces at the end of the scroll. It doesn't smoothly glide into place like trunk does. Approved if you fix that.

review: Needs Fixing

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-02-16 01:45:10 +0000
+++ data/Makefile.am	2012-02-20 23:16:19 +0000
@@ -7,9 +7,13 @@
 	a11y.svg \
 	arrow.png \
 	cof.png \
-	cog.png \
 	logo.png \
-	message.png
+	message.png \
+	gnome_badge.png \
+	kde_badge.png \
+	recovery_console_badge.png \
+	ubuntu_badge.png \
+	unknown_badge.png
 
 @GSETTINGS_RULES@
 gsettings_SCHEMAS = com.canonical.unity-greeter.gschema.xml

=== removed file 'data/cog.png'
Binary files data/cog.png	2011-08-24 03:15:08 +0000 and data/cog.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/gnome_badge.png'
Binary files data/gnome_badge.png	1970-01-01 00:00:00 +0000 and data/gnome_badge.png	2012-02-20 23:16:19 +0000 differ
=== added file 'data/kde_badge.png'
Binary files data/kde_badge.png	1970-01-01 00:00:00 +0000 and data/kde_badge.png	2012-02-20 23:16:19 +0000 differ
=== added file 'data/recovery_console_badge.png'
Binary files data/recovery_console_badge.png	1970-01-01 00:00:00 +0000 and data/recovery_console_badge.png	2012-02-20 23:16:19 +0000 differ
=== added file 'data/ubuntu_badge.png'
Binary files data/ubuntu_badge.png	1970-01-01 00:00:00 +0000 and data/ubuntu_badge.png	2012-02-20 23:16:19 +0000 differ
=== added file 'data/unknown_badge.png'
Binary files data/unknown_badge.png	1970-01-01 00:00:00 +0000 and data/unknown_badge.png	2012-02-20 23:16:19 +0000 differ
=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-02-16 01:45:10 +0000
+++ src/user-list.vala	2012-02-20 23:16:19 +0000
@@ -74,9 +74,15 @@
     private DashEntry prompt_entry;
     private DashButton login_button;
     private Fadable prompt_widget_to_show;
-    private Gtk.Button options_button;
+    private Gtk.Button session_button;
+    private Gtk.Image session_image;
     private Menu options_menu;
-    private Gdk.Pixbuf options_pixbuf;
+    private Gdk.Pixbuf unknown_badge_pixbuf;
+    private Gdk.Pixbuf gnome_badge_pixbuf;
+    private Gdk.Pixbuf kde_badge_pixbuf;
+    private Gdk.Pixbuf recovery_console_badge_pixbuf;
+    private Gdk.Pixbuf ubuntu_badge_pixbuf;
+
     unowned GLib.SList<SessionMenuItem> session_group = null;
 
     private bool complete = false;
@@ -138,6 +144,32 @@
         }
     }
 
+    private Gdk.Pixbuf? last_session_badge = null;
+    private Gdk.Pixbuf? session_badge
+    {
+        get
+        {
+            switch (session)
+            {
+            case "ubuntu":
+            case "ubuntu-2d":
+            /* NOTE: For legacy reasons 'gnome' is actually Ubuntu */
+            case "gnome":
+                return ubuntu_badge_pixbuf;
+            case "gnome-classic":
+            case "gnome-fallback":
+            case "gnome-shell":
+                return gnome_badge_pixbuf;
+            case "kde":
+                return kde_badge_pixbuf;
+            case "xterm":
+                return recovery_console_badge_pixbuf;
+            default:
+                return unknown_badge_pixbuf;
+            }        
+        }
+    }
+
     public UserList (Background bg, MenuBar mb)
     {
         background = bg;
@@ -174,23 +206,27 @@
 
         try
         {
-            options_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "cog.png", null));
+            unknown_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "unknown_badge.png", null));
+            gnome_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "gnome_badge.png"));
+            kde_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "kde_badge.png"));
+            recovery_console_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "recovery_console_badge.png"));
+            ubuntu_badge_pixbuf = new Gdk.Pixbuf.from_file (Path.build_filename (Config.PKGDATADIR, "ubuntu_badge.png"));
         }
         catch (Error e)
         {
-            debug ("Error loading cog image: %s", e.message);
+            debug ("Error loading image: %s", e.message);
         }
 
-        options_button = new Gtk.Button ();
-        options_button.focus_on_click = false;
-        options_button.get_accessible ().set_name (_("Session Options"));
-        var image = new Gtk.Image.from_pixbuf (options_pixbuf);
-        image.show ();
-        options_button.relief = Gtk.ReliefStyle.NONE;
-        options_button.add (image);
-        options_button.clicked.connect (options_button_clicked_cb);
-        options_button.show ();
-        add_with_class (options_button);
+        session_button = new Gtk.Button ();
+        session_button.focus_on_click = false;
+        session_button.get_accessible ().set_name (_("Session Options"));
+        session_image = new Gtk.Image.from_pixbuf (session_badge);
+        session_image.show ();
+        session_button.relief = Gtk.ReliefStyle.NONE;
+        session_button.add (session_image);
+        session_button.clicked.connect (session_button_clicked_cb);
+        session_button.show ();
+        add_with_class (session_button);
 
         options_menu = new Menu (background);
         UnityGreeter.add_style_class (options_menu);
@@ -344,9 +380,18 @@
         item.session_name = name;
         item.label = label;
         item.show ();
+        item.toggled.connect (session_changed_cb);
         options_menu.append (item);
         session_group = (GLib.SList<SessionMenuItem>) item.get_group ();
     }
+    
+    private void session_changed_cb (Gtk.CheckMenuItem item)
+    {
+        if (!item.active)
+            return;
+            
+        session_image.set_from_pixbuf (session_badge);
+    }
 
     private UserEntry? find_entry (string name)
     {
@@ -425,7 +470,7 @@
     private void options_menu_position_cb (Gtk.Menu menu, out int x, out int y, out bool push_in)
     {
         Gtk.Allocation button_allocation;
-        options_button.get_allocation (out button_allocation);
+        session_button.get_allocation (out button_allocation);
 
         get_window ().get_origin (out x, out y);
         x += button_allocation.x;
@@ -433,7 +478,7 @@
         push_in = true;
     }
 
-    private void options_button_clicked_cb ()
+    private void session_button_clicked_cb ()
     {
         options_menu.popup (null, null, options_menu_position_cb, 0, Gtk.get_current_event_time ());
     }
@@ -472,12 +517,14 @@
             prompt_widget_to_show.fade_in ();
             prompt_widget_to_show = null;
         }
-        options_button.show ();
+        session_button.show ();
         user_displayed ();
     }
 
     private void select_entry (UserEntry entry, double direction)
     {
+        last_session_badge = session_badge;
+
         if (!get_realized ())
         {
             /* Just note it for the future if we haven't been realized yet */
@@ -516,7 +563,7 @@
 
                 prompt_entry.hide ();
                 login_button.hide ();
-                options_button.hide ();
+                session_button.hide ();
             }
 
             scroll_target_location = new_target;
@@ -570,10 +617,10 @@
         child_allocation.y = allocation.y + box_y + grid_size / 4;
         child_allocation.width = grid_size;
         child_allocation.height = grid_size;
-        options_button.size_allocate (child_allocation);
+        session_button.size_allocate (child_allocation);
     }
 
-    private void draw_entry (Cairo.Context c, UserEntry entry, double alpha = 0.5, bool in_box = false)
+    private void draw_entry (Cairo.Context c, UserEntry entry, double alpha = 0.5, bool in_box = false, Gdk.Pixbuf? badge = null)
     {
         c.save ();
         
@@ -626,20 +673,19 @@
         c.restore ();
 
         /* Now draw options button if we're animating in the box */
-        if (in_box && scroll_timer.is_running && options_pixbuf != null)
+        if (in_box && scroll_timer.is_running && badge != null)
         {
             c.save ();
-            var xpadding = (grid_size - options_pixbuf.width) / 2;
-            var ypadding = (grid_size - options_pixbuf.height) / 2;
+            var xpadding = (grid_size - badge.width) / 2;
+            var ypadding = (grid_size - badge.height) / 2;
             c.translate (box_width * grid_size - grid_size - grid_size / 4 + xpadding, grid_size / 4 - ypadding - border);
-            Gdk.cairo_set_source_pixbuf (c, options_pixbuf, 0, 0);
+            Gdk.cairo_set_source_pixbuf (c, badge, 0, 0);
             c.paint ();
             c.restore ();
         }
     }
 
-    private void draw_entry_at_position (Cairo.Context c, UserEntry entry,
-                                         double position, bool in_box = false)
+    private void draw_entry_at_position (Cairo.Context c, UserEntry entry, double position, bool in_box = false, Gdk.Pixbuf? badge = null)
     {
         c.save ();
         c.translate (0, position * grid_size);
@@ -648,7 +694,7 @@
             alpha = 1.0 + position / (n_above + 1);
         else
             alpha = 1.0 - (position - 2) / (n_below + 1);
-        draw_entry (c, entry, alpha, in_box);
+        draw_entry (c, entry, alpha, in_box, badge);
         c.restore ();
     }
 
@@ -688,10 +734,14 @@
                 c.rectangle (0, border * 2, box_width * grid_size, box_height * grid_size - border * 5);
                 c.clip ();
 
+                var badge = last_session_badge;
+                if (entry == selected_entry)
+                    badge = session_badge;
+
                 if (position <= 0) /* top of box, normal pace */
-                    draw_entry_at_position (c, entry, position, true);
+                    draw_entry_at_position (c, entry, position, true, badge);
                 else /* bottom of box; pace must put across bottom halfway through animation */
-                    draw_entry_at_position (c, entry, position * box_height * 2, true);
+                    draw_entry_at_position (c, entry, position * box_height * 2, true, badge);
 
                 c.restore ();
             }
@@ -726,7 +776,7 @@
             draw_entry (c, selected_entry, 1.0, true);
             c.restore ();
 
-            c.restore();
+            c.restore ();
         }
 
         if ((error != null || message != null) && !scroll_timer.is_running)