Reselect current id card by nai when cards are reloaded.

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

diff --git a/src/moonshot-idcard-widget.vala b/src/moonshot-idcard-widget.vala
index 567489c..78a7c78 100644 (file)
--- a/src/moonshot-idcard-widget.vala
+++ b/src/moonshot-idcard-widget.vala
@@ -26,14 +26,20 @@ class IdCardWidget : Box
         set_idcard_color ();
     }
 
-    private bool button_press_cb ()
+    public void expand ()
     {
-        this.hbutton_box.set_visible (!hbutton_box.get_visible ());
+        this.hbutton_box.set_visible (true);
 
         set_idcard_color ();
+        this.expanded ();
+    }
 
-        if (hbutton_box.get_visible () == true)
-          this.expanded ();
+    private bool button_press_cb ()
+    {
+        if (hbutton_box.get_visible ())
+            collapse ();
+        else
+            expand ();
 
         return false;
     }
@@ -78,9 +84,7 @@ class IdCardWidget : Box
     {
         string services_text = "";
 
-        var display_name = Markup.printf_escaped ("<big><b>%s</b></big>", this.id_card.display_name);
-        var issued_by =  Markup.printf_escaped ("<i>%s</i>", _("Issued by: "));
-        var issuer_name = Markup.printf_escaped ("<i><b>%s</b></i>", this.id_card.issuer);
+        var display_name = Markup.printf_escaped ("<big>%s</big>", this.id_card.display_name);
         for (int i=0; i<id_card.services.length; i++)
         {
             var service = id_card.services[i];
@@ -90,18 +94,17 @@ class IdCardWidget : Box
             else
               services_text = services_text + Markup.printf_escaped ("<i>%s, </i>", service);
         }
-        label.set_markup (display_name + "\n" + issued_by + issuer_name + "\n" + services_text);
+        label.set_markup (display_name + "\n" + services_text);
     }
 
     public IdCardWidget (IdCard id_card)
     {
         this.id_card = id_card;
 
-        var image = new Image.from_pixbuf (id_card.get_data ("pixbuf"));
+        var image = new Image.from_pixbuf (get_pixbuf(id_card));
 
         label = new Label (null);
-        label.set_alignment ((float) 0.5, (float) 0.5);
-        label.set_justify(Gtk.Justification.CENTER);
+        label.set_alignment ((float) 0, (float) 0.5);
         label.set_ellipsize (Pango.EllipsizeMode.END);
         update_id_card_label();