The problem was that simply calling Window.show() doesn't mean that the window

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

diff --git a/src/moonshot-idcard-widget.vala b/src/moonshot-idcard-widget.vala
index 4c8cfc5..4f9e43e 100644 (file)
--- a/src/moonshot-idcard-widget.vala
+++ b/src/moonshot-idcard-widget.vala
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2011-2014, JANET(UK)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+*/
 using Gtk;
 
 class IdCardWidget : Box
@@ -11,6 +42,8 @@ class IdCardWidget : Box
     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 ();
@@ -24,14 +57,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;
     }
@@ -70,16 +109,13 @@ class IdCardWidget : Box
         var state = this.get_state ();
         this.event_box.modify_bg (state, color);
     }
-
-    public IdCardWidget (IdCard id_card)
+    
+    public void
+    update_id_card_label ()
     {
         string services_text = "";
-        this.id_card = id_card;
 
-        var image = new Image.from_pixbuf (id_card.pixbuf);
-
-        var display_name = Markup.printf_escaped ("<b>%s</b>", this.id_card.display_name);
-        
+        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];
@@ -89,16 +125,23 @@ class IdCardWidget : Box
             else
               services_text = services_text + Markup.printf_escaped ("<i>%s, </i>", service);
         }
-        var text = display_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 (get_pixbuf(id_card));
 
-        var id_data_label = new Label (null);
-        id_data_label.set_markup (text);
-        id_data_label.set_alignment ((float) 0, (float) 0.5);
-        id_data_label.set_ellipsize (Pango.EllipsizeMode.END);
+        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 (id_data_label, true, true, 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"));
@@ -110,6 +153,7 @@ class IdCardWidget : Box
         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);