Cleaning up compilation warnings

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

diff --git a/src/moonshot-idcard-widget.vala b/src/moonshot-idcard-widget.vala
index dd36b5e..487b0e7 100644 (file)
--- a/src/moonshot-idcard-widget.vala
+++ b/src/moonshot-idcard-widget.vala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, JANET(UK)
+ * Copyright (c) 2011-2016, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,13 +33,18 @@ using Gtk;
 
 class IdCardWidget : Box
 {
-    static MoonshotLogger logger = get_logger("IdCardWidget");
+    // static MoonshotLogger logger = get_logger("IdCardWidget");
+
+    private static const ShadowType ARROW_SHADOW = ShadowType.NONE;
+
+    private IdentityManagerView manager_view;
 
     public IdCard id_card { get; set; default = null; }
     private VBox main_vbox;
     private HBox table;
     private EventBox event_box;
     private bool   is_selected = false;
+    private Arrow arrow;
     
     private Label label;
 
@@ -50,13 +55,18 @@ class IdCardWidget : Box
     }
 
     public signal void expanded();
+    public signal void collapsed();
 
-    public void collapse()
+    internal void select()
     {
-        is_selected = false;
-        update_id_card_label();
+        expand();
+        this.expanded();
+    }
 
-        set_idcard_color();
+    internal void unselect()
+    {
+        collapse();
+        this.collapsed();
     }
 
     public void expand()
@@ -65,15 +75,24 @@ class IdCardWidget : Box
         update_id_card_label();
 
         set_idcard_color();
-        this.expanded();
+        arrow.set(ArrowType.DOWN, ARROW_SHADOW);
+    }
+
+    public void collapse()
+    {
+        is_selected = false;
+        update_id_card_label();
+
+        set_idcard_color();
+        arrow.set(ArrowType.RIGHT, ARROW_SHADOW);
     }
 
     private bool button_press_cb()
     {
         if (is_selected)
-            collapse();
+            unselect();
         else
-            expand();
+            select();
 
         return false;
     }
@@ -101,43 +120,41 @@ class IdCardWidget : Box
 
             }
         }
-        var state = this.get_state();
-        this.event_box.modify_bg(state, color);
+        this.event_box.modify_bg(StateType.NORMAL, color);
+        this.arrow.modify_bg(StateType.NORMAL, color);
     }
     
     private void
     update_id_card_label()
     {
         // !!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);
+        var display_name = (manager_view.selection_in_progress() && this.id_card.is_no_identity()
+                            ? "Do not use a Moonshot identity for this service" : this.id_card.display_name);
+        var label_text = Markup.printf_escaped(_("<span rise='8000'><big>%s</big></span>"), display_name);
 
         if (is_selected)
         {
-            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;
+            if (!this.id_card.is_no_identity()) {
+                label_text += "\nUsername:  " + id_card.username;
+                label_text += "\nRealm:  " + id_card.issuer;
+                if (!id_card.trust_anchor.is_empty()) {
+                    label_text += _("\nTrust anchor: Enterprise provisioned");
+                }
             }
-            label_text += "\n" + services_text;
+
+            string services_text = _("Services:  ") + this.id_card.get_services_string(service_spacer);
+            label_text += _("\n") + services_text;
         }
 
         label.set_markup(label_text);
     }
 
-    public IdCardWidget(IdCard id_card)
+    public IdCardWidget(IdCard id_card, IdentityManagerView manager_view)
     {
         this.id_card = id_card;
-
-        var image = new Image.from_pixbuf(get_pixbuf(id_card));
+        this.manager_view = manager_view;
 
         label = new Label(null);
         label.set_alignment((float) 0, (float) 0.5);
@@ -145,8 +162,16 @@ class IdCardWidget : Box
         update_id_card_label();
 
         table = new Gtk.HBox(false, 6);
+        var image = new Image.from_pixbuf(get_pixbuf(id_card));
+        if (this.id_card.is_no_identity()) {
+            image.clear();
+            // Use padding to make the image size =  48x48 (size = 2x padding)
+            image.set_padding(24, 24);
+        }
         table.pack_start(image, false, false, 0);
         table.pack_start(label, true, true, 0);
+        this.arrow = new Arrow(ArrowType.RIGHT, ARROW_SHADOW);
+        table.pack_start(arrow, false, false);
 
         this.main_vbox = new VBox(false, 12);
         main_vbox.pack_start(table, true, true, 0);