#include "main.h"
#include "prefs.h"
#include "prefs_account.h"
+#include "prefs_customheader.h"
#include "account.h"
#include "mainwindow.h"
#include "manage_window.h"
+#include "inc.h"
#include "menu.h"
#include "gtkutils.h"
#include "utils.h"
GtkWidget *recvserv_label;
GtkWidget *smtpserv_label;
GtkWidget *nntpserv_label;
+ GtkWidget *localmbox_label;
+ GtkWidget *mailcmd_label;
GtkWidget *recvserv_entry;
GtkWidget *smtpserv_entry;
GtkWidget *nntpserv_entry;
+ GtkWidget *nntpauth_chkbtn;
+ GtkWidget *localmbox_entry;
+ GtkWidget *mailcmd_chkbtn;
+ GtkWidget *mailcmd_entry;
GtkWidget *uid_label;
GtkWidget *pass_label;
GtkWidget *uid_entry;
GtkWidget *sigpath_entry;
} compose;
+#if USE_GPGME
+static struct Privacy {
+ GtkWidget *defaultkey_radiobtn;
+ GtkWidget *emailkey_radiobtn;
+ GtkWidget *customkey_radiobtn;
+ GtkWidget *customkey_entry;
+} privacy;
+#endif /* USE_GPGME */
+
static struct Advanced {
GtkWidget *smtpport_chkbtn;
GtkWidget *smtpport_entry;
GtkWidget *domain_entry;
} advanced;
+static void prefs_account_fix_size (void);
+
static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam);
static void prefs_account_protocol_set_optmenu (PrefParam *pparam);
static void prefs_account_protocol_activated (GtkMenuItem *menuitem);
+#if USE_GPGME
+static void prefs_account_sign_key_set_data_from_radiobtn (PrefParam *pparam);
+static void prefs_account_sign_key_set_radiobtn (PrefParam *pparam);
+#endif /* USE_GPGME */
+
+static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
+ gpointer user_data);
+static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
+ gpointer user_data);
static PrefParam param[] = {
/* Basic */
{"nntp_server", NULL, &tmp_ac_prefs.nntp_server, P_STRING,
&basic.nntpserv_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"local_mbox", NULL, &tmp_ac_prefs.local_mbox, P_STRING,
+ &basic.localmbox_entry, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"use_mail_command", "FALSE", &tmp_ac_prefs.use_mail_command, P_BOOL,
+ &basic.mailcmd_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"mail_command", "mail", &tmp_ac_prefs.mail_command, P_STRING,
+ &basic.mailcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
+
{"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
- NULL, NULL, NULL},
+ &basic.nntpauth_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"user_id", "ENV_USER", &tmp_ac_prefs.userid, P_STRING,
&basic.uid_entry, prefs_set_data_from_entry, prefs_set_entry},
&compose.sigpath_entry,
prefs_set_data_from_entry, prefs_set_entry},
+#if USE_GPGME
+ /* Privacy */
+ {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
+ &privacy.defaultkey_radiobtn,
+ prefs_account_sign_key_set_data_from_radiobtn,
+ prefs_account_sign_key_set_radiobtn},
+ {"sign_key_id", "", &tmp_ac_prefs.sign_key_id, P_STRING,
+ &privacy.customkey_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+#endif /* USE_GPGME */
+
/* Advanced */
{"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL,
&advanced.smtpport_chkbtn,
static void prefs_account_receive_create (void);
static void prefs_account_send_create (void);
static void prefs_account_compose_create (void);
+#if USE_GPGME
+static void prefs_account_privacy_create (void);
+#endif /* USE_GPGME */
static void prefs_account_advanced_create (void);
+static void prefs_account_edit_custom_header (void);
+
+static gint prefs_account_deleted (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void prefs_account_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static gint prefs_account_apply (void);
static void prefs_account_cancel (void);
+
#define VSPACING 12
#define VSPACING_NARROW 4
#define BOX_BORDER 16
id = atoi(p);
if (id < 0) g_warning("wrong account id: %d\n", id);
ac_prefs->account_id = id;
+
+ prefs_custom_header_read_config(ac_prefs);
}
void prefs_account_save_config(PrefsAccount *ac_prefs)
debug_print(_("Opening account preferences window...\n"));
+ inc_autocheck_timer_remove();
+
cancelled = FALSE;
if (!ac_prefs) {
gtk_widget_show(dialog.apply_btn);
}
+ if (ac_prefs->protocol != A_LOCAL) {
+ gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
+ gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
+ }
+
gtk_widget_show(dialog.window);
gtk_main();
gtk_widget_hide(dialog.window);
+ inc_autocheck_timer_set();
+
if (cancelled && new_account) {
g_free(ac_prefs);
return NULL;
/* create dialog */
prefs_dialog_create(&dialog);
gtk_signal_connect(GTK_OBJECT(dialog.window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_account_cancel), NULL);
+ GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_in_event",
SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"), page++);
prefs_account_compose_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
+#if USE_GPGME
+ prefs_account_privacy_create();
+ SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"), page++);
+#endif /* USE_GPGME */
prefs_account_advanced_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Advanced"), page++);
- gtk_widget_show_all(dialog.window);
+ prefs_account_fix_size();
+ gtk_widget_show(dialog.window);
+}
+
+/**
+ * prefs_account_fix_size:
+ *
+ * Fix the window size after creating widgets by selecting "Local"
+ * protocol (currently it has the largest size of parameter widgets).
+ * Without this the window gets too large.
+ **/
+static void prefs_account_fix_size(void)
+{
+ GtkOptionMenu *optmenu = GTK_OPTION_MENU (basic.protocol_optmenu);
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ gtk_option_menu_set_history (optmenu, 4); /* local */
+ menu = gtk_option_menu_get_menu (optmenu);
+ menuitem = gtk_menu_get_active (GTK_MENU (menu));
+ gtk_menu_item_activate (GTK_MENU_ITEM (menuitem));
}
#define SET_ACTIVATE(menuitem) \
NULL); \
}
+#define TABLE_YPAD 2
+
static void prefs_account_basic_create(void)
{
GtkWidget *vbox1;
GtkWidget *recvserv_label;
GtkWidget *smtpserv_label;
GtkWidget *nntpserv_label;
+ GtkWidget *localmbox_label;
+ GtkWidget *mailcmd_label;
GtkWidget *recvserv_entry;
GtkWidget *smtpserv_entry;
GtkWidget *nntpserv_entry;
+ GtkWidget *nntpauth_chkbtn;
+ GtkWidget *localmbox_entry;
+ GtkWidget *mailcmd_chkbtn;
+ GtkWidget *mailcmd_entry;
GtkWidget *uid_label;
GtkWidget *pass_label;
GtkWidget *uid_entry;
SET_ACTIVATE (menuitem);
MENUITEM_ADD (optmenu_menu, menuitem, _("News (NNTP)"), A_NNTP);
SET_ACTIVATE (menuitem);
- MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
+ MENUITEM_ADD (optmenu_menu, menuitem, _("Local"), A_LOCAL);
+ SET_ACTIVATE (menuitem);
+ /*
+ MENUITEM_ADD (optmenu_menu, menuitem, _("Local (without SMTP server)"), A_LOCAL_CMD);
SET_ACTIVATE (menuitem);
+ */
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
gtk_widget_set_usize (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox), inbox_entry, TRUE, TRUE, 0);
- serv_table = gtk_table_new (5, 4, FALSE);
+ serv_table = gtk_table_new (8, 4, FALSE);
gtk_widget_show (serv_table);
gtk_box_pack_start (GTK_BOX (vbox2), serv_table, FALSE, FALSE, 0);
- gtk_table_set_row_spacings (GTK_TABLE (serv_table), VSPACING_NARROW);
+ gtk_table_set_row_spacings (GTK_TABLE (serv_table), 0);
gtk_table_set_col_spacings (GTK_TABLE (serv_table), 8);
nntpserv_entry = gtk_entry_new ();
gtk_widget_show (nntpserv_entry);
gtk_table_attach (GTK_TABLE (serv_table), nntpserv_entry, 1, 4, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
- gtk_table_set_row_spacing (GTK_TABLE (serv_table), 0, 0);
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, TABLE_YPAD);
+/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 0, 0); */
recvserv_entry = gtk_entry_new ();
gtk_widget_show (recvserv_entry);
gtk_table_attach (GTK_TABLE (serv_table), recvserv_entry, 1, 4, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, TABLE_YPAD);
+
+ localmbox_entry = gtk_entry_new ();
+ gtk_widget_show (localmbox_entry);
+ gtk_table_attach (GTK_TABLE (serv_table), localmbox_entry, 1, 4, 2, 3,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, TABLE_YPAD);
smtpserv_entry = gtk_entry_new ();
gtk_widget_show (smtpserv_entry);
- gtk_table_attach (GTK_TABLE (serv_table), smtpserv_entry, 1, 4, 2, 3,
+ gtk_table_attach (GTK_TABLE (serv_table), smtpserv_entry, 1, 4, 3, 4,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, TABLE_YPAD);
+
+ mailcmd_entry = gtk_entry_new ();
+ gtk_widget_show (mailcmd_entry);
+ gtk_table_attach (GTK_TABLE (serv_table), mailcmd_entry, 1, 4, 5, 6,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, TABLE_YPAD);
+
+ nntpauth_chkbtn = gtk_check_button_new_with_label
+ (_("NNTP server requires authentication"));
+ gtk_widget_show (nntpauth_chkbtn);
+ gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 4, 6, 7,
+ GTK_EXPAND | GTK_FILL,
+ 0, 0, TABLE_YPAD);
+ gtk_signal_connect(GTK_OBJECT(nntpauth_chkbtn), "toggled",
+ GTK_SIGNAL_FUNC(prefs_account_nntpauth_toggled),
+ NULL);
uid_entry = gtk_entry_new ();
gtk_widget_show (uid_entry);
gtk_widget_set_usize (uid_entry, DEFAULT_ENTRY_WIDTH, -1);
- gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 4, 5,
+ gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 7, 8,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, TABLE_YPAD);
pass_entry = gtk_entry_new ();
gtk_widget_show (pass_entry);
gtk_widget_set_usize (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
- gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 4, 5,
+ gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 7, 8,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, TABLE_YPAD);
gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE);
nntpserv_label = gtk_label_new (_("News server"));
gtk_widget_show (nntpserv_label);
gtk_table_attach (GTK_TABLE (serv_table), nntpserv_label, 0, 1, 0, 1,
- GTK_FILL, 0, 0, 0);
+ GTK_FILL, 0, 0, TABLE_YPAD);
gtk_misc_set_alignment (GTK_MISC (nntpserv_label), 1, 0.5);
recvserv_label = gtk_label_new (_("Server for receiving"));
gtk_widget_show (recvserv_label);
gtk_table_attach (GTK_TABLE (serv_table), recvserv_label, 0, 1, 1, 2,
- GTK_FILL, 0, 0, 0);
+ GTK_FILL, 0, 0, TABLE_YPAD);
gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5);
+ localmbox_label = gtk_label_new (_("Local mailbox file"));
+ gtk_widget_show (localmbox_label);
+ gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 2, 3,
+ GTK_FILL, 0, 0, TABLE_YPAD);
+ gtk_misc_set_alignment (GTK_MISC (localmbox_label), 1, 0.5);
+/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0); */
+
smtpserv_label = gtk_label_new (_("SMTP server (send)"));
gtk_widget_show (smtpserv_label);
- gtk_table_attach (GTK_TABLE (serv_table), smtpserv_label, 0, 1, 2, 3,
- GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (serv_table), smtpserv_label, 0, 1, 3, 4,
+ GTK_FILL, 0, 0, TABLE_YPAD);
gtk_misc_set_alignment (GTK_MISC (smtpserv_label), 1, 0.5);
- gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);
+/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0); */
+
+ mailcmd_chkbtn = gtk_check_button_new_with_label
+ (_("Use mail command rather than SMTP server"));
+ gtk_widget_show (mailcmd_chkbtn);
+ gtk_table_attach (GTK_TABLE (serv_table), mailcmd_chkbtn, 0, 4, 4, 5,
+ GTK_EXPAND | GTK_FILL,
+ 0, 0, TABLE_YPAD);
+ gtk_signal_connect(GTK_OBJECT(mailcmd_chkbtn), "toggled",
+ GTK_SIGNAL_FUNC(prefs_account_mailcmd_toggled),
+ NULL);
+
+ mailcmd_label = gtk_label_new (_("command to send mails"));
+ gtk_widget_show (mailcmd_label);
+ gtk_table_attach (GTK_TABLE (serv_table), mailcmd_label, 0, 1, 5, 6,
+ GTK_FILL, 0, 0, TABLE_YPAD);
+ gtk_misc_set_alignment (GTK_MISC (mailcmd_label), 1, 0.5);
+/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0); */
uid_label = gtk_label_new (_("User ID"));
gtk_widget_show (uid_label);
- gtk_table_attach (GTK_TABLE (serv_table), uid_label, 0, 1, 4, 5,
- GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (serv_table), uid_label, 0, 1, 7, 8,
+ GTK_FILL, 0, 0, TABLE_YPAD);
gtk_misc_set_alignment (GTK_MISC (uid_label), 1, 0.5);
pass_label = gtk_label_new (_("Password"));
gtk_widget_show (pass_label);
- gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 4, 5,
- 0, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 7, 8,
+ 0, 0, 0, TABLE_YPAD);
basic.acname_entry = acname_entry;
basic.default_chkbtn = default_chkbtn;
basic.smtpserv_entry = smtpserv_entry;
basic.nntpserv_label = nntpserv_label;
basic.nntpserv_entry = nntpserv_entry;
+ basic.nntpauth_chkbtn = nntpauth_chkbtn;
+ basic.localmbox_label = localmbox_label;
+ basic.localmbox_entry = localmbox_entry;
+ basic.mailcmd_chkbtn = mailcmd_chkbtn;
+ basic.mailcmd_label = mailcmd_label;
+ basic.mailcmd_entry = mailcmd_entry;
basic.uid_label = uid_label;
basic.pass_label = pass_label;
basic.uid_entry = uid_entry;
_("Remove messages on server when received"));
PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
_("Receive all messages on server"));
- PACK_CHECK_BUTTON (vbox2, recvatgetall_chkbtn,
- _("Receive at getting from all accounts"));
+ PACK_CHECK_BUTTON
+ (vbox2, recvatgetall_chkbtn,
+ _("`Receive all' checks for new mail on this account"));
PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
_("Filter messages on receiving"));
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
- gtk_widget_set_sensitive(hbox, FALSE);
-
PACK_CHECK_BUTTON (hbox, customhdr_chkbtn,
_("Add user-defined header"));
gtk_widget_show (customhdr_edit_btn);
gtk_box_pack_start (GTK_BOX (hbox), customhdr_edit_btn,
FALSE, FALSE, 0);
+ gtk_signal_connect (GTK_OBJECT (customhdr_edit_btn), "clicked",
+ GTK_SIGNAL_FUNC (prefs_account_edit_custom_header),
+ NULL);
SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
compose.sigpath_entry = sigpath_entry;
}
+#if USE_GPGME
+static void prefs_account_privacy_create(void)
+{
+ GtkWidget *vbox1;
+ GtkWidget *frame1;
+ GtkWidget *vbox2;
+ GtkWidget *hbox1;
+ GtkWidget *label;
+ GtkWidget *defaultkey_radiobtn;
+ GtkWidget *emailkey_radiobtn;
+ GtkWidget *customkey_radiobtn;
+ GtkWidget *customkey_entry;
+
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox1);
+ gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), BOX_BORDER);
+
+ PACK_FRAME (vbox1, frame1, _("Sign key"));
+
+ vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ gtk_widget_show (vbox2);
+ gtk_container_add (GTK_CONTAINER (frame1), vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+
+ defaultkey_radiobtn = gtk_radio_button_new_with_label
+ (NULL, _("Use default GnuPG key"));
+ gtk_widget_show (defaultkey_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox2), defaultkey_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (defaultkey_radiobtn),
+ GINT_TO_POINTER (SIGN_KEY_DEFAULT));
+
+ emailkey_radiobtn = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON (defaultkey_radiobtn),
+ _("Select key by your email address"));
+ gtk_widget_show (emailkey_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox2), emailkey_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (emailkey_radiobtn),
+ GINT_TO_POINTER (SIGN_KEY_BY_FROM));
+
+ customkey_radiobtn = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON (defaultkey_radiobtn),
+ _("Specify key manually"));
+ gtk_widget_show (customkey_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox2), customkey_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (customkey_radiobtn),
+ GINT_TO_POINTER (SIGN_KEY_CUSTOM));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ label = gtk_label_new ("");
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+ gtk_widget_set_usize (label, 16, -1);
+
+ label = gtk_label_new (_("User or key ID:"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+
+ customkey_entry = gtk_entry_new ();
+ gtk_widget_show (customkey_entry);
+ gtk_box_pack_start (GTK_BOX (hbox1), customkey_entry,
+ TRUE, TRUE, 0);
+
+ SET_TOGGLE_SENSITIVITY (customkey_radiobtn, customkey_entry);
+
+ privacy.defaultkey_radiobtn = defaultkey_radiobtn;
+ privacy.emailkey_radiobtn = emailkey_radiobtn;
+ privacy.customkey_radiobtn = customkey_radiobtn;
+ privacy.customkey_entry = customkey_entry;
+}
+#endif /* USE_GPGME */
+
static void prefs_account_advanced_create(void)
{
GtkWidget *vbox1;
advanced.domain_entry = entry_domain;
}
+static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ prefs_account_cancel();
+ return TRUE;
+}
+
static void prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
alertpanel_error(_("Mail address is not entered."));
return -1;
}
- if ((protocol == A_POP3 || protocol == A_APOP || protocol == A_LOCAL) &&
- *gtk_entry_get_text(GTK_ENTRY(basic.smtpserv_entry)) == '\0') {
+ if ((protocol == A_POP3 || protocol == A_APOP
+ || (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn)))) && *gtk_entry_get_text(GTK_ENTRY(basic.smtpserv_entry)) == '\0') {
alertpanel_error(_("SMTP server is not entered."));
return -1;
}
return -1;
}
+ if (protocol == A_LOCAL &&
+ *gtk_entry_get_text(GTK_ENTRY(basic.localmbox_entry)) == '\0') {
+ alertpanel_error(_("local mailbox filename is not entered."));
+ return -1;
+ }
+
+ if (protocol == A_LOCAL &&
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn)) && *gtk_entry_get_text(GTK_ENTRY(basic.mailcmd_entry)) == '\0') {
+ alertpanel_error(_("mail command is not entered."));
+ return -1;
+ }
+
prefs_set_data_from_dialog(param);
return 0;
}
gtk_main_quit();
}
+static void prefs_account_edit_custom_header(void)
+{
+ prefs_custom_header_open(&tmp_ac_prefs);
+}
+
+#if USE_GPGME
+
+static void prefs_account_sign_key_set_data_from_radiobtn(PrefParam *pparam)
+{
+ GtkRadioButton *radiobtn;
+ GSList *group;
+
+ radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
+ group = gtk_radio_button_group (radiobtn);
+ while (group != NULL) {
+ GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
+ if (gtk_toggle_button_get_active (btn)) {
+ *((SignKeyType *)pparam->data) = GPOINTER_TO_INT
+ (gtk_object_get_user_data (GTK_OBJECT (btn)));
+ break;
+ }
+ group = group->next;
+ }
+}
+
+static void prefs_account_sign_key_set_radiobtn(PrefParam *pparam)
+{
+ GtkRadioButton *radiobtn;
+ GSList *group;
+ gpointer data;
+
+ data = GINT_TO_POINTER (*((RecvProtocol *)pparam->data));
+ radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
+ group = gtk_radio_button_group (radiobtn);
+ while (group != NULL) {
+ GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
+ gpointer data1 = gtk_object_get_user_data (GTK_OBJECT (btn));
+ if (data1 == data) {
+ gtk_toggle_button_set_active (btn, TRUE);
+ break;
+ }
+ group = group->next;
+ }
+}
+
+#endif /* USE_GPGME */
+
static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam)
{
GtkWidget *menu;
case A_LOCAL:
gtk_option_menu_set_history(optmenu, 4);
break;
+ /*
+ case A_LOCAL_CMD:
+ gtk_option_menu_set_history(optmenu, 5);
+ break;
+ */
default:
}
gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
gtk_widget_show(basic.nntpserv_label);
gtk_widget_show(basic.nntpserv_entry);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, TRUE);
+ gtk_widget_show(basic.nntpauth_chkbtn);
gtk_widget_hide(basic.recvserv_label);
gtk_widget_hide(basic.recvserv_entry);
gtk_widget_hide(basic.smtpserv_label);
gtk_widget_hide(basic.smtpserv_entry);
- gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table), 3, 0);
+ gtk_widget_hide(basic.localmbox_label);
+ gtk_widget_hide(basic.localmbox_entry);
+ gtk_widget_hide(basic.mailcmd_label);
+ gtk_widget_hide(basic.mailcmd_entry);
+ gtk_widget_hide(basic.mailcmd_chkbtn);
+/* gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table), 3, 0); */
+ /* update userid/passwd sensitive state */
+ prefs_account_nntpauth_toggled
+ (GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
+ gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
+ break;
+ case A_LOCAL:
+ gtk_widget_set_sensitive(basic.inbox_label, TRUE);
+ gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
+ gtk_widget_hide(basic.nntpserv_label);
+ gtk_widget_hide(basic.nntpserv_entry);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_chkbtn);
+ gtk_widget_set_sensitive(basic.recvserv_label, FALSE);
+ gtk_widget_set_sensitive(basic.recvserv_entry, FALSE);
+ gtk_widget_hide(basic.recvserv_label);
+ gtk_widget_hide(basic.recvserv_entry);
+ gtk_widget_show(basic.smtpserv_label);
+ gtk_widget_show(basic.smtpserv_entry);
+ gtk_widget_show(basic.localmbox_label);
+ gtk_widget_show(basic.localmbox_entry);
+ gtk_widget_show(basic.mailcmd_label);
+ gtk_widget_show(basic.mailcmd_entry);
+ gtk_widget_show(basic.mailcmd_chkbtn);
+/* gtk_table_set_row_spacing */
+/* (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW); */
gtk_widget_set_sensitive(basic.uid_label, FALSE);
gtk_widget_set_sensitive(basic.pass_label, FALSE);
gtk_widget_set_sensitive(basic.uid_entry, FALSE);
gtk_widget_set_sensitive(basic.pass_entry, FALSE);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
+ prefs_account_mailcmd_toggled
+ (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
break;
- case A_LOCAL:
+ /*
+ case A_LOCAL_CMD:
gtk_widget_set_sensitive(basic.inbox_label, TRUE);
gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_widget_hide(basic.nntpauth_chkbtn);
gtk_widget_set_sensitive(basic.recvserv_label, FALSE);
gtk_widget_set_sensitive(basic.recvserv_entry, FALSE);
- gtk_widget_show(basic.recvserv_label);
- gtk_widget_show(basic.recvserv_entry);
- gtk_widget_show(basic.smtpserv_label);
- gtk_widget_show(basic.smtpserv_entry);
+ gtk_widget_hide(basic.recvserv_label);
+ gtk_widget_hide(basic.recvserv_entry);
+ gtk_widget_hide(basic.smtpserv_label);
+ gtk_widget_hide(basic.smtpserv_entry);
+ gtk_widget_show(basic.localmbox_label);
+ gtk_widget_show(basic.localmbox_entry);
+ gtk_widget_show(basic.mailcmd_label);
+ gtk_widget_show(basic.mailcmd_entry);
+ gtk_widget_hide(basic.mailcmd_chkbtn);
gtk_table_set_row_spacing
(GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW);
gtk_widget_set_sensitive(basic.uid_label, FALSE);
gtk_widget_set_sensitive(basic.pass_entry, FALSE);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
break;
+ */
case A_IMAP4:
gtk_widget_set_sensitive(basic.inbox_label, TRUE);
gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_chkbtn);
gtk_widget_set_sensitive(basic.recvserv_label, TRUE);
gtk_widget_set_sensitive(basic.recvserv_entry, TRUE);
gtk_widget_show(basic.recvserv_label);
gtk_widget_show(basic.recvserv_entry);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
- gtk_table_set_row_spacing
- (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW);
+ gtk_widget_hide(basic.localmbox_label);
+ gtk_widget_hide(basic.localmbox_entry);
+ gtk_widget_hide(basic.mailcmd_label);
+ gtk_widget_hide(basic.mailcmd_entry);
+ gtk_widget_hide(basic.mailcmd_chkbtn);
+/* gtk_table_set_row_spacing */
+/* (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW); */
gtk_widget_set_sensitive(basic.uid_label, TRUE);
gtk_widget_set_sensitive(basic.pass_label, TRUE);
gtk_widget_set_sensitive(basic.uid_entry, TRUE);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
+ gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
+ gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
break;
- default:
+ default: // POP3
gtk_widget_set_sensitive(basic.inbox_label, TRUE);
gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
+ gtk_widget_hide(basic.nntpauth_chkbtn);
gtk_widget_set_sensitive(basic.recvserv_label, TRUE);
gtk_widget_set_sensitive(basic.recvserv_entry, TRUE);
gtk_widget_show(basic.recvserv_label);
gtk_widget_show(basic.recvserv_entry);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
- gtk_table_set_row_spacing
- (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW);
+ gtk_widget_hide(basic.localmbox_label);
+ gtk_widget_hide(basic.localmbox_entry);
+ gtk_widget_hide(basic.mailcmd_label);
+ gtk_widget_hide(basic.mailcmd_entry);
+ gtk_widget_hide(basic.mailcmd_chkbtn);
+/* gtk_table_set_row_spacing */
+/* (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW); */
gtk_widget_set_sensitive(basic.uid_label, TRUE);
gtk_widget_set_sensitive(basic.pass_label, TRUE);
gtk_widget_set_sensitive(basic.uid_entry, TRUE);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_set_sensitive(receive.pop3_frame, TRUE);
+ gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
+ gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
break;
}
gtk_widget_queue_resize(basic.serv_frame);
}
+
+static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
+ gpointer user_data)
+{
+ gboolean auth;
+
+ if (!GTK_WIDGET_SENSITIVE (GTK_WIDGET (button)))
+ return;
+ auth = gtk_toggle_button_get_active (button);
+ gtk_widget_set_sensitive(basic.uid_label, auth);
+ gtk_widget_set_sensitive(basic.pass_label, auth);
+ gtk_widget_set_sensitive(basic.uid_entry, auth);
+ gtk_widget_set_sensitive(basic.pass_entry, auth);
+}
+
+static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
+ gpointer user_data)
+{
+ gboolean use_mailcmd;
+
+ use_mailcmd = gtk_toggle_button_get_active (button);
+
+ gtk_widget_set_sensitive(basic.mailcmd_entry, use_mailcmd);
+ gtk_widget_set_sensitive(basic.mailcmd_label, use_mailcmd);
+ gtk_widget_set_sensitive(basic.smtpserv_entry, !use_mailcmd);
+ gtk_widget_set_sensitive(basic.smtpserv_label, !use_mailcmd);
+}
projects / claws.git / blobdiff