Merge lp:~robert-ancell/unity-greeter/retry-button-on-failed-authentication into lp:unity-greeter

[Robert Ancell]

Show retry button if authentication completes without a prompt but is not successful. Test with the "No Password" and "Locked Account" users.

[Michael Terry (mterry)]

I guess it's fine? The No Password user just stays at "Logging in..." and the button never re-appears to display "Retry". But trunk does that too...

It works on the Locked user though.

review: Approve

=== modified file 'src/dash-button.vala'
--- src/dash-button.vala	2012-02-21 17:31:59 +0000
+++ src/dash-button.vala	2012-03-09 05:18:17 +0000
@@ -19,16 +19,22 @@
 
 public class DashButton : Gtk.Button, Fadable
 {
-    public string text {get; construct; default = "";}
     protected FadeTracker fade_tracker {get; protected set;}
+    private Gtk.Label text_label;
+
+    private string _text = "";
+    public string text
+    {
+        get { return _text; }
+        set
+        {
+            _text = value;
+            text_label.set_markup ("<span font_size=\"large\">%s</span>".printf (value));
+        }
+    }
 
     public DashButton (string text)
     {
-        Object (text: text);
-    }
-
-    construct
-    {
         fade_tracker = new FadeTracker (this);
 
         var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
@@ -40,11 +46,12 @@
         hbox.add (label);
 
         // add text
-        label = new Gtk.Label ("<span font_size=\"large\">%s</span>".printf (text));
-        label.use_markup = true;
-        label.hexpand = true;
-        label.halign = Gtk.Align.CENTER;
-        hbox.add (label);
+        text_label = new Gtk.Label ("");
+        text_label.use_markup = true;
+        text_label.hexpand = true;
+        text_label.halign = Gtk.Align.CENTER;
+        hbox.add (text_label);
+        this.text = text;
 
         // add chevron
         var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow_right.png", null));
 
=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-03-08 03:15:53 +0000
+++ src/unity-greeter.vala	2012-03-09 05:18:17 +0000
@@ -425,7 +425,7 @@
             else
             {
                 user_list.set_error (_("Failed to authenticate"));
-                user_list.show_authenticated ();
+                user_list.show_authenticated (false);
             }
         }
     }
 
=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-03-09 04:51:01 +0000
+++ src/user-list.vala	2012-03-09 05:18:17 +0000
@@ -179,7 +179,7 @@
         prompt_entry.activate.connect (prompt_entry_activate_cb);
         add_with_class (prompt_entry);
 
-        login_button = new DashButton (_("Log In")); /* 'Log In' here is the button for logging in. */
+        login_button = new DashButton ("");
         login_button.clicked.connect (login_button_clicked_cb);
         add_with_class (login_button);
 
@@ -313,17 +313,27 @@
         redraw_login_box ();
     }
 
-    public void show_authenticated ()
+    public void show_authenticated (bool successful = true)
     {
         prompt_entry.hide ();
         login_button.hide ();
         message = "";
+        var accessible = login_button.get_accessible ();
+        if (successful)
+        {
+            accessible.set_name (_("Login as %s").printf (selected_entry.layout.get_text ()));
+            /* 'Log In' here is the button for logging in. */
+            login_button.text = _("Log In");
+        }
+        else
+        {
+            accessible.set_name (_("Retry").printf (selected_entry.layout.get_text ()));
+            login_button.text = _("Retry");
+        }
         if (mode == Mode.SCROLLING)
             prompt_widget_to_show = login_button;
         else
             login_button.show ();
-        var accessible = login_button.get_accessible ();
-        accessible.set_name (_("Login as %s").printf (selected_entry.layout.get_text ()));
         login_button.grab_focus ();
         redraw_login_box ();
     }