Require minimal set of fields when adding a new card. LP 1240008

Always require display name, username, issuer.
Require password when 'remember password' is selected.

diff --git a/src/moonshot-add-dialog.vala b/src/moonshot-add-dialog.vala
index 141f788..3ef6ebf 100644 (file)
--- a/src/moonshot-add-dialog.vala
+++ b/src/moonshot-add-dialog.vala
@@ -2,11 +2,21 @@ using Gtk;
 
 class AddIdentityDialog : Dialog
 {
+    static const string displayname_labeltext = _("Display Name");
+    static const string issuer_labeltext = _("Issuer");
+    static const string username_labeltext = _("Username");
+    static const string password_labeltext = _("Password");
     private Entry displayname_entry;
+    private Label displayname_label;
     private Entry issuer_entry;
+    private Label issuer_label;
     private Entry username_entry;
+    private Label username_label;
     private Entry password_entry;
+    private Label password_label;
     private CheckButton remember_checkbutton;
+    private Label message_label;
+    public bool complete;
     
     public string display_name {
         get { return displayname_entry.get_text(); }
@@ -43,41 +53,45 @@ class AddIdentityDialog : Dialog
         var content_area = this.get_content_area ();
         ((Box) content_area).set_spacing (12);
         
-        var displayname_label = new Label (_("Display Name:"));
+        displayname_label = new Label (@"$displayname_labeltext:");
         displayname_label.set_alignment (1, (float) 0.5);
         displayname_entry = new Entry ();
-        var issuer_label = new Label (_("Issuer:"));
+        issuer_label = new Label (@"$issuer_labeltext:");
         issuer_label.set_alignment (1, (float) 0.5);
         this.issuer_entry = new Entry ();
-        var username_label = new Label (_("Username:"));
+        username_label = new Label (@"$username_labeltext:");
         username_label.set_alignment (1, (float) 0.5);
         this.username_entry = new Entry ();
-        var password_label = new Label (_("Password:"));
+        password_label = new Label (@"$password_labeltext:");
         password_label.set_alignment (1, (float) 0.5);
         this.password_entry = new Entry ();
         password_entry.set_invisible_char ('*');
         password_entry.set_visibility (false);
         this.remember_checkbutton = new CheckButton.with_label (_("Remember password"));
+        this.message_label = new Label("");
+        message_label.set_visible(false);
 
         set_atk_relation (displayname_label, displayname_entry, Atk.RelationType.LABEL_FOR);
         set_atk_relation (issuer_label, issuer_entry, Atk.RelationType.LABEL_FOR);
         set_atk_relation (username_label, username_entry, Atk.RelationType.LABEL_FOR);
         set_atk_relation (password_entry, password_entry, Atk.RelationType.LABEL_FOR);
 
-        var table = new Table (5, 5, false);
+        var table = new Table (6, 2, false);
         table.set_col_spacings (10);
         table.set_row_spacings (10);
         
-        table.attach_defaults (displayname_label, 0, 1, 0, 1);
-        table.attach_defaults (displayname_entry, 1, 2, 0, 1);
-        table.attach_defaults (issuer_label, 0, 1, 1, 2);
-        table.attach_defaults (issuer_entry, 1, 2, 1, 2);
-        table.attach_defaults (username_label, 0, 1, 2, 3);
-        table.attach_defaults (username_entry, 1, 2, 2, 3);
-        table.attach_defaults (password_label, 0, 1, 3, 4);
-        table.attach_defaults (password_entry, 1, 2, 3, 4);
-        table.attach_defaults (remember_checkbutton,  1, 2, 4, 5);
+        table.attach_defaults (message_label, 0, 2, 0, 1);
+        table.attach_defaults (displayname_label, 0, 1, 1, 2);
+        table.attach_defaults (displayname_entry, 1, 2, 1, 2);
+        table.attach_defaults (issuer_label, 0, 1, 2, 3);
+        table.attach_defaults (issuer_entry, 1, 2, 2, 3);
+        table.attach_defaults (username_label, 0, 1, 3, 4);
+        table.attach_defaults (username_entry, 1, 2, 3, 4);
+        table.attach_defaults (password_label, 0, 1, 4, 5);
+        table.attach_defaults (password_entry, 1, 2, 4, 5);
+        table.attach_defaults (remember_checkbutton,  1, 2, 5, 6);
 
+        this.response.connect(on_response);
         var vbox = new VBox (false, 0);
         vbox.set_border_width (6);
         vbox.pack_start (table, false, false, 0);
@@ -89,6 +103,63 @@ class AddIdentityDialog : Dialog
         this.show_all ();
     }
 
+    private static string update_preamble(string preamble)
+    {
+        if (preamble == "")
+            return _("Missing required field: ");
+        return _("Missing required fields: ");
+    }
+
+    private static string update_message(string old_message, string new_item)
+    {
+        string message;
+        if (old_message == "")
+            message = new_item;
+        else
+            message = old_message + ", " + new_item;
+        return message;
+    }
+
+    private static void check_field(string field, Label label, string fieldname, ref string preamble, ref string message)
+    {
+        if (field != "") {
+            label.set_markup(@"$fieldname:");
+            return;
+        }
+        label.set_markup(@"<span foreground=\"red\">$fieldname:</span>");
+        preamble = update_preamble(preamble);
+        message = update_message(message, fieldname);
+    }
+
+    private bool check_fields()
+    {
+        string preamble = "";
+        string message = "";
+        string password_test = store_password ? password : "not required";
+        check_field(display_name, displayname_label, displayname_labeltext, ref preamble, ref message);
+        check_field(issuer, issuer_label, issuer_labeltext, ref preamble, ref message);
+        check_field(username, username_label, username_labeltext, ref preamble, ref message);
+        check_field(password_test, password_label, password_labeltext, ref preamble, ref message);
+        if (message != "") {
+            message_label.set_visible(true);
+            message_label.set_markup(@"<span foreground=\"red\">$preamble$message</span>");
+            return false;
+        }
+        return true;
+    }
+
+    private void on_response (Dialog source, int response_id)
+    {
+        switch (response_id) {
+        case ResponseType.OK:
+            complete = check_fields();
+            break;
+        case ResponseType.CANCEL:
+            complete = true;
+            break;
+        }
+    }
+
     private void set_atk_relation (Widget widget, Widget target_widget, Atk.RelationType relationship)
     {
         var atk_widget = widget.get_accessible ();

diff --git a/src/moonshot-identity-management-view.vala b/src/moonshot-identity-management-view.vala
index 77d8056..bcb0b8e 100644 (file)
--- a/src/moonshot-identity-management-view.vala
+++ b/src/moonshot-identity-management-view.vala
@@ -376,7 +376,9 @@ public class IdentityManagerView : Window {
     private void add_identity_manual_cb ()
     {
         var dialog = new AddIdentityDialog ();
-        var result = dialog.run ();
+        int result = ResponseType.CANCEL;
+        while (!dialog.complete)
+            result = dialog.run ();
 
         switch (result) {
         case ResponseType.OK: