Merge branch 'master' of http://www.project-moonshot.org/git/moonshot-ui

diff --git a/src/moonshot-idcard-store.vala b/src/moonshot-idcard-store.vala
index 4303713..7fa060e 100644 (file)
--- a/src/moonshot-idcard-store.vala
+++ b/src/moonshot-idcard-store.vala
@@ -8,7 +8,7 @@ public interface IIdentityCardStore : Object {
 
     public abstract void add_card(IdCard card);
     public abstract void remove_card(IdCard card);
-    public abstract void update_card(IdCard card);
+    public abstract IdCard? update_card(IdCard card);
     public abstract StoreType get_store_type();
     public abstract LinkedList<IdCard> get_card_list(); 
 }

diff --git a/src/moonshot-idcard-widget.vala b/src/moonshot-idcard-widget.vala
index 8ea1f60..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;
     }

diff --git a/src/moonshot-identities-manager.vala b/src/moonshot-identities-manager.vala
index 501d065..0c8dfb4 100644 (file)
--- a/src/moonshot-identities-manager.vala
+++ b/src/moonshot-identities-manager.vala
@@ -127,13 +127,15 @@ public class IdentityManagerModel : Object {
         card_list_changed();
      }
 
-     public void update_card(IdCard card) {
+     public IdCard update_card(IdCard card) {
+        IdCard retval;
         if (!card.store_password)
             password_table.CachePassword(card, store);
         else
             password_table.RemovePassword(card, store);
-        store.update_card(card);
+        retval = store.update_card(card);
         card_list_changed();
+        return retval;
      }
 
      public void remove_card(IdCard card) {

diff --git a/src/moonshot-identity-management-view.vala b/src/moonshot-identity-management-view.vala
index dbeb556..0b7e283 100644 (file)
--- a/src/moonshot-identity-management-view.vala
+++ b/src/moonshot-identity-management-view.vala
@@ -4,7 +4,6 @@ using Gtk;
 public class IdentityManagerView : Window {
     private const int WINDOW_WIDTH = 400;
     private const int WINDOW_HEIGHT = 500;
-    private const int RIGHT_PANE_WIDTH = 275;
     protected IdentityManagerApp parent_app;
 #if OS_MACOS
        public OSXApplication osxApp;
@@ -190,6 +189,11 @@ public class IdentityManagerView : Window {
     }
 
     private void load_id_cards () {
+        string current_idcard_nai = null;
+        if (this.custom_vbox.current_idcard != null) {
+            current_idcard_nai = custom_vbox.current_idcard.id_card.nai;
+            custom_vbox.current_idcard = null;
+        }
         var children = this.custom_vbox.get_children ();
         foreach (var id_card_widget in children) {
         remove_id_card_widget((IdCardWidget)id_card_widget);
@@ -202,31 +206,38 @@ public class IdentityManagerView : Window {
 
         foreach (IdCard id_card in card_list) {
             add_id_card_data (id_card);
-            add_id_card_widget (id_card);
+            IdCardWidget id_card_widget = add_id_card_widget (id_card);
+            if (id_card_widget.id_card.nai == current_idcard_nai) {
+                fill_details(id_card_widget);
+                id_card_widget.expand();
+            }
         }
+        if (custom_vbox.current_idcard == null)
+            fill_details(null);
     }
     
-    private void fill_details (IdCardWidget id_card_widget)
+    private void fill_details (IdCardWidget? id_card_widget)
     {
-       var id_card = id_card_widget.id_card;
-       var vr_children = this.vbox_right.get_children();
-       foreach (var vr_child in vr_children)
-           this.vbox_right.remove(vr_child);
-       if (id_card.display_name == IdCard.NO_IDENTITY) {
-           this.vbox_right.pack_start(no_identity_title, false, true, 0);
-       } else {
-           this.username_entry.set_text (id_card.username);
-           this.password_entry.set_text (id_card.password ?? "");
-           this.vbox_right.pack_start(login_vbox, false, true, 0);
-           this.remember_checkbutton.active = id_card.store_password;
-       }
-       this.vbox_right.pack_start (services_vbox, false, true, 0);
+        var vr_children = this.vbox_right.get_children();
+        foreach (var vr_child in vr_children)
+            this.vbox_right.remove(vr_child);
+        if (id_card_widget != null) {
+            var id_card = id_card_widget.id_card;
+            if (id_card.display_name == IdCard.NO_IDENTITY) {
+               this.vbox_right.pack_start(no_identity_title, false, true, 0);
+            } else {
+               this.username_entry.set_text (id_card.username);
+               this.password_entry.set_text (id_card.password ?? "");
+               this.vbox_right.pack_start(login_vbox, false, true, 0);
+               this.remember_checkbutton.active = id_card.store_password;
+            }
+            this.vbox_right.pack_start (services_vbox, false, true, 0);
 
-       var children = this.services_internal_vbox.get_children ();
-       foreach (var hbox in children)
-           services_internal_vbox.remove(hbox);
-       fill_services_vbox (id_card_widget.id_card);
-//       identities_manager.store_id_cards();
+            var children = this.services_internal_vbox.get_children ();
+            foreach (var hbox in children)
+               services_internal_vbox.remove(hbox);
+            fill_services_vbox (id_card_widget.id_card);
+        }
     }
 
     private void show_details (IdCard id_card)
@@ -297,7 +308,7 @@ public class IdentityManagerView : Window {
         }
     }
 
-    private void add_id_card_widget (IdCard id_card)
+    private IdCardWidget add_id_card_widget (IdCard id_card)
     {
         var id_card_widget = new IdCardWidget (id_card);
         this.custom_vbox.add_id_card_widget (id_card_widget);
@@ -306,6 +317,7 @@ public class IdentityManagerView : Window {
         id_card_widget.send_id.connect ((w) => send_identity_cb (w.id_card));
         id_card_widget.expanded.connect (this.custom_vbox.receive_expanded_event);
         id_card_widget.expanded.connect (fill_details);
+        return id_card_widget;
     }
 
     public bool add_identity (IdCard id_card, bool force_flat_file_store)
@@ -424,8 +436,9 @@ public class IdentityManagerView : Window {
         this.request_queue.push_tail (request);
     }
 
-    public void check_add_password(IdCard identity, IdentityRequest request, IdentityManagerModel model)
+    public IdCard check_add_password(IdCard identity, IdentityRequest request, IdentityManagerModel model)
     {
+        IdCard retval = identity;
         if ((identity.password == "") && !identity.IsNoIdentity())
         {
             var dialog = new AddPasswordDialog (identity, request);
@@ -435,7 +448,7 @@ public class IdentityManagerView : Window {
             case ResponseType.OK:
                 identity.password = dialog.password;
                 identity.store_password = dialog.remember;
-                model.update_card(identity);
+                retval = model.update_card(identity);
                 break;
             default:
                 identity = null;
@@ -444,6 +457,7 @@ public class IdentityManagerView : Window {
 
             dialog.destroy ();
         }
+        return retval;
     }
 
     public void send_identity_cb (IdCard identity)
@@ -519,43 +533,40 @@ public class IdentityManagerView : Window {
             
             remove_button.clicked.connect ((remove_button) =>
             {
+              var candidate = service_button_map.lookup (remove_button);
+              if (candidate == null)
+                return;
               var dialog = new Gtk.MessageDialog (this,
                                       Gtk.DialogFlags.DESTROY_WITH_PARENT,
                                       Gtk.MessageType.QUESTION,
                                       Gtk.ButtonsType.YES_NO,
                                       _("Are you sure you want to stop '%s' ID Card from being used with %s?"),
                                       custom_vbox.current_idcard.id_card.display_name,
-                                      _("this service"));
+                                      candidate);
               var ret = dialog.run();
               dialog.hide();
               
               if (ret == Gtk.ResponseType.YES)
               {
                 IdCard idcard = custom_vbox.current_idcard.id_card;
-                var candidate = service_button_map.lookup (remove_button);
-
-                SList<string> services = new SList<string>();
+                if (idcard != null) {
+                  SList<string> services = new SList<string>();
                 
-                foreach (string srv in idcard.services)
-                {
-                  if (srv == candidate)
-                    continue;
-                  services.append (srv);
-                }
-                
-                idcard.services = new string[services.length()];
-                for (int j=0; j<idcard.services.length; j++)
-                {
-                  idcard.services[j] = services.nth_data(j);
-                }
+                  foreach (string srv in idcard.services)
+                  {
+                    if (srv == candidate)
+                      continue;
+                    services.append (srv);
+                  }
                 
-                var children = services_internal_vbox.get_children ();
-                foreach (var hbox in children)
-                  services_internal_vbox.remove(hbox);
+                  idcard.services = new string[services.length()];
+                  for (int j=0; j<idcard.services.length; j++)
+                  {
+                    idcard.services[j] = services.nth_data(j);
+                  }
                 
-                fill_services_vbox (idcard);
-                custom_vbox.current_idcard.update_id_card_label ();
-                identities_manager.update_card(idcard);
+                  identities_manager.update_card(idcard);
+                }
               }
               
             });
@@ -739,7 +750,6 @@ SUCH DAMAGE.
 
         this.no_identity_title = new Label (_("No Identity: Send this identity to services which should not use Moonshot"));
         no_identity_title.set_alignment(0, (float ) 0.5);
-        no_identity_title.set_size_request(RIGHT_PANE_WIDTH, -1);
         no_identity_title.set_line_wrap(true);
         no_identity_title.show();
 
@@ -784,11 +794,10 @@ SUCH DAMAGE.
         this.vbox_right = new VBox (false, 18);
         vbox_right.pack_start (login_vbox, false, true, 0);
         vbox_right.pack_start (services_vbox, false, true, 0);
-        vbox_right.set_size_request( RIGHT_PANE_WIDTH, -1 );
 
         var hbox = new HBox (false, 12);
-        hbox.pack_start (vbox_left, true, true, 0);
-        hbox.pack_start (vbox_right, false, false, 0);
+        hbox.pack_start (vbox_left, false, false, 0);
+        hbox.pack_start (vbox_right, true, true, 0);
 
         var main_vbox = new VBox (false, 0);
         main_vbox.set_border_width (12);

diff --git a/src/moonshot-identity-manager-app.vala b/src/moonshot-identity-manager-app.vala
index 7a6bf83..a5f04c1 100644 (file)
--- a/src/moonshot-identity-manager-app.vala
+++ b/src/moonshot-identity-manager-app.vala
@@ -225,7 +225,7 @@ public class IdentityManagerApp {
         Idle.add(
             () => {
                 if (view != null) {
-                    view.check_add_password(identity, request, model);
+                    identity = view.check_add_password(identity, request, model);
                 }
                 request.return_identity (identity);
 // The following occasionally causes the app to exit without sending the dbus

diff --git a/src/moonshot-identity-request.vala b/src/moonshot-identity-request.vala
index 3646edf..cc436ac 100644 (file)
--- a/src/moonshot-identity-request.vala
+++ b/src/moonshot-identity-request.vala
@@ -72,7 +72,7 @@ public class IdentityRequest : Object {
                 services[id_card.services.length] = this.service;
                 id_card.services = services;
 
-                this.parent_app.model.update_card (id_card);
+                this.id_card = this.parent_app.model.update_card (id_card);
             }
         }
 

diff --git a/src/moonshot-keyring-store.vala b/src/moonshot-keyring-store.vala
index 2192704..00e09f5 100644 (file)
--- a/src/moonshot-keyring-store.vala
+++ b/src/moonshot-keyring-store.vala
@@ -12,10 +12,14 @@ public class KeyringStore : Object, IIdentityCardStore {
         store_id_cards ();
     }
 
-    public void update_card(IdCard card) {
+    public IdCard? update_card(IdCard card) {
         id_card_list.remove(card);
         id_card_list.add(card);
         store_id_cards ();
+        foreach (IdCard idcard in id_card_list)
+            if (idcard.display_name == card.display_name)
+                return idcard;
+        return null;
     }
 
     public void remove_card(IdCard card) {

diff --git a/src/moonshot-local-flat-file-store.vala b/src/moonshot-local-flat-file-store.vala
index 116e956..c2d39ab 100644 (file)
--- a/src/moonshot-local-flat-file-store.vala
+++ b/src/moonshot-local-flat-file-store.vala
@@ -9,10 +9,14 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
         store_id_cards ();
     }
 
-    public void update_card(IdCard card) {
+    public IdCard? update_card(IdCard card) {
         id_card_list.remove(card);
         id_card_list.add(card);
         store_id_cards ();
+        foreach(IdCard idcard in id_card_list)
+            if (idcard.display_name == card.display_name)
+                return idcard;
+        return null;
      }
 
      public void remove_card(IdCard card) {