#endif
+// For use when exporting certificates.
+static string export_directory = null;
+
class IdentityDialog : Dialog
{
private static Gdk.Color white = make_color(65535, 65535, 65535);
add_as_vbox(content_area, realm_label, realm_entry);
add_as_vbox(content_area, password_label, password_entry);
- // var entries = new VBox(false, 6);
- // add_as_vbox(entries, displayname_label, displayname_entry);
- // add_as_vbox(entries, realm_label, realm_entry);
- // add_as_vbox(entries, username_label, username_entry);
- // add_as_vbox(entries, password_label, password_entry);
- // content_area.pack_start(entries, false, false, 0);
-
var remember_hbox = new HBox(false, 40);
remember_hbox.pack_start(new HBox(false, 0), false, false, 0);
remember_hbox.pack_start(remember_checkbutton, false, false, 0);
content_area.pack_start(remember_hbox, false, false, 2);
- // content_area.pack_start(remember_checkbutton, false, false, 2);
this.response.connect(on_response);
content_area.set_border_width(6);
var services_vbox = make_services_vbox();
content_area.pack_start(services_vbox);
+ var services_vbox_bottom_spacer = new Alignment(0, 0, 0, 0);
+ services_vbox_bottom_spacer.set_size_request(0, 12);
+ content_area.pack_start(services_vbox_bottom_spacer, false, false, 0);
}
if (card.is_no_identity())
}
- AttachOptions opts = AttachOptions.EXPAND | AttachOptions.FILL;
+ AttachOptions fill_and_expand = AttachOptions.EXPAND | AttachOptions.FILL;
AttachOptions fill = AttachOptions.FILL;
Table ta_table = new Table(6, 2, false);
}
);
- ta_table.attach(ta_label, 0, 1, row, row + 1, opts, opts, 0, 0);
+ ta_table.attach(ta_label, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 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"));
+ Label added_label = new Label(_("Added : " + id.trust_anchor.datetime_added));
added_label.set_alignment(0, 0.5f);
- ta_table.attach(added_label, 0, 1, row, row + 1, opts, opts, 20, 5);
+ ta_table.attach(added_label, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 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);
+ ta_table.attach(fingerprint, 0, 1, row, row + 2, fill_and_expand, fill_and_expand, 5, 5);
+
+ // To make the fingerprint box wider, try:
+ // ta_table.attach(fingerprint, 0, 2, row, row + 2, fill_and_expand, fill_and_expand, 20, 5);
+
}
else {
Label ca_cert_label = new Label(_("CA Certificate:"));
//!!TODO!
export_button.clicked.connect((w) => {export_certificate(id);});
- ta_table.attach(ca_cert_label, 0, 1, row, row + 1, opts, opts, 20, 0);
+ ta_table.attach(ca_cert_label, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 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);
+ ta_table.attach(subject_label, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 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);
+ ta_table.attach(expiration_label, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 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);
+ ta_table.attach(constraint_label, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 20, 0);
row++;
}
}
}
- private static void label_make_bold(Label label)
- {
- var font_desc = new Pango.FontDescription();
-
- font_desc.set_weight(Pango.Weight.BOLD);
-
- /* 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);
- }
-
private VBox make_services_vbox()
{
logger.trace("make_services_vbox");
services_table.modify_bg(StateType.NORMAL, white);
var table_button_hbox = new HBox(false, 6);
- table_button_hbox.pack_start(services_vscroll, true, true, 6);
+ table_button_hbox.pack_start(services_vscroll, true, true, 4);
// Hack to prevent the button from growing vertically
VBox fixed_height = new VBox(false, 0);
services_vbox_alignment.add(table_bg);
var services_vbox_title = new Label(_("Services:"));
- label_make_bold(services_vbox_title);
services_vbox_title.set_alignment(0, 0.5f);
var services_vbox = new VBox(false, 6);
_("Save"), ResponseType.ACCEPT,
null);
dialog.set_do_overwrite_confirmation(true);
-// dialog.set_current_folder(default_folder_for_saving);
- //dialog.set_current_name("Untitled document");
+ if (export_directory != null) {
+ dialog.set_current_folder(export_directory);
+ }
+ // Remove slashes from the default filename.
+ string default_filename =
+ (id.display_name + ".pem").replace(Path.DIR_SEPARATOR_S, "_");
+ dialog.set_current_name(default_filename);
if (dialog.run() == ResponseType.ACCEPT)
{
+ // Export the certificate in PEM format.
+
const string CERT_HEADER = "-----BEGIN CERTIFICATE-----\n";
const string CERT_FOOTER = "\n-----END CERTIFICATE-----\n";
- // Normalize the certificate to PEM format:
- // 1) Strip any embedded newlines in the certificate...
+ // Strip any embedded newlines in the certificate...
string cert = id.trust_anchor.ca_cert.replace("\n", "");
- // 2), re-embed newlines every 64 chars.
+ // Re-embed newlines every 64 chars.
string newcert = CERT_HEADER;
while (cert.length > 63) {
- newcert += cert[0:63] + "\n";
- cert = cert[63:cert.length];
+ newcert += cert[0:64];
+ newcert += "\n";
+ cert = cert[64:cert.length];
}
if (cert.length > 0) {
newcert += cert;
- newcert += CERT_FOOTER;
}
+ newcert += CERT_FOOTER;
string filename = dialog.get_filename();
var file = File.new_for_path(filename);
var stream = file.replace(null, false, FileCreateFlags.PRIVATE);
stream.write(newcert.data);
+
+ // Save the parent directory to use as default for next save
+ export_directory = file.get_parent().get_path();
}
dialog.destroy();
}
projects / moonshot-ui.git / blobdiff