Fixed translatable strings
[moonshot-ui.git] / src / moonshot-identity-management-view.vala
index 0f4c942..c4a8a1a 100644 (file)
 */
 using Gee;
 using Gtk;
+using WebProvisioning;
 
 public class IdentityManagerView : Window {
     static MoonshotLogger logger = get_logger("IdentityManagerView");
 
+    bool use_flat_file_store = false;
+
+    // The latest year in which Moonshot sources were modified.
+    private static int LATEST_EDIT_YEAR = 2016;
+
+    public static Gdk.Color white = make_color(65535, 65535, 65535);
+
     private const int WINDOW_WIDTH = 700;
     private const int WINDOW_HEIGHT = 500;
     protected IdentityManagerApp parent_app;
@@ -43,10 +51,8 @@ public class IdentityManagerView : Window {
     #endif
     private UIManager ui_manager = new UIManager();
     private Entry search_entry;
-    private VBox vbox_right;
     private CustomVBox custom_vbox;
     private VBox service_prompt_vbox;
-    private Label no_identity_title;
     private Button edit_button;
     private Button remove_button;
 
@@ -58,10 +64,14 @@ public class IdentityManagerView : Window {
     internal IdentityManagerModel identities_manager;
     private unowned SList<IdCard>    candidates;
 
-    public GLib.Queue<IdentityRequest> request_queue;
+    private GLib.Queue<IdentityRequest> request_queue;
 
     internal CheckButton remember_identity_binding = null;
 
+    private IdCard selected_idcard = null;
+
+    private string import_directory = null;
+
     private enum Columns
     {
         IDCARD_COL,
@@ -79,8 +89,10 @@ public class IdentityManagerView : Window {
     "        </menu>" +
     "</menubar>";
 
-    public IdentityManagerView(IdentityManagerApp app) {
+    public IdentityManagerView(IdentityManagerApp app, bool use_flat_file_store) {
         parent_app = app;
+        this.use_flat_file_store = use_flat_file_store;
+
         #if OS_MACOS
             osxApp = OSXApplication.get_instance();
         #endif
@@ -95,7 +107,8 @@ public class IdentityManagerView : Window {
         connect_signals();
     }
     
-    public void on_card_list_changed() {
+    private void on_card_list_changed() {
+        logger.trace("on_card_list_changed");
         load_id_cards();
     }
     
@@ -151,7 +164,7 @@ public class IdentityManagerView : Window {
                     return true;
             }
             
-            if (id_card.services.length > 0)
+            if (id_card.services.size > 0)
             {
                 foreach (string service in id_card.services)
                 {
@@ -177,26 +190,10 @@ public class IdentityManagerView : Window {
         filter.set_visible_func(visible_func);
     }
 
-    private void search_entry_icon_press_cb(EntryIconPosition pos, Gdk.Event event)
-    {
-        if (pos == EntryIconPosition.PRIMARY)
-        {
-            print("Search entry icon pressed\n");
-        }
-        else
-        {
-            this.search_entry.set_text("");
-        }
-    }
-
     private void search_entry_text_changed_cb()
     {
         this.filter.refilter();
         redraw_id_card_widgets();
-
-        var has_text = this.search_entry.get_text_length() > 0;
-        this.search_entry.set_icon_sensitive(EntryIconPosition.PRIMARY, has_text);
-        this.search_entry.set_icon_sensitive(EntryIconPosition.SECONDARY, has_text);
     }
 
     private bool search_entry_key_press_event_cb(Gdk.EventKey e)
@@ -212,12 +209,6 @@ public class IdentityManagerView : Window {
     private void load_id_cards() {
         logger.trace("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;
-        }
-
         custom_vbox.clear();
         this.listmodel->clear();
         LinkedList<IdCard> card_list = identities_manager.get_card_list() ;
@@ -226,12 +217,9 @@ public class IdentityManagerView : Window {
         }
 
         foreach (IdCard id_card in card_list) {
+            logger.trace(@"load_id_cards: Loading card with display name '$(id_card.display_name)'");
             add_id_card_data(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);
-                id_card_widget.expand();
-            }
+            add_id_card_widget(id_card);
         }
     }
     
@@ -242,7 +230,12 @@ public class IdentityManagerView : Window {
         id_card.username = dialog.username;
         id_card.password = dialog.password;
         id_card.store_password = dialog.store_password;
-        id_card.services = dialog.get_services();
+
+        id_card.update_services_from_list(dialog.get_services());
+
+        if (dialog.clear_trust_anchor) {
+            id_card.clear_trust_anchor();
+        }
 
         return id_card;
     }
@@ -261,49 +254,44 @@ public class IdentityManagerView : Window {
                        Columns.PASSWORD_COL, id_card.password);
     }
 
-    private void remove_id_card_data(IdCard id_card)
+    private IdCardWidget add_id_card_widget(IdCard id_card)
     {
-        TreeIter iter;
-        string issuer;
+        logger.trace("add_id_card_widget: id_card.nai='%s'; selected nai='%s'"
+                     .printf(id_card.nai, 
+                             this.selected_idcard == null ? "[null selection]" : this.selected_idcard.nai));
 
-        if (listmodel->get_iter_first(out iter))
-        {
-            do
-            {
-                listmodel->get(iter,
-                               Columns.ISSUER_COL, out issuer);
 
-                if (id_card.issuer == issuer)
-                {
-                    listmodel->remove(iter);
-                    break;
-                }
-            }
-            while (listmodel->iter_next(ref iter));
-        }
-    }
-
-    private IdCardWidget add_id_card_widget(IdCard id_card)
-    {
-        var id_card_widget = new IdCardWidget(id_card);
+        var id_card_widget = new IdCardWidget(id_card, this);
         this.custom_vbox.add_id_card_widget(id_card_widget);
         id_card_widget.expanded.connect(this.widget_selected_cb);
         id_card_widget.collapsed.connect(this.widget_unselected_cb);
+
+        if (this.selected_idcard != null && this.selected_idcard.nai == id_card.nai) {
+            logger.trace(@"add_id_card_widget: Expanding selected idcard widget");
+            id_card_widget.expand();
+        }
         return id_card_widget;
     }
 
     private void widget_selected_cb(IdCardWidget id_card_widget)
     {
-        this.remove_button.set_sensitive(true);
+        logger.trace(@"widget_selected_cb: id_card_widget.id_card.display_name='$(id_card_widget.id_card.display_name)'");
+
+        this.selected_idcard = id_card_widget.id_card;
+        bool allow_removes = !id_card_widget.id_card.is_no_identity();
+        this.remove_button.set_sensitive(allow_removes);
         this.edit_button.set_sensitive(true);
         this.custom_vbox.receive_expanded_event(id_card_widget);
 
-        if (this.request_queue.length > 0)
+        if (this.selection_in_progress())
              this.send_button.set_sensitive(true);
     }
 
     private void widget_unselected_cb(IdCardWidget id_card_widget)
     {
+        logger.trace(@"widget_unselected_cb: id_card_widget.id_card.display_name='$(id_card_widget.id_card.display_name)'");
+
+        this.selected_idcard = null;
         this.remove_button.set_sensitive(false);
         this.edit_button.set_sensitive(false);
         this.custom_vbox.receive_collapsed_event(id_card_widget);
@@ -311,7 +299,7 @@ public class IdentityManagerView : Window {
         this.send_button.set_sensitive(false);
     }
 
-    public bool add_identity(IdCard id_card, bool force_flat_file_store)
+    public bool add_identity(IdCard id_card, bool force_flat_file_store, out ArrayList<IdCard>? old_duplicates=null)
     {
         #if OS_MACOS
         /* 
@@ -322,11 +310,16 @@ public class IdentityManagerView : Window {
         #else
         Gtk.MessageDialog dialog;
         IdCard? prev_id = identities_manager.find_id_card(id_card.nai, force_flat_file_store);
-        logger.trace("add_identity: find_id_card returned " + (prev_id != null ? "non-null" : "null"));
+        logger.trace("add_identity(flat=%s, card='%s'): find_id_card returned %s"
+                     .printf(force_flat_file_store.to_string(), id_card.display_name, (prev_id != null ? prev_id.display_name : "null")));
         if (prev_id!=null) {
             int flags = prev_id.Compare(id_card);
             logger.trace("add_identity: compare returned " + flags.to_string());
             if (flags == 0) {
+                if (&old_duplicates != null) {
+                    old_duplicates = new ArrayList<IdCard>();
+                }
+
                 return false; // no changes, no need to update
             } else if ((flags & (1 << IdCard.DiffFlags.DISPLAY_NAME)) != 0) {
                 dialog = new Gtk.MessageDialog(this,
@@ -359,10 +352,15 @@ public class IdentityManagerView : Window {
         #endif
 
         if (ret == Gtk.ResponseType.YES) {
-            this.identities_manager.add_card(id_card, force_flat_file_store);
+            this.identities_manager.add_card(id_card, force_flat_file_store, out old_duplicates);
             return true;
         }
-        return false;
+        else {
+            if (&old_duplicates != null) {
+                old_duplicates = new ArrayList<IdCard>();
+            }
+            return false;
+        }
     }
 
     private void add_identity_cb()
@@ -399,11 +397,14 @@ public class IdentityManagerView : Window {
         dialog.destroy();
     }
 
-    private void remove_identity(IdCardWidget id_card_widget)
+    private void remove_identity(IdCard id_card)
     {
-        var id_card = id_card_widget.id_card;
-        this.custom_vbox.remove_id_card_widget(id_card_widget);
+        logger.trace(@"remove_identity: id_card.display_name='$(id_card.display_name)'");
+        if (id_card != this.selected_idcard) {
+            logger.error("remove_identity: id_card != this.selected_idcard!");
+        }
 
+        this.selected_idcard = null;
         this.identities_manager.remove_card(id_card);
 
         // Nothing is selected, so disable buttons
@@ -414,8 +415,6 @@ public class IdentityManagerView : Window {
 
     private void redraw_id_card_widgets()
     {
-        logger.trace("redraw_id_card_widgets");
-
         TreeIter iter;
         IdCard id_card;
 
@@ -434,10 +433,8 @@ public class IdentityManagerView : Window {
         }
     }
 
-    private void remove_identity_cb(IdCardWidget id_card_widget)
+    private void remove_identity_cb(IdCard id_card)
     {
-        var id_card = id_card_widget.id_card;
-
         bool remove = WarningDialog.confirm(this, 
                                             Markup.printf_escaped(
                                                 "<span font-weight='heavy'>You are about to remove the identity '%s'.</span>",
@@ -445,7 +442,7 @@ public class IdentityManagerView : Window {
                                             + "\n\nAre you sure you want to do this?",
                                             "delete_idcard");
         if (remove) 
-            remove_identity(id_card_widget);
+            remove_identity(id_card);
     }
 
     private void set_prompting_service(string service)
@@ -478,16 +475,25 @@ public class IdentityManagerView : Window {
 
     public void queue_identity_request(IdentityRequest request)
     {
-        if (this.request_queue.is_empty())
+        bool queue_was_empty = !this.selection_in_progress();
+        this.request_queue.push_tail(request);
+
+        if (queue_was_empty)
         { /* setup widgets */
             candidates = request.candidates;
             filter.refilter();
             redraw_id_card_widgets();
             set_prompting_service(request.service);
             remember_identity_binding.show();
+
+            if (this.selected_idcard != null
+                && this.custom_vbox.find_idcard_widget(this.selected_idcard) != null) {
+                // A widget is already selected, and has not been filtered out of the display via search
+                send_button.set_sensitive(true);
+            }
+
             make_visible();
         }
-        this.request_queue.push_tail(request);
     }
 
 
@@ -511,7 +517,7 @@ public class IdentityManagerView : Window {
         IdCard retval = identity;
         bool idcard_has_pw = (identity.password != null) && (identity.password != "");
         bool request_has_pw = (request.password != null) && (request.password != "");
-        if ((!idcard_has_pw) && (!identity.IsNoIdentity())) {
+        if ((!idcard_has_pw) && (!identity.is_no_identity())) {
             if (request_has_pw) {
                 identity.password = request.password;
                 retval = model.update_card(identity);
@@ -539,15 +545,20 @@ public class IdentityManagerView : Window {
 
     private void send_identity_cb(IdCard id)
     {
-        send_button.set_sensitive(false);
+        return_if_fail(this.selection_in_progress());
 
-        IdCard identity = id;
-        return_if_fail(request_queue.length > 0);
+        if (!check_and_confirm_trust_anchor(id)) {
+            // Allow user to pick again
+            return;
+        }
 
-        candidates = null;
         var request = this.request_queue.pop_head();
-        identity = check_add_password(identity, request, identities_manager);
-        if (this.request_queue.is_empty())
+        var identity = check_add_password(id, request, identities_manager);
+        send_button.set_sensitive(false);
+
+        candidates = null;
+      
+        if (!this.selection_in_progress())
         {
             candidates = null;
             clear_selection_prompts();
@@ -566,7 +577,7 @@ public class IdentityManagerView : Window {
         filter.refilter();
         redraw_id_card_widgets();
 
-        if ((identity != null) && (!identity.IsNoIdentity()))
+        if ((identity != null) && (!identity.is_no_identity()))
             parent_app.default_id_card = identity;
 
         request.return_identity(identity, remember_identity_binding.active);
@@ -575,27 +586,40 @@ public class IdentityManagerView : Window {
         remember_identity_binding.hide();
     }
 
-    // private void label_make_bold(Label label)
-    // {
-    //     var font_desc = new Pango.FontDescription();
+    private bool check_and_confirm_trust_anchor(IdCard id)
+    {
+        if (!id.trust_anchor.is_empty() && id.trust_anchor.get_anchor_type() == TrustAnchor.TrustAnchorType.SERVER_CERT) {
+            if (!id.trust_anchor.user_verified) {
 
-    //     font_desc.set_weight(Pango.Weight.BOLD);
+                bool ret = false;
+                int result = ResponseType.CANCEL;
+                var dialog = new TrustAnchorDialog(id, this);
+                while (!dialog.complete)
+                    result = dialog.run();
 
-    //     /* This will only affect the weight of the font, the rest is
-    //      * from the current state of the widget, which comes from the
-    //      * theme or user prefs, since the font desc only has the
-    //      * weight flag turned on.
-    //      */
-    //     label.modify_font(font_desc);
-    // }
+                switch (result) {
+                case ResponseType.OK:
+                    id.trust_anchor.user_verified = true;
+                    ret = true;
+                    break;
+                default:
+                    break;
+                }
+
+                dialog.destroy();
+                return ret;
+            }
+        }
+        return true;
+    }
 
     private void on_about_action()
     {
-        string copyright = "Copyright 2011, 2016 JANET";
+        string copyright = "Copyright (c) 2011, %d JANET".printf(LATEST_EDIT_YEAR);
 
         string license =
         """
-Copyright (c) 2011, 2016 JANET(UK)
+Copyright (c) 2011, %d JANET(UK)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -624,18 +648,24 @@ 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.
-""";
-
-        Gtk.show_about_dialog(this,
-                              "comments", _("Moonshot project UI"),
-                              "copyright", copyright,
-                              "website", Config.PACKAGE_URL,
-                              "version", Config.PACKAGE_VERSION,
-                              "license", license,
-                              "website-label", _("Visit the Moonshot project web site"),
-                              "translator-credits", _("translator-credits"),
-                              null
-            );
+""".printf(LATEST_EDIT_YEAR);
+
+        AboutDialog about = new AboutDialog();
+
+        about.set_comments(_("Moonshot project UI"));
+        about.set_copyright(copyright);
+        about.set_website(Config.PACKAGE_URL);
+        about.set_website_label(_("Visit the Moonshot project web site"));
+
+        // Note: The package version is configured at the top of moonshot/ui/configure.ac
+        about.set_version(Config.PACKAGE_VERSION);
+        about.set_license(license);
+        about.set_modal(true);
+        about.set_transient_for(this);
+        about.response.connect((a, b) => {about.destroy();});
+        about.modify_bg(StateType.NORMAL, white);
+        
+        about.run();
     }
 
     private Gtk.ActionEntry[] create_actions() {
@@ -682,33 +712,57 @@ SUCH DAMAGE.
     private void build_ui()
     {
         // Note: On Debian7/Gtk+2, the menu bar remains gray. This doesn't happen on Debian8/Gtk+3.
-        Gdk.Color white = Gdk.Color();
-        white.red = white.green = white.blue = 65535;
         this.modify_bg(StateType.NORMAL, white);
 
         create_ui_manager();
 
+        int num_rows = 18;
+        int num_cols = 8;
+        int button_width = 1;
+
+        Table top_table = new Table(num_rows, 10, false);
+        top_table.set_border_width(12);
+
+        AttachOptions fill_and_expand = AttachOptions.EXPAND | AttachOptions.FILL;
+        AttachOptions fill = AttachOptions.FILL;
+        int row = 0;
+
+        service_prompt_vbox = new VBox(false, 0);
+        top_table.attach(service_prompt_vbox, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 12, 0);
+        row++;
+
+        string search_tooltip_text = _("Search for an identity or service");
         this.search_entry = new Entry();
 
         set_atk_name_description(search_entry, _("Search entry"), _("Search for a specific ID Card"));
-        this.search_entry.set_icon_from_pixbuf(EntryIconPosition.PRIMARY,
-                                               find_icon_sized("edit-find", Gtk.IconSize.MENU));
-        this.search_entry.set_icon_tooltip_text(EntryIconPosition.PRIMARY,
-                                                _("Search for an identity or service"));
-        this.search_entry.set_icon_sensitive(EntryIconPosition.PRIMARY, false);
-
         this.search_entry.set_icon_from_pixbuf(EntryIconPosition.SECONDARY,
-                                               find_icon_sized("process-stop", Gtk.IconSize.MENU));
+                                               find_icon_sized("edit-find", Gtk.IconSize.MENU));
         this.search_entry.set_icon_tooltip_text(EntryIconPosition.SECONDARY,
-                                                _("Clear the current search"));
-        this.search_entry.set_icon_sensitive(EntryIconPosition.SECONDARY, false);
+                                                search_tooltip_text);
 
+        this.search_entry.set_tooltip_text(search_tooltip_text);
+
+        this.search_entry.set_icon_sensitive(EntryIconPosition.SECONDARY, false);
 
-        this.search_entry.icon_press.connect(search_entry_icon_press_cb);
         this.search_entry.notify["text"].connect(search_entry_text_changed_cb);
         this.search_entry.key_press_event.connect(search_entry_key_press_event_cb);
-        this.search_entry.set_width_chars(30);
+        this.search_entry.set_width_chars(24);
 
+        var search_label_markup ="<small>" + search_tooltip_text + "</small>";
+        var full_search_label = new Label(null);
+        full_search_label.set_markup(search_label_markup);
+        full_search_label.set_alignment(1, 0);
+
+        var search_vbox = new VBox(false, 0);
+        search_vbox.pack_start(search_entry, false, false, 0);
+        var search_spacer = new Alignment(0, 0, 0, 0);
+        search_spacer.set_size_request(0, 2);
+        search_vbox.pack_start(search_spacer, false, false, 0);
+        search_vbox.pack_start(full_search_label, false, false, 0);
+
+        // Overlap with the service_prompt_box
+        top_table.attach(search_vbox, 5, num_cols - button_width, row - 1, row + 1, fill_and_expand, fill, 0, 12);
+        row++;
 
         this.custom_vbox = new CustomVBox(this, false, 2);
 
@@ -720,74 +774,46 @@ SUCH DAMAGE.
         id_scrollwin.set_policy(PolicyType.NEVER, PolicyType.AUTOMATIC);
         id_scrollwin.set_shadow_type(ShadowType.IN);
         id_scrollwin.add_with_viewport(viewport);
+        top_table.attach(id_scrollwin, 0, num_cols - 1, row, num_rows - 1, fill_and_expand, fill_and_expand, 6, 0);
 
-        service_prompt_vbox = new VBox(false, 0);
-
-        var vbox_left = new VBox(false, 0);
-        vbox_left.pack_start(service_prompt_vbox, false, false, 12);
-
-        var search_hbox = new HBox(false, 6);
-        search_hbox.pack_end(search_entry, false, false, 0);
-        //// var search_label = new Label(_("Search:"));
-        //// search_label.set_alignment(1, (float) 0.5);
-        //// set_atk_relation(search_label, search_entry, Atk.RelationType.LABEL_FOR);
-        //// search_hbox.pack_end(search_label, false, false, 6);
-
-        var full_search_label = new Label(_("Search for an identity or service"));
-        full_search_label.set_alignment(1, 0);
-        var search_vbox = new VBox(false, 4);
-        search_vbox.pack_start(full_search_label, false, false, 0);
-        search_vbox.pack_start(search_hbox, false, false, 0);
-
-        var inner_left_vbox = new VBox(false, 6);
-        inner_left_vbox.pack_start(search_vbox, false, false, 6);
-//        inner_left_vbox.pack_start(selection_prompt, false, false, 6);
-        inner_left_vbox.pack_start(id_scrollwin, true, true, 0);
-
-        var id_and_button_box = new HBox(false, 6);
-        id_and_button_box.pack_start(inner_left_vbox, true, true, 6);
-        vbox_left.pack_start(id_and_button_box, true, true, 0);
-        // vbox_left.pack_start(prompting_service, false, false, 6);
-        vbox_left.set_size_request(WINDOW_WIDTH, 0);
-
-        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_line_wrap(true);
-        no_identity_title.show();
-
-        this.vbox_right = new VBox(false, 6);
+        // Right below id_scrollwin:
+        remember_identity_binding = new CheckButton.with_label(_("Remember my identity choice for this service"));
+        remember_identity_binding.active = false;
+        top_table.attach(remember_identity_binding, 0, num_cols / 2, num_rows - 1, num_rows, fill_and_expand, fill_and_expand, 3, 0);
 
         var add_button = new Button.with_label(_("Add"));
         add_button.clicked.connect((w) => {add_identity_cb();});
+        top_table.attach(make_rigid(add_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+        row++;
+
+        var import_button = new Button.with_label(_("Import"));
+        import_button.clicked.connect((w) => {import_identities_cb();});
+        top_table.attach(make_rigid(import_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+        row++;
 
         this.edit_button = new Button.with_label(_("Edit"));
-        edit_button.clicked.connect((w) => {edit_identity_cb(custom_vbox.current_idcard.id_card);});
+        edit_button.clicked.connect((w) => {edit_identity_cb(this.selected_idcard);});
         edit_button.set_sensitive(false);
+        top_table.attach(make_rigid(edit_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+        row++;
 
         this.remove_button = new Button.with_label(_("Remove"));
-        remove_button.clicked.connect((w) => {remove_identity_cb(custom_vbox.current_idcard);});
+        remove_button.clicked.connect((w) => {remove_identity_cb(this.selected_idcard);});
         remove_button.set_sensitive(false);
+        top_table.attach(make_rigid(remove_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+        row++;
 
+        // push the send button down another row.
+        row++;
         this.send_button = new Button.with_label(_("Send"));
-        send_button.clicked.connect((w) => {send_identity_cb(custom_vbox.current_idcard.id_card);});
+        send_button.clicked.connect((w) => {send_identity_cb(this.selected_idcard);});
         // send_button.set_visible(false);
         send_button.set_sensitive(false);
-
-        var empty_box = new VBox(false, 0);
-        empty_box.set_size_request(0, 0);
-        vbox_right.pack_start(empty_box, false, false, 14);
-        vbox_right.pack_start(add_button, false, false, 6);
-        vbox_right.pack_start(edit_button, false, false, 6);
-        vbox_right.pack_start(remove_button, false, false, 6);
-        vbox_right.pack_start(send_button, false, false, 24);
-
-        id_and_button_box.pack_start(vbox_right, false, false, 0);
+        top_table.attach(make_rigid(send_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+        row++;
 
         var main_vbox = new VBox(false, 0);
 
-        // Note: This places a border above the menubar. Is that what we want?
-        main_vbox.set_border_width(12);
-
 #if OS_MACOS
         // hide the  File | Quit menu item which is now on the Mac Menu
 //        Gtk.Widget quit_item =  this.ui_manager.get_widget("/MenuBar/FileMenu/Quit");
@@ -805,19 +831,19 @@ SUCH DAMAGE.
         main_vbox.pack_start(menubar, false, false, 0);
         menubar.modify_bg(StateType.NORMAL, white);
 #endif
-        main_vbox.pack_start(vbox_left, true, true, 0);
-
-        remember_identity_binding = new CheckButton.with_label(_("Remember my identity choice for this service"));
-        remember_identity_binding.active = false;
-        main_vbox.pack_start(remember_identity_binding, false, false, 6);
+        main_vbox.pack_start(top_table, true, true, 6);
 
         add(main_vbox);
         main_vbox.show_all();
 
-        if (this.request_queue.length == 0)
+        if (!this.selection_in_progress())
             remember_identity_binding.hide();
     } 
 
+    internal bool selection_in_progress() {
+        return !this.request_queue.is_empty();
+    }
+
     private void set_atk_name_description(Widget widget, string name, string description)
     {
         var atk_widget = widget.get_accessible();
@@ -828,7 +854,103 @@ SUCH DAMAGE.
 
     private void connect_signals()
     {
-        this.destroy.connect(Gtk.main_quit);
+        this.destroy.connect(() => {
+                logger.trace("Destroy event; calling Gtk.main_quit()");
+                Gtk.main_quit();
+            });
         this.identities_manager.card_list_changed.connect(this.on_card_list_changed);
+        this.delete_event.connect(() => {return confirm_quit();});
+    }
+
+    private bool confirm_quit() {
+        logger.trace("delete_event intercepted; selection_in_progress()=" + selection_in_progress().to_string());
+
+        if (selection_in_progress()) {
+            var result = WarningDialog.confirm(this,
+                                               Markup.printf_escaped(
+                                                   "<span font-weight='heavy'>" + _("Do you wish to use the %s service?") + "</span>",
+                                                   this.request_queue.peek_head().service)
+                                               + "\n\n" + _("Select Yes to select an ID for this service, or No to cancel"),
+                                               "close_moonshot_window");
+            if (result) {
+                // Prevent other handlers from handling this event; this keeps the window open.
+                return true; 
+            }
+        }
+
+        // Allow the window deletion to proceed.
+        return false;
+    }
+
+    private static Widget make_rigid(Button button) 
+    {
+        // Hack to prevent the button from growing vertically
+        VBox fixed_height = new VBox(false, 0);
+        fixed_height.pack_start(button, false, false, 0);
+
+        return fixed_height;
+    }
+
+    private void import_identities_cb() {
+        var dialog = new FileChooserDialog(_("Import File"),
+                                           this,
+                                           FileChooserAction.OPEN,
+                                           _("Cancel"),ResponseType.CANCEL,
+                                           _("Open"), ResponseType.ACCEPT,
+                                           null);
+
+        if (import_directory != null) {
+            dialog.set_current_folder(import_directory);
+        }
+
+        if (dialog.run() == ResponseType.ACCEPT)
+        {
+            // Save the parent directory to use as default for next save
+            string filename = dialog.get_filename();
+            var file  = File.new_for_path(filename);
+            import_directory = file.get_parent().get_path();
+
+            int import_count = 0;
+
+            var webp = new Parser(filename);
+            dialog.destroy();
+            webp.parse();
+            logger.trace(@"import_identities_cb: Have $(webp.cards.length) IdCards");
+            foreach (IdCard card in webp.cards)
+            {
+
+                if (card == null) {
+                    logger.trace(@"import_identities_cb: Skipping null IdCard");
+                    continue;
+                }
+
+                if (!card.trust_anchor.is_empty()) {
+                    string ta_datetime_added = TrustAnchor.format_datetime_now();
+                    card.trust_anchor.set_datetime_added(ta_datetime_added);
+                    logger.trace("import_identities_cb : Set ta_datetime_added for '%s' to '%s'; ca_cert='%s'; server_cert='%s'"
+                                 .printf(card.display_name, ta_datetime_added, card.trust_anchor.ca_cert, card.trust_anchor.server_cert));
+                }
+
+
+                bool result = add_identity(card, use_flat_file_store);
+                if (result) {
+                    logger.trace(@"import_identities_cb: Added or updated '$(card.display_name)'");
+                    import_count++;
+                }
+                else {
+                    logger.trace(@"import_identities_cb: Did not add or update '$(card.display_name)'");
+                }
+            }
+            var msg_dialog = new Gtk.MessageDialog(this,
+                                               Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                                               Gtk.MessageType.INFO,
+                                               Gtk.ButtonsType.OK,
+                                               _("Import completed. %d Identities were added or updated."),
+                                               import_count);
+            msg_dialog.run();
+            msg_dialog.destroy();
+        }
+        dialog.destroy();
     }
+
 }