Refactored the IdCard services list to fix new bugs and (hopefully) prevent even...

[moonshot-ui.git] / src / moonshot-idcard-widget.vala

diff --git a/src/moonshot-idcard-widget.vala b/src/moonshot-idcard-widget.vala
index 42f70c6..7a34cf2 100644 (file)
--- a/src/moonshot-idcard-widget.vala
+++ b/src/moonshot-idcard-widget.vala
@@ -50,16 +50,18 @@ class IdCardWidget : Box
     }
 
     public signal void expanded();
-    public signal void remove_id();
-    public signal void details_id();
-    public signal void send_id();
+    public signal void collapsed();
 
-    public void collapse()
+    private void select()
     {
-        is_selected = false;
-        update_id_card_label();
+        expand();
+        this.expanded();
+    }
 
-        set_idcard_color();
+    private void unselect()
+    {
+        collapse();
+        this.collapsed();
     }
 
     public void expand()
@@ -71,29 +73,22 @@ class IdCardWidget : Box
         this.expanded();
     }
 
-    private bool button_press_cb()
+    public void collapse()
     {
-        if (is_selected)
-            collapse();
-        else
-            expand();
-
-        return false;
-    }
+        is_selected = false;
+        update_id_card_label();
 
-    private void delete_button_cb()
-    {
-        this.remove_id();
+        set_idcard_color();
     }
 
-    private void details_button_cb()
+    private bool button_press_cb()
     {
-        this.details_id();
-    }
+        if (is_selected)
+            unselect();
+        else
+            select();
 
-    private void send_button_cb()
-    {
-        this.send_id();
+        return false;
     }
 
     private void set_idcard_color()
@@ -128,7 +123,7 @@ class IdCardWidget : Box
     {
         // !!TODO: Use a table to format the labels and values
         string services_text = "Services:  ";
-        string service_spacer = "                ";
+        string service_spacer = "\n                ";
 
         var label_text = Markup.printf_escaped("<big>%s</big>", this.id_card.display_name);
 
@@ -137,14 +132,7 @@ class IdCardWidget : Box
             label_text += "\nUsername:  " + id_card.username;
             label_text += "\nRealm:  " + id_card.issuer;
 
-            var sep = "";
-            for (int i = 0; i < id_card.services.length; i++)
-            {
-                services_text += sep;
-                services_text += id_card.services[i];
-
-                sep = "\n" + service_spacer;
-            }
+            services_text += this.id_card.get_services_string(service_spacer);
             label_text += "\n" + services_text;
         }