Merge lp:~mterry/unity-greeter/multi-prompts into lp:unity-greeter

[Michael Terry]

Support multiple prompts at the same time from lightdm. Doesn't look great yet, because we don't push other names in the scroll list out of the way when the dash box gets larger. But that isn't a regression, and will be fixed in a future branch.

To test, look at the "Two Prompts" user in test mode.

[Ken VanDine (ken-vandine)]

Looks good!

review: Approve

[Robert Ancell (robert-ancell)]

Merged now. Since Ken had checked it I was happy for you to push this, I didn't notice that the merge request wasn't set to approved. In the future just merge when getting one good review.

[Michael Terry (mterry)]

Oh whoops. This branch was co-dependent on https://code.launchpad.net/~mterry/lightdm/multi-prompt/+merge/103321 which didn't land. So it shouldn't have been merged. I'll unmerge it.

I should have left a comment here to that effect.

[Michael Terry (mterry)]

Actually, most of this branch is obsolete now with maza. A lot of the fixes got put there. The only other change was the final merging of responses, which will need a new branch anyway.

=== modified file 'src/fadable.vala'
--- src/fadable.vala	2012-04-24 19:47:29 +0000
+++ src/fadable.vala	2012-04-24 19:47:29 +0000
@@ -59,7 +59,6 @@
             alpha = progress;
             if (progress == 1.0)
             {
-                widget.grab_focus ();
                 done ();
             }
         }

=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2012-04-24 19:47:29 +0000
+++ src/prompt-box.vala	2012-04-24 19:47:29 +0000
@@ -208,11 +208,18 @@
 
     private void foreach_prompt_widget (Gtk.Callback cb)
     {
-        foreach (var w in box_grid.get_children ())
+        var prompt_widgets = new List<Gtk.Widget> ();
+
+        var i = 0;
+        Gtk.Widget c;
+        while ((c = box_grid.get_child_at (COL_ENTRIES_START, ROW_ENTRIES_START + i)) != null)
         {
-            if (w.get_data<Gtk.Widget> ("prompt-box-widget") != null)
-                cb (w);
+            prompt_widgets.append (c);
+            i++;
         }
+
+        foreach (var w in prompt_widgets)
+            cb (w);
     }
 
     public void clear ()
@@ -315,7 +322,19 @@
 
     private void entry_activate_cb (Gtk.Entry entry)
     {
-        respond (entry.text);
+        string response = null;
+        foreach_prompt_widget ((w) =>
+        {
+            if (w is Gtk.Entry)
+            {
+                var e = w as Gtk.Entry;
+                if (response != null)
+                    response += "\n" + e.text;
+                else
+                    response = e.text;
+            }
+        });
+        respond (response);
     }
 
     public void add_button (string text, string? accessible_text)

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-04-24 19:47:29 +0000
+++ src/unity-greeter.vala	2012-04-24 19:47:29 +0000
@@ -388,9 +388,6 @@
         if (text == "login:")
             text = _("Username:");
         user_list.show_prompt (text, type == LightDM.PromptType.SECRET);
-
-        /* Clear messages on the next prompt */
-        clear_messages = true;
     }
 
     private void background_loaded_cb (ParamSpec pspec)
@@ -466,6 +463,7 @@
                 /* Show an error if one wasn't provided */
                 if (clear_messages)
                     user_list.clear_messages ();
+                clear_messages = false;
                 if (!user_list.have_messages ())
                     user_list.show_message (_("Invalid password, please try again"), true);
 
@@ -508,8 +506,6 @@
         /* Reset manual username */
         user_list.manual_username = null;
 
-        clear_messages = false;
-
         if (test_mode)
         {
             test_username = null;
@@ -565,7 +561,7 @@
                 show_prompt_cb (_("Password:"), LightDM.PromptType.SECRET);
                 break;
             case "two-prompts":
-                show_prompt_cb (_("Favorite Color:"), LightDM.PromptType.QUESTION);
+                show_prompt_cb (_("Favorite Color (blue):"), LightDM.PromptType.QUESTION);
                 show_prompt_cb (_("Password:"), LightDM.PromptType.SECRET);
                 break;
             default:
@@ -586,6 +582,8 @@
 
     private void respond_to_prompt_cb (string text)
     {
+        clear_messages = true;
+
         if (test_mode)
         {
             debug ("response %s", text);
@@ -658,6 +656,10 @@
                 show_message_cb ("Account is locked", LightDM.MessageType.ERROR);
                 authentication_complete_cb ();
                 break;
+            case "two-prompts":
+                test_is_authenticated = text == "blue\npassword";
+                authentication_complete_cb ();
+                break;
             default:
                 test_is_authenticated = text == "password";
                 authentication_complete_cb ();

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2012-04-24 19:47:29 +0000
+++ src/user-list.vala	2012-04-24 19:47:29 +0000
@@ -289,7 +289,7 @@
     public void show_prompt (string text, bool secret = false)
     {
         string accessible_text = null;
-        if (selected_entry != null && selected_entry.name != null)
+        if (selected_entry != null && selected_entry.label != null)
             accessible_text = _("Enter password for %s").printf (selected_entry.label);
         selected_entry.prompt_box.add_prompt (text, accessible_text, secret);
 
@@ -625,6 +625,7 @@
         user_displayed_done ();
         mode = Mode.LOGIN;
         login_box.set_base (selected_entry.prompt_box);
+        focus_prompt ();
     }
 
     private void select_entry (UserEntry entry, double direction)