X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmoonshot-identity-dialog.vala;h=7872fb4abfa6b8dfe203525ae9c88836374b43e0;hb=50a68a489a85a8a57280a3a53d1ee9f589fb3487;hp=d6ecf24454be9ea627f277eba3a0d33beddc3df6;hpb=e9560299e59bf0845693d3b0c79b4deb4c7a9a68;p=moonshot-ui.git diff --git a/src/moonshot-identity-dialog.vala b/src/moonshot-identity-dialog.vala index d6ecf24..7872fb4 100644 --- a/src/moonshot-identity-dialog.vala +++ b/src/moonshot-identity-dialog.vala @@ -69,6 +69,9 @@ class IdentityDialog : Dialog private Label selected_item = null; + // Whether to clear the card's TrustAnchor after the user selects OK + internal bool clear_trust_anchor = false; + public string display_name { get { return displayname_entry.get_text(); } } @@ -177,6 +180,9 @@ class IdentityDialog : Dialog if (!is_new_card) { + Widget trust_anchor_box = make_trust_anchor_box(card); + content_area.pack_start(trust_anchor_box, false, false, 15); + var services_vbox = make_services_vbox(); content_area.pack_start(services_vbox); } @@ -196,6 +202,78 @@ class IdentityDialog : Dialog this.show_all(); } + private Widget make_trust_anchor_box(IdCard id) + { + + Label ta_label = new Label(_("Trust anchor: ") + + (id.trust_anchor.is_empty() ? _("None") : _("Enterprise provisioned"))); + ta_label.set_alignment(0, 0.5f); + + if (id.trust_anchor.is_empty()) { + return ta_label; + } + + + AttachOptions opts = AttachOptions.EXPAND | AttachOptions.FILL; + AttachOptions fill = AttachOptions.FILL; + + Table ta_table = new Table(6, 2, false); + int row = 0; + + var ta_clear_button = new Button.with_label(_("Clear Trust Anchor")); + ta_clear_button.clicked.connect((w) => { + clear_trust_anchor = true; + ta_table.set_sensitive(false); + } + ); + + ta_table.attach(ta_label, 0, 1, row, row + 1, opts, opts, 0, 0); + ta_table.attach(ta_clear_button, 1, 2, row, row + 1, fill, fill, 0, 0); + row++; + + //!!TODO + Label added_label = new Label(_("Added on: N/A")); + added_label.set_alignment(0, 0.5f); + ta_table.attach(added_label, 0, 1, row, row + 1, opts, opts, 20, 5); + row++; + + if (id.trust_anchor.get_anchor_type() == TrustAnchor.TrustAnchorType.SERVER_CERT) { + Widget fingerprint = make_ta_fingerprint_widget(id.trust_anchor); + ta_table.attach(fingerprint, 0, 2, row, row + 2, opts, opts, 20, 5); + } + else { + Label ca_cert_label = new Label(_("CA Certificate:")); + ca_cert_label.set_alignment(0, 0.5f); + var export_button = new Button.with_label(_("Export Certificate")); + //!!TODO! + export_button.clicked.connect((w) => {/* !!TODO! */}); + + ta_table.attach(ca_cert_label, 0, 1, row, row + 1, opts, opts, 20, 0); + ta_table.attach(export_button, 1, 2, row, row + 1, fill, fill, 0, 0); + row++; + + //!!TODO: When to show Subject, and when (if ever) show Subject-Altname here? + Label subject_label = new Label(_("Subject: ") + id.trust_anchor.subject); + subject_label.set_alignment(0, 0.5f); + ta_table.attach(subject_label, 0, 1, row, row + 1, opts, opts, 40, 5); + row++; + + Label expiration_label = new Label(_("Expiration date: ") + id.trust_anchor.get_expiration_date()); + expiration_label.set_alignment(0, 0.5f); + ta_table.attach(expiration_label, 0, 1, row, row + 1, opts, opts, 40, 5); + row++; + + //!!TODO: What *is* this? + Label constraint_label = new Label(_("Constraint: ")); + constraint_label.set_alignment(0, 0.5f); + ta_table.attach(constraint_label, 0, 1, row, row + 1, opts, opts, 20, 0); + row++; + } + + return ta_table; + + } + private static void add_as_vbox(Box content_area, Label label, Entry entry) { VBox vbox = new VBox(false, 2); @@ -287,7 +365,7 @@ class IdentityDialog : Dialog { logger.trace("make_services_vbox"); - var services_vbox_alignment = new Alignment(0, 0, 1, 1); + var services_vbox_alignment = new Alignment(0, 0, 1, 0); var services_vscroll = new ScrolledWindow(null, null); services_vscroll.set_policy(PolicyType.NEVER, PolicyType.AUTOMATIC); services_vscroll.set_shadow_type(ShadowType.IN); @@ -313,7 +391,7 @@ class IdentityDialog : Dialog // Hack to prevent the button from growing vertically VBox fixed_height = new VBox(false, 0); fixed_height.pack_start(remove_button, false, false, 0); - table_button_hbox.pack_start(fixed_height, false, false, 6); + table_button_hbox.pack_start(fixed_height, false, false, 0); // A table doesn't have a background color, so put it in an EventBox, and // set the EventBox's background color instead. @@ -324,17 +402,18 @@ class IdentityDialog : Dialog var services_vbox_title = new Label(_("Services:")); label_make_bold(services_vbox_title); - services_vbox_title.set_alignment(0, (float) 0.5); + services_vbox_title.set_alignment(0, 0.5f); var services_vbox = new VBox(false, 6); - services_vbox.pack_start(services_vbox_title, false, false, 6); - services_vbox.pack_start(table_button_hbox, true, true, 6); + services_vbox.pack_start(services_vbox_title, false, false, 0); + services_vbox.pack_start(table_button_hbox, true, true, 0); int i = 0; foreach (string service in card.services) { var label = new Label(service); label.set_alignment((float) 0, (float) 0); + label.xpad = 3; EventBox event_box = new EventBox(); event_box.modify_bg(StateType.NORMAL, white); @@ -368,8 +447,7 @@ class IdentityDialog : Dialog return false; }); - AttachOptions opts = AttachOptions.EXPAND | AttachOptions.FILL; - services_table.attach(event_box, 0, 1, i, i+1, opts, opts, 3, 0); + services_table.attach_defaults(event_box, 0, 1, i, i+1); i++; } @@ -396,6 +474,4 @@ class IdentityDialog : Dialog return services_vbox; } - - }