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 19ae2e9..78a7c78 100644 (file)
--- a/src/moonshot-idcard-widget.vala
+++ b/src/moonshot-idcard-widget.vala
@@ -5,16 +5,19 @@ class IdCardWidget : Box
     public IdCard id_card { get; set; default = null; }
 
     private VBox main_vbox;
-    private Table table;
+    private HBox table;
     public Button delete_button { get; private set; default = null; }
     public Button details_button { get; private set; default = null; }
     public Button send_button { get; private set; default = null; }
     private HButtonBox hbutton_box;
     private EventBox event_box;
+    
+    private Label label;
 
     public signal void expanded ();
     public signal void remove_id ();
     public signal void details_id ();
+    public signal void send_id ();
 
     public void collapse ()
     {
@@ -23,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;
     }
@@ -45,6 +54,11 @@ class IdCardWidget : Box
        this.details_id ();
     }
 
+    private void send_button_cb ()
+    {
+       this.send_id ();
+    }
+
     private void set_idcard_color ()
     {
         var color = Gdk.Color ();
@@ -64,42 +78,55 @@ class IdCardWidget : Box
         var state = this.get_state ();
         this.event_box.modify_bg (state, color);
     }
+    
+    public void
+    update_id_card_label ()
+    {
+        string services_text = "";
+
+        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];
+            
+            if (i == (id_card.services.length - 1))
+              services_text = services_text + Markup.printf_escaped ("<i>%s</i>", service);
+            else
+              services_text = services_text + Markup.printf_escaped ("<i>%s, </i>", service);
+        }
+        label.set_markup (display_name + "\n" + services_text);
+    }
 
     public IdCardWidget (IdCard id_card)
     {
-        string services_text = "";
         this.id_card = id_card;
 
-        var image = new Image.from_pixbuf (id_card.pixbuf);
+        var image = new Image.from_pixbuf (get_pixbuf(id_card));
 
-        var issuer = Markup.printf_escaped ("<b>%s</b>", this.id_card.issuer);
-        foreach (string service in id_card.services)
-        {
-            services_text = services_text + Markup.printf_escaped ("<i>%s, </i>", service);
-        }
-        var text = issuer + "\n" + services_text;
-
-        var id_data_label = new Label (null);
-        id_data_label.set_markup (text);
-        id_data_label.set_alignment ((float) 0, (float) 0.5);
-
-        this.table = new Table (1, 2, false);
-        table.attach_defaults (image, 0, 1, 0, 1);
-        table.attach_defaults (id_data_label, 1, 2, 0, 1);
-
-        this.delete_button = new Button.with_label ("Delete");
-        this.details_button = new Button.with_label ("View details");
-        this.send_button = new Button.with_label ("Send");
-        set_atk_name_description (delete_button, "Delete", "Delete this ID Card");
-        set_atk_name_description (details_button, "Details", "View the details of this ID Card");
-        set_atk_name_description (send_button, "Send", "Send this ID Card");
+        label = new Label (null);
+        label.set_alignment ((float) 0, (float) 0.5);
+        label.set_ellipsize (Pango.EllipsizeMode.END);
+        update_id_card_label();
+
+        table = new Gtk.HBox (false, 6);
+        table.pack_start (image, false, false, 0);
+        table.pack_start (label, true, true, 0);
+
+        this.delete_button = new Button.with_label (_("Delete"));
+        this.details_button = new Button.with_label (_("View details"));
+        this.send_button = new Button.with_label (_("Send"));
+        set_atk_name_description (delete_button, _("Delete"), _("Delete this ID Card"));
+        set_atk_name_description (details_button, _("Details"), _("View the details of this ID Card"));
+        set_atk_name_description (send_button, _("Send"), _("Send this ID Card"));
         this.hbutton_box = new HButtonBox ();
         hbutton_box.pack_end (delete_button);
         hbutton_box.pack_end (details_button);
         hbutton_box.pack_end (send_button);
+        send_button.set_sensitive (false);
 
         delete_button.clicked.connect (delete_button_cb);
         details_button.clicked.connect (details_button_cb);
+        send_button.clicked.connect (send_button_cb);
 
         this.main_vbox = new VBox (false, 12);
         main_vbox.pack_start (table, true, true, 0);