/*
* 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
#include "prefs.h"
#include "prefs_gtk.h"
#include "prefs_gpg.h"
+#include "sgpgme.h"
struct GPGConfig prefs_gpg;
NULL, NULL, NULL},
{"gpg_warning", "TRUE", &prefs_gpg.gpg_warning, P_BOOL,
NULL, NULL, NULL},
+ {"gpg_ask_create_key", "TRUE", &prefs_gpg.gpg_ask_create_key, P_BOOL,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
GtkWidget *checkbtn_gpg_warning;
};
-static void store_passphrase_toggled(GtkWidget *widget, gpointer data)
-{
- struct GPGPage *page = (struct GPGPage *)data;
- gtk_widget_set_sensitive(page->spinbtn_store_passphrase,
- gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->checkbtn_store_passphrase)));
-}
-
static void prefs_gpg_create_widget_func(PrefsPage *_page,
GtkWindow *window,
gpointer data)
struct GPGPage *page = (struct GPGPage *) _page;
struct GPGConfig *config;
- /*
- * BEGIN GLADE CODE
- * DO NOT EDIT
- */
- GtkWidget *table;
GtkWidget *checkbtn_passphrase_grab;
GtkWidget *checkbtn_store_passphrase;
GtkWidget *checkbtn_auto_check_signatures;
GtkWidget *checkbtn_gpg_warning;
GtkWidget *hbox1;
- GtkWidget *label11;
+ GtkWidget *vbox1, *vbox2;
+ GtkWidget *label_expire1;
GtkObject *spinbtn_store_passphrase_adj;
GtkWidget *spinbtn_store_passphrase;
- GtkWidget *label12;
+ GtkWidget *label_expire2;
+ GtkWidget *frame_passphrase;
GtkTooltips *tooltips;
- gchar *tmp;
tooltips = gtk_tooltips_new();
- table = gtk_table_new(5, 2, FALSE);
- gtk_widget_show(table);
- gtk_container_set_border_width(GTK_CONTAINER(table), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-
- checkbtn_passphrase_grab = gtk_check_button_new_with_label(_("Grab input while entering a passphrase"));
- gtk_widget_show(checkbtn_passphrase_grab);
- gtk_table_attach(GTK_TABLE(table), checkbtn_passphrase_grab, 0, 1,
- 3, 4, (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- checkbtn_store_passphrase = gtk_check_button_new_with_label(_("Store passphrase in memory"));
- gtk_widget_show(checkbtn_store_passphrase);
- gtk_table_attach(GTK_TABLE(table), checkbtn_store_passphrase, 0, 1,
- 1, 2, (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- checkbtn_auto_check_signatures =
- gtk_check_button_new_with_label(_("Automatically check signatures"));
- gtk_widget_show(checkbtn_auto_check_signatures);
- gtk_table_attach(GTK_TABLE(table), checkbtn_auto_check_signatures,
- 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- checkbtn_gpg_warning = gtk_check_button_new_with_label(_
- ("Display warning on startup if GnuPG doesn't work"));
- gtk_widget_show(checkbtn_gpg_warning);
- gtk_table_attach(GTK_TABLE(table), checkbtn_gpg_warning, 0, 1, 4,
- 5, (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- hbox1 = gtk_hbox_new(FALSE, 8);
- gtk_widget_show(hbox1);
- gtk_table_attach(GTK_TABLE(table), hbox1, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- tmp = g_strdup_printf(" %s", _("Expire after"));
- label11 = gtk_label_new(tmp);
- g_free(tmp);
- gtk_widget_show(label11);
- gtk_box_pack_start(GTK_BOX(hbox1), label11, FALSE, FALSE, 0);
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
+ _("Automatically check signatures"));
+
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_passphrase, _("Passphrase"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_store_passphrase,
+ _("Store passphrase in memory"));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ label_expire1 = gtk_label_new(_("Expire after"));
+ gtk_widget_show (label_expire1);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_expire1, FALSE, FALSE, 0);
spinbtn_store_passphrase_adj =
gtk_adjustment_new(1, 0, 1440, 1, 10, 10);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON
(spinbtn_store_passphrase), TRUE);
- label12 = gtk_label_new(_("minute(s)"));
- gtk_widget_show(label12);
- gtk_box_pack_start(GTK_BOX(hbox1), label12, TRUE, TRUE, 0);
- gtk_misc_set_alignment(GTK_MISC(label12), 0.0, 0.5);
- /*
- * END GLADE CODE
- */
+ label_expire2 = gtk_label_new(_("minute(s)"));
+ gtk_widget_show(label_expire2);
+ gtk_box_pack_start(GTK_BOX(hbox1), label_expire2, FALSE, FALSE, 0);
+ gtk_misc_set_alignment(GTK_MISC(label_expire2), 0.0, 0.5);
+
+ SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, label_expire1);
+ SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, spinbtn_store_passphrase);
+ SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, label_expire2);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_passphrase_grab,
+ _("Grab input while entering a passphrase"));
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_warning,
+ _("Display warning on startup if GnuPG doesn't work"));
config = prefs_gpg_get_config();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_passphrase_grab), config->passphrase_grab);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_gpg_warning), config->gpg_warning);
- gtk_widget_set_sensitive(spinbtn_store_passphrase,
- gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(checkbtn_store_passphrase)));
- g_signal_connect(G_OBJECT(checkbtn_store_passphrase), "toggled",
- G_CALLBACK(store_passphrase_toggled), page);
-
page->checkbtn_auto_check_signatures = checkbtn_auto_check_signatures;
page->checkbtn_store_passphrase = checkbtn_store_passphrase;
page->spinbtn_store_passphrase = spinbtn_store_passphrase;
page->checkbtn_passphrase_grab = checkbtn_passphrase_grab;
page->checkbtn_gpg_warning = checkbtn_gpg_warning;
- page->page.widget = table;
+ page->page.widget = vbox1;
}
static void prefs_gpg_destroy_widget_func(PrefsPage *_page)
GtkWidget *key_by_from;
GtkWidget *key_custom;
GtkWidget *keyid;
+ GtkWidget *keyid_label;
+ GtkWidget *new_key_label;
+ GtkWidget *new_key_btn;
+ GtkWidget *new_key_box;
PrefsAccount *account;
};
gboolean active;
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->key_custom));
+ gtk_widget_set_sensitive(GTK_WIDGET(page->keyid_label), active);
gtk_widget_set_sensitive(GTK_WIDGET(page->keyid), active);
if (!active)
gtk_editable_delete_text(GTK_EDITABLE(page->keyid), 0, -1);
}
+static void prefs_gpg_update_sens(struct GPGAccountPage *page)
+{
+ gboolean active;
+ active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->key_custom));
+ if (sgpgme_has_secret_key()) {
+ gtk_widget_hide(page->new_key_box);
+ gtk_widget_set_sensitive(page->key_default, TRUE);
+ gtk_widget_set_sensitive(page->key_by_from, TRUE);
+ gtk_widget_set_sensitive(page->key_custom, TRUE);
+ gtk_widget_set_sensitive(page->keyid, active);
+ gtk_widget_set_sensitive(page->keyid_label, active);
+ } else {
+ gtk_widget_show(page->new_key_box);
+ gtk_widget_set_sensitive(page->key_default, FALSE);
+ gtk_widget_set_sensitive(page->key_by_from, FALSE);
+ gtk_widget_set_sensitive(page->key_custom, FALSE);
+ gtk_widget_set_sensitive(page->keyid, FALSE);
+ gtk_widget_set_sensitive(page->keyid_label, FALSE);
+ }
+}
+
+static void new_key_clicked(GtkWidget *widget, gpointer user_data)
+{
+ struct GPGAccountPage *page = (struct GPGAccountPage *) user_data;
+ sgpgme_create_secret_key(page->account, FALSE);
+ prefs_gpg_update_sens(page);
+}
+
static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
GtkWindow *window,
gpointer data)
PrefsAccount *account = (PrefsAccount *) data;
GPGAccountConfig *config;
- /*** BEGIN GLADE CODE ***/
GtkWidget *vbox;
GtkWidget *frame1;
- GtkWidget *table1;
+ GtkWidget *vbox2;
+ GtkWidget *hbox;
GSList *key_group = NULL;
GtkWidget *key_default;
GtkWidget *key_by_from;
GtkWidget *key_custom;
- GtkWidget *label13;
- GtkWidget *label14;
- GtkWidget *label15;
- GtkWidget *label16;
+ GtkWidget *keyid_label;
GtkWidget *keyid;
+ GtkWidget *image;
+ GtkWidget *new_key_label;
+ GtkWidget *new_key_btn;
+ GtkWidget *new_key_box;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_vbox_new(FALSE, VSPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
gtk_widget_show(vbox);
- frame1 = gtk_frame_new(_("Sign key"));
- gtk_widget_show(frame1);
- gtk_box_pack_start(GTK_BOX(vbox), frame1, FALSE, FALSE, 0);
- gtk_frame_set_label_align(GTK_FRAME(frame1), 0.0, 0.5);
+ vbox2 = gtkut_get_options_frame(vbox, &frame1, _("Sign key"));
- table1 = gtk_table_new(4, 3, FALSE);
- gtk_widget_show(table1);
- gtk_container_add(GTK_CONTAINER(frame1), table1);
- gtk_container_set_border_width(GTK_CONTAINER(table1), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table1), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table1), 4);
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
- key_default = gtk_radio_button_new_with_label(key_group, "");
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_default));
+ key_default = gtk_radio_button_new_with_label(key_group,
+ _("Use default GnuPG key"));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_default));
gtk_widget_show(key_default);
- gtk_table_attach(GTK_TABLE(table1), key_default, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), key_default, 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_container_set_border_width (GTK_CONTAINER (hbox), 0);
- key_by_from = gtk_radio_button_new_with_label(key_group, "");
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_by_from));
+ key_by_from = gtk_radio_button_new_with_label(key_group,
+ _("Select key by your email address"));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_by_from));
gtk_widget_show(key_by_from);
- gtk_table_attach(GTK_TABLE(table1), key_by_from, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), key_by_from, FALSE, FALSE, 0);
- key_custom = gtk_radio_button_new_with_label(key_group, "");
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_custom));
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
+
+ key_custom = gtk_radio_button_new_with_label(key_group,
+ _("Specify key manually"));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_custom));
gtk_widget_show(key_custom);
- gtk_table_attach(GTK_TABLE(table1), key_custom, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label13 = gtk_label_new(_("Use default GnuPG key"));
- gtk_widget_show(label13);
- gtk_table_attach(GTK_TABLE(table1), label13, 1, 3, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label13), 0, 0.5);
-
- label14 = gtk_label_new(_("Select key by your email address"));
- gtk_widget_show(label14);
- gtk_table_attach(GTK_TABLE(table1), label14, 1, 3, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label14), 0, 0.5);
-
- label15 = gtk_label_new(_("Specify key manually"));
- gtk_widget_show(label15);
- gtk_table_attach(GTK_TABLE(table1), label15, 1, 3, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label15), 0, 0.5);
-
- label16 = gtk_label_new(_("User or key ID:"));
- gtk_widget_show(label16);
- gtk_table_attach(GTK_TABLE(table1), label16, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(label16), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(hbox), key_custom, 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_container_set_border_width (GTK_CONTAINER (hbox), 0);
+
+ keyid_label = gtk_label_new(_("User or key ID:"));
+ gtk_widget_show(keyid_label);
+ gtk_label_set_justify(GTK_LABEL(keyid_label), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(hbox), keyid_label, FALSE, FALSE, 0);
keyid = gtk_entry_new();
gtk_widget_show(keyid);
- gtk_table_attach(GTK_TABLE(table1), keyid, 2, 3, 3, 4,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- /*** END GLADE CODE ***/
+ gtk_box_pack_start(GTK_BOX(hbox), keyid, FALSE, FALSE, 0);
config = prefs_gpg_account_get_config(account);
switch (config->sign_key) {
case SIGN_KEY_DEFAULT:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_default), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(keyid), FALSE);
break;
case SIGN_KEY_BY_FROM:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_by_from), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(keyid), FALSE);
break;
case SIGN_KEY_CUSTOM:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_custom), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(keyid), TRUE);
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);
+
+ gtk_box_pack_start(GTK_BOX(new_key_box), image, FALSE, FALSE, 0);
+ new_key_label = gtk_label_new(
+ _("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 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);
g_signal_connect(G_OBJECT(key_custom), "toggled", G_CALLBACK(key_custom_toggled), page);
+ g_signal_connect(G_OBJECT(new_key_btn), "clicked", G_CALLBACK(new_key_clicked), page);
page->key_default = key_default;
page->key_by_from = key_by_from;
page->key_custom = key_custom;
page->keyid = keyid;
+ page->keyid_label = keyid_label;
+ page->new_key_box = new_key_box;
page->page.widget = vbox;
page->account = account;
+ prefs_gpg_update_sens(page);
}
static void prefs_gpg_account_destroy_widget_func(PrefsPage *_page)
projects / claws.git / blobdiff