/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
_("Automatically check signatures"));
- PACK_FRAME(vbox1, frame_passphrase, _("Passphrase"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame_passphrase), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_passphrase, _("Passphrase"));
PACK_CHECK_BUTTON (vbox2, checkbtn_store_passphrase,
_("Store passphrase in memory"));
gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
gtk_widget_show(vbox);
- PACK_FRAME (vbox, frame1, _("Sign key"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame1), vbox2);
+ vbox2 = gtkut_get_options_frame(vbox, &frame1, _("Sign key"));
hbox = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox);
key_default = gtk_radio_button_new_with_label(key_group,
_("Use default GnuPG key"));
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_default));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_default));
gtk_widget_show(key_default);
gtk_box_pack_start(GTK_BOX(hbox), key_default, FALSE, FALSE, 0);
key_by_from = gtk_radio_button_new_with_label(key_group,
_("Select key by your email address"));
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_by_from));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_by_from));
gtk_widget_show(key_by_from);
gtk_box_pack_start(GTK_BOX(hbox), key_by_from, FALSE, FALSE, 0);
key_custom = gtk_radio_button_new_with_label(key_group,
_("Specify key manually"));
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_custom));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_custom));
gtk_widget_show(key_custom);
gtk_box_pack_start(GTK_BOX(hbox), key_custom, FALSE, FALSE, 0);
break;
}
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
new_key_box = gtk_hbox_new(FALSE, 6);
-
+ gtk_widget_show(new_key_box);
+ gtk_box_pack_start(GTK_BOX(hbox), new_key_box, FALSE, FALSE, 0);
+
image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_SMALL_TOOLBAR);
_("No secret key found."));
gtk_box_pack_start(GTK_BOX(new_key_box), new_key_label, FALSE, FALSE, 0);
- new_key_btn = gtk_button_new_with_label(_("Generate new secret key"));
-
- gtk_box_pack_start(GTK_BOX(vbox2), new_key_box, FALSE, FALSE, 0);
-
- hbox = gtk_hbox_new (FALSE, 5);
- gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), new_key_btn, FALSE, FALSE, 0);
-
- gtk_widget_show_all(new_key_box);
+ new_key_btn = gtk_button_new_with_label(_("Generate a new key pair"));
gtk_widget_show(new_key_btn);
+ gtk_box_pack_start(GTK_BOX(hbox), new_key_btn, FALSE, FALSE, 0);
if (config->sign_key_id != NULL)
gtk_entry_set_text(GTK_ENTRY(keyid), config->sign_key_id);