/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
+#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <gtk/filesel.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <ctype.h>
-#include "intl.h"
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_account.h"
+#include "prefs_common.h"
#include "prefs_customheader.h"
#include "account.h"
#include "mainwindow.h"
static PrefsAccount tmp_ac_prefs;
static GtkWidget *notebook;
+static GtkWidget *sigfile_radiobtn;
+static GtkWidget *sigcmd_radiobtn;
+static GtkWidget *entry_sigpath;
+static GtkWidget *signature_browse_button;
static GSList *prefs_pages = NULL;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
+ GtkWidget *local_frame;
+ GtkWidget *local_inbox_label;
+ GtkWidget *local_inbox_entry;
+ GtkWidget *local_inbox_btn;
+
GtkWidget *filter_on_recv_chkbtn;
GtkWidget *recvatgetall_chkbtn;
GtkWidget *imap_frame;
GtkWidget *imap_auth_type_optmenu;
+ GtkWidget *imapdir_label;
+ GtkWidget *imapdir_entry;
GtkWidget *frame_maxarticle;
- GtkWidget *label_maxarticle;
- GtkWidget *spinbtn_maxarticle;
- GtkObject *spinbtn_maxarticle_adj;
+ GtkWidget *maxarticle_label;
+ GtkWidget *maxarticle_spinbtn;
+ GtkObject *maxarticle_spinbtn_adj;
} receive;
static struct Send {
static struct Privacy {
GtkWidget *default_privacy_system;
GtkWidget *default_encrypt_chkbtn;
+ GtkWidget *default_encrypt_reply_chkbtn;
GtkWidget *default_sign_chkbtn;
GtkWidget *save_clear_text_chkbtn;
} privacy;
GtkWidget *tunnelcmd_chkbtn;
GtkWidget *tunnelcmd_entry;
- GtkWidget *imapdir_label;
- GtkWidget *imapdir_entry;
GtkWidget *sent_folder_chkbtn;
GtkWidget *sent_folder_entry;
+ GtkWidget *queue_folder_chkbtn;
+ GtkWidget *queue_folder_entry;
GtkWidget *draft_folder_chkbtn;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_chkbtn;
{"password", NULL, &tmp_ac_prefs.passwd, P_PASSWORD,
&basic.pass_entry, prefs_set_data_from_entry, prefs_set_entry},
- {"inbox", "inbox", &tmp_ac_prefs.inbox, P_STRING,
+ {"inbox", "#mh/Mailbox/inbox", &tmp_ac_prefs.inbox, P_STRING,
&receive.inbox_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"local_inbox", "#mh/Mailbox/inbox", &tmp_ac_prefs.local_inbox, P_STRING,
+ &receive.local_inbox_entry, prefs_set_data_from_entry, prefs_set_entry},
+
/* Receive */
{"use_apop_auth", "FALSE", &tmp_ac_prefs.use_apop_auth, P_BOOL,
&receive.use_apop_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"max_news_articles", "300", &tmp_ac_prefs.max_articles, P_INT,
- &receive.spinbtn_maxarticle,
+ &receive.maxarticle_spinbtn,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
/* Send */
&compose.sigfile_radiobtn,
prefs_account_enum_set_data_from_radiobtn,
prefs_account_enum_set_radiobtn},
- {"signature_path", "~/"DEFAULT_SIGNATURE, &tmp_ac_prefs.sig_path, P_STRING,
- &compose.entry_sigpath,
+ {"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,
+ &tmp_ac_prefs.sig_path, P_STRING, &compose.entry_sigpath,
prefs_set_data_from_entry, prefs_set_entry},
{"auto_signature", "TRUE", &tmp_ac_prefs.auto_sig, P_BOOL,
{"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
&privacy.default_encrypt_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"default_encrypt_reply", "TRUE", &tmp_ac_prefs.default_encrypt_reply, P_BOOL,
+ &privacy.default_encrypt_reply_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
&privacy.default_sign_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
&ssl.use_nonblocking_ssl_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+#else
+ /* SSL */
+ {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
+ NULL, NULL, NULL},
+ {"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM,
+ NULL, NULL, NULL},
+ {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
+ NULL, NULL, NULL},
+ {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
+ NULL, NULL, NULL},
+
+ {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
+ NULL, NULL, NULL},
#endif /* USE_OPENSSL */
/* Advanced */
prefs_account_crosspost_set_colormenu},
{"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
- &advanced.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+ &receive.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
{"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
&advanced.sent_folder_chkbtn,
&advanced.sent_folder_entry,
prefs_set_data_from_entry, prefs_set_entry},
+ {"set_queue_folder", "FALSE", &tmp_ac_prefs.set_queue_folder, P_BOOL,
+ &advanced.queue_folder_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"queue_folder", NULL, &tmp_ac_prefs.queue_folder, P_STRING,
+ &advanced.queue_folder_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
{"set_draft_folder", "FALSE", &tmp_ac_prefs.set_draft_folder, P_BOOL,
&advanced.draft_folder_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
static void prefs_account_select_folder_cb (GtkWidget *widget,
gpointer data);
-static void pop_bfr_smtp_tm_set_sens (GtkWidget *widget,
+static void prefs_account_sigfile_radiobtn_cb (GtkWidget *widget,
gpointer data);
-static void prefs_account_edit_custom_header (void);
+static void prefs_account_sigcmd_radiobtn_cb (GtkWidget *widget,
+ gpointer data);
-static gint prefs_account_deleted (GtkWidget *widget,
- GdkEventAny *event,
+static void prefs_account_signature_browse_cb (GtkWidget *widget,
gpointer data);
-static gboolean prefs_account_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
+
+static void pop_bfr_smtp_tm_set_sens (GtkWidget *widget,
gpointer data);
-static void prefs_account_ok (void);
+
+static void prefs_account_edit_custom_header (void);
+
static gint prefs_account_apply (void);
-static void prefs_account_cancel (void);
typedef struct AccountPage
{
static AccountPage account_page;
+static void privacy_system_activated(GtkMenuItem *menuitem)
+{
+ const gchar* system_id;
+ gboolean privacy_enabled = FALSE;
+
+ system_id = g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
+
+ privacy_enabled = strcmp(system_id, "");
+
+ gtk_widget_set_sensitive (privacy.default_encrypt_chkbtn, privacy_enabled);
+ gtk_widget_set_sensitive (privacy.default_encrypt_reply_chkbtn, privacy_enabled);
+ gtk_widget_set_sensitive (privacy.default_sign_chkbtn, privacy_enabled);
+ gtk_widget_set_sensitive (privacy.save_clear_text_chkbtn, privacy_enabled);
+}
+
void update_privacy_system_menu() {
GtkWidget *menu;
GtkWidget *menuitem;
g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, "");
gtk_menu_append(GTK_MENU(menu), menuitem);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(privacy_system_activated),
+ NULL);
+
system_ids = privacy_get_system_ids();
for (cur = system_ids; cur != NULL; cur = g_slist_next(cur)) {
gchar *id = (gchar *) cur->data;
gtk_widget_show(menuitem);
g_object_set_data_full(G_OBJECT(menuitem), MENU_VAL_ID, id, g_free);
gtk_menu_append(GTK_MENU(menu), menuitem);
+
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(privacy_system_activated),
+ NULL);
+
+
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(privacy.default_privacy_system), menu);
gtk_container_remove(GTK_CONTAINER (page->vbox), notebook);
}
+static gboolean can_close_func(PrefsPage *page_)
+{
+ return prefs_account_apply() >= 0;
+}
+
static void save_func(PrefsPage * _page)
{
if (prefs_account_apply() >= 0)
account_page.page.create_widget = create_widget_func;
account_page.page.destroy_widget = destroy_widget_func;
account_page.page.save_page = save_func;
+ account_page.page.can_close = can_close_func;
prefs_account_register_page((PrefsPage *) &account_page);
}
void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
{
- const guchar *p = label;
+ const gchar *p = label;
+ gchar *rcpath;
gint id;
gchar **strv, **cur;
memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
- prefs_read_config(param, label, ACCOUNT_RC);
+ rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
+ prefs_read_config(param, label, rcpath, NULL);
+ g_free(rcpath);
+
*ac_prefs = tmp_ac_prefs;
- while (*p && !isdigit(*p)) p++;
+ while (*p && !g_ascii_isdigit(*p)) p++;
id = atoi(p);
if (id < 0) g_warning("wrong account id: %d\n", id);
ac_prefs->account_id = id;
encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
base64_encode(encvalue, (gchar *) value, strlen(value));
- g_string_sprintfa(str, "%s=%s", (gchar *) key, encvalue);
+ g_string_append_printf(str, "%s=%s", (gchar *) key, encvalue);
g_free(encvalue);
}
{
gchar *orig_key = NULL, *value;
- if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *) &orig_key, (gpointer *) &value)) {
+ if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *)(gchar *) &orig_key, (gpointer *)(gchar *) &value)) {
g_hash_table_remove(account->privacy_prefs, id);
g_free(orig_key);
title = g_strdup_printf (_("%s - Account preferences"),
ac_prefs->account_name);
- prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog);
+ prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
+ &prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height);
g_free(title);
gtk_main();
(_("This server requires authentication"));
gtk_widget_show (nntpauth_chkbtn);
- gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 2, 1, 2,
+ gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 2, 6, 7,
GTK_FILL, 0, 0, 0);
nntpauth_onconnect_chkbtn = gtk_check_button_new_with_label
(_("Authenticate on connect"));
gtk_widget_show (nntpauth_onconnect_chkbtn);
- gtk_table_attach (GTK_TABLE (serv_table), nntpauth_onconnect_chkbtn, 2, 4, 1, 2,
+ gtk_table_attach (GTK_TABLE (serv_table), nntpauth_onconnect_chkbtn, 2, 4, 6, 7,
GTK_FILL, 0, 0, 0);
recvserv_entry = gtk_entry_new ();
GtkWidget *use_apop_chkbtn;
GtkWidget *rmmail_chkbtn;
GtkWidget *hbox_spc;
+ GtkTooltips *leave_time_tooltip;
GtkWidget *leave_time_label;
GtkWidget *leave_time_entry;
GtkWidget *getall_chkbtn;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
+ GtkTooltips *inbox_tooltip;
GtkWidget *imap_frame;
+ GtkWidget *imapdir_label;
+ GtkWidget *imapdir_entry;
+ GtkWidget *local_frame;
+ GtkWidget *local_vbox;
+ GtkWidget *local_hbox;
+ GtkWidget *local_inbox_label;
+ GtkWidget *local_inbox_entry;
+ GtkWidget *local_inbox_btn;
+
GtkWidget *optmenu;
GtkWidget *optmenu_menu;
GtkWidget *menuitem;
GtkWidget *hbox2;
GtkWidget *frame2;
- GtkWidget *label_maxarticle;
- GtkWidget *spinbtn_maxarticle;
- GtkObject *spinbtn_maxarticle_adj;
+ GtkWidget *maxarticle_label;
+ GtkWidget *maxarticle_spinbtn;
+ GtkObject *maxarticle_spinbtn_adj;
+ GtkTooltips *maxarticle_tool_tip;
+
+ inbox_tooltip = gtk_tooltips_new();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+ PACK_FRAME (vbox1, local_frame, _("Local"));
+
+ local_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (local_vbox);
+ gtk_container_add (GTK_CONTAINER (local_frame), local_vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (local_vbox), VBOX_BORDER);
+
+ local_hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (local_hbox);
+ gtk_box_pack_start (GTK_BOX (local_vbox), local_hbox, FALSE, FALSE, 0);
+
+ local_inbox_label = gtk_label_new (_("Default inbox"));
+ gtk_widget_show (local_inbox_label);
+ gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_label, FALSE, FALSE, 0);
+
+ local_inbox_entry = gtk_entry_new ();
+ gtk_widget_show (local_inbox_entry);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), local_inbox_entry,
+ _("Unfiltered messages will be stored in this folder"),
+ NULL);
+ gtk_widget_set_size_request (local_inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_entry, TRUE, TRUE, 0);
+
+ local_inbox_btn = gtkut_get_browse_file_btn(_("_Browse"));
+ gtk_widget_show (local_inbox_btn);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), local_inbox_btn,
+ _("Unfiltered messages will be stored in this folder"),
+ NULL);
+ gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_btn, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT (local_inbox_btn), "clicked",
+ G_CALLBACK (prefs_account_select_folder_cb),
+ local_inbox_entry);
+
PACK_FRAME (vbox1, frame1, _("POP3"));
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_container_add (GTK_CONTAINER (frame1), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
PACK_CHECK_BUTTON (vbox2, use_apop_chkbtn,
_("Use secure authentication (APOP)"));
gtk_widget_show (leave_time_label);
gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
+ leave_time_tooltip = gtk_tooltips_new();
+
leave_time_entry = gtk_entry_new ();
gtk_widget_show (leave_time_entry);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(leave_time_tooltip), leave_time_entry,
+ _("0 days: remove immediately"), NULL);
gtk_widget_set_size_request (leave_time_entry, 64, -1);
gtk_box_pack_start (GTK_BOX (hbox1), leave_time_entry, FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
- PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
- hbox_spc = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox_spc);
- gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
- gtk_widget_set_size_request (hbox_spc, 12, -1);
-
- leave_time_label = gtk_label_new (_("(0 days: remove immediately)"));
- gtk_widget_show (leave_time_label);
- gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
-
- SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
-
PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
_("Download all messages on server"));
inbox_entry = gtk_entry_new ();
gtk_widget_show (inbox_entry);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), inbox_entry,
+ _("Unfiltered messages will be stored in this folder"),
+ NULL);
gtk_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
- inbox_btn = gtk_button_new_with_label (_(" Select... "));
+ inbox_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_widget_show (inbox_btn);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), inbox_btn,
+ _("Unfiltered messages will be stored in this folder"),
+ NULL);
gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (inbox_btn), "clicked",
G_CALLBACK (prefs_account_select_folder_cb),
inbox_entry);
- PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
-
- 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
- (_("(Unfiltered messages will be stored in this folder)"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+ PACK_FRAME(vbox1, frame2, _("NNTP"));
- PACK_FRAME(vbox1, frame2, _("Maximum number of articles to download"));
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_container_add (GTK_CONTAINER (frame2), vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
- gtk_container_add (GTK_CONTAINER (frame2), hbox2);
- gtk_container_set_border_width (GTK_CONTAINER (hbox2), 8);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
+
+ maxarticle_label = gtk_label_new
+ (_("Maximum number of articles to download"));
+ gtk_widget_show (maxarticle_label);
+ gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
+
+ maxarticle_tool_tip = gtk_tooltips_new();
- spinbtn_maxarticle_adj =
+ maxarticle_spinbtn_adj =
gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
- spinbtn_maxarticle = gtk_spin_button_new
- (GTK_ADJUSTMENT (spinbtn_maxarticle_adj), 10, 0);
- gtk_widget_show (spinbtn_maxarticle);
- gtk_box_pack_start (GTK_BOX (hbox2), spinbtn_maxarticle,
+ maxarticle_spinbtn = gtk_spin_button_new
+ (GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
+ gtk_widget_show (maxarticle_spinbtn);
+ gtk_tooltips_set_tip(maxarticle_tool_tip, maxarticle_spinbtn,
+ _("unlimited if 0 is specified"), NULL);
+ gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_spinbtn,
FALSE, FALSE, 0);
- gtk_widget_set_size_request (spinbtn_maxarticle, 64, -1);
+ gtk_widget_set_size_request (maxarticle_spinbtn, 64, -1);
gtk_spin_button_set_numeric
- (GTK_SPIN_BUTTON (spinbtn_maxarticle), TRUE);
-
- label_maxarticle = gtk_label_new
- (_("unlimited if 0 is specified"));
- gtk_widget_show (label_maxarticle);
- gtk_box_pack_start (GTK_BOX (hbox2), label_maxarticle, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label_maxarticle), GTK_JUSTIFY_LEFT);
+ (GTK_SPIN_BUTTON (maxarticle_spinbtn), TRUE);
PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_container_add (GTK_CONTAINER (imap_frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
+
+ imapdir_label = gtk_label_new (_("IMAP server directory"));
+ gtk_widget_show (imapdir_label);
+ gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
+
+ imapdir_label = gtk_label_new(_("(usually empty)"));
+ gtk_widget_show (imapdir_label);
+ gtkut_widget_set_small_font_size (imapdir_label);
+ gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
+
+ imapdir_entry = gtk_entry_new();
+ gtk_widget_show (imapdir_entry);
+ gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, FALSE, FALSE, 0);
+
PACK_CHECK_BUTTON (vbox1, filter_on_recv_chkbtn,
_("Filter messages on receiving"));
PACK_CHECK_BUTTON
(vbox1, recvatgetall_chkbtn,
- _("`Get all' checks for new messages on this account"));
+ _("'Get all' checks for new messages on this account"));
receive.pop3_frame = frame1;
receive.use_apop_chkbtn = use_apop_chkbtn;
receive.imap_frame = imap_frame;
receive.imap_auth_type_optmenu = optmenu;
+ receive.imapdir_label = imapdir_label;
+ receive.imapdir_entry = imapdir_entry;
+
+ receive.local_frame = local_frame;
+ receive.local_inbox_label = local_inbox_label;
+ receive.local_inbox_entry = local_inbox_entry;
+ receive.local_inbox_btn = local_inbox_btn;
+
receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
receive.frame_maxarticle = frame2;
- receive.spinbtn_maxarticle = spinbtn_maxarticle;
- receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj;
+ receive.maxarticle_spinbtn = maxarticle_spinbtn;
+ receive.maxarticle_spinbtn_adj = maxarticle_spinbtn_adj;
}
static void prefs_account_send_create(void)
gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new
- (_("If you leave these entries empty, the same\n"
+ (_("If you leave these entries empty, the same "
"user ID and password as receiving will be used."));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtkut_widget_set_small_font_size (label);
SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4);
GtkWidget *frame_sig;
GtkWidget *vbox_sig;
GtkWidget *label_sigpath;
- GtkWidget *entry_sigpath;
GtkWidget *checkbtn_autosig;
GtkWidget *label_sigsep;
GtkWidget *entry_sigsep;
- GtkWidget *sigfile_radiobtn;
- GtkWidget *sigcmd_radiobtn;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *autocc_chkbtn;
g_object_set_data (G_OBJECT (sigfile_radiobtn),
MENU_VAL_ID,
GINT_TO_POINTER (SIG_FILE));
+ g_signal_connect(G_OBJECT(sigfile_radiobtn), "clicked",
+ G_CALLBACK(prefs_account_sigfile_radiobtn_cb), NULL);
sigcmd_radiobtn = gtk_radio_button_new_with_label_from_widget
(GTK_RADIO_BUTTON(sigfile_radiobtn), _("Command output"));
g_object_set_data (G_OBJECT (sigcmd_radiobtn),
MENU_VAL_ID,
GINT_TO_POINTER (SIG_COMMAND));
+ g_signal_connect(G_OBJECT(sigcmd_radiobtn), "clicked",
+ G_CALLBACK(prefs_account_sigcmd_radiobtn_cb), NULL);
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
gtk_widget_show (entry_sigpath);
gtk_box_pack_start (GTK_BOX (hbox2), entry_sigpath, TRUE, TRUE, 0);
+ signature_browse_button = gtkut_get_browse_file_btn(_("_Browse"));
+ gtk_widget_show (signature_browse_button);
+ gtk_box_pack_start (GTK_BOX (hbox2), signature_browse_button, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(signature_browse_button), "clicked",
+ G_CALLBACK(prefs_account_signature_browse_cb), NULL);
+
PACK_FRAME (vbox1, frame, _("Automatically set the following addresses"));
table = gtk_table_new (3, 2, FALSE);
GtkWidget *label;
GtkWidget *default_privacy_system;
GtkWidget *default_encrypt_chkbtn;
+ GtkWidget *default_encrypt_reply_chkbtn;
GtkWidget *default_sign_chkbtn;
GtkWidget *save_clear_text_chkbtn;
default_privacy_system = gtk_option_menu_new();
gtk_widget_show (default_privacy_system);
- gtk_box_pack_start (GTK_BOX(hbox1), default_privacy_system, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox1), default_privacy_system, FALSE, TRUE, 0);
PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
_("Encrypt message by default"));
+ PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_chkbtn,
+ _("Encrypt message by default when replying to an "
+ "encrypted message"));
PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
_("Sign message by default"));
PACK_CHECK_BUTTON (vbox2, save_clear_text_chkbtn,
privacy.default_privacy_system = default_privacy_system;
privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
+ privacy.default_encrypt_reply_chkbtn = default_encrypt_reply_chkbtn;
privacy.default_sign_chkbtn = default_sign_chkbtn;
privacy.save_clear_text_chkbtn = save_clear_text_chkbtn;
}
gtk_widget_set_size_request (hbox_spc, 16, -1);
label = gtk_label_new
- (_("(Turn this off if you have SSL connection problems)"));
+ (_("Turn this off if you have SSL connection problems"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtkut_widget_set_small_font_size (label);
ssl.pop_frame = pop_frame;
ssl.pop_nossl_radiobtn = pop_nossl_radiobtn;
GtkWidget *menu;
GtkWidget *checkbtn_tunnelcmd;
GtkWidget *entry_tunnelcmd;
- GtkWidget *imapdir_label;
- GtkWidget *imapdir_entry;
GtkWidget *folder_frame;
GtkWidget *vbox3;
GtkWidget *table;
GtkWidget *sent_folder_chkbtn;
GtkWidget *sent_folder_entry;
+ GtkWidget *queue_folder_chkbtn;
+ GtkWidget *queue_folder_entry;
GtkWidget *draft_folder_chkbtn;
GtkWidget *draft_folder_entry;
GtkWidget *trash_folder_chkbtn;
SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
PACK_HBOX (hbox1);
- imapdir_label = gtk_label_new (_("IMAP server directory"));
- gtk_widget_show (imapdir_label);
- gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
-
- imapdir_entry = gtk_entry_new();
- gtk_widget_show (imapdir_entry);
- gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
-
#undef PACK_HBOX
#undef PACK_PORT_ENTRY
gtk_container_add (GTK_CONTAINER (folder_frame), vbox3);
gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
- table = gtk_table_new (3, 3, FALSE);
+ table = gtk_table_new (4, 3, FALSE);
gtk_widget_show (table);
gtk_container_add (GTK_CONTAINER (vbox3), table);
gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
GTK_EXPAND | GTK_SHRINK | GTK_FILL, \
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); \
\
- button = gtk_button_new_with_label (_(" ... ")); \
+ button = gtkut_get_browse_file_btn(_("Browse")); \
gtk_widget_show (button); \
gtk_table_attach (GTK_TABLE (table), button, \
2, 3, n, n + 1, GTK_FILL, 0, 0, 0); \
SET_CHECK_BTN_AND_ENTRY(_("Put sent messages in"),
sent_folder_chkbtn, sent_folder_entry, 0);
+ SET_CHECK_BTN_AND_ENTRY(_("Put queued messages in"),
+ queue_folder_chkbtn, queue_folder_entry, 1);
SET_CHECK_BTN_AND_ENTRY(_("Put draft messages in"),
- draft_folder_chkbtn, draft_folder_entry, 1);
+ draft_folder_chkbtn, draft_folder_entry, 2);
SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages in"),
- trash_folder_chkbtn, trash_folder_entry, 2);
+ trash_folder_chkbtn, trash_folder_entry, 3);
advanced.smtpport_chkbtn = checkbtn_smtpport;
advanced.smtpport_entry = entry_smtpport;
advanced.tunnelcmd_chkbtn = checkbtn_tunnelcmd;
advanced.tunnelcmd_entry = entry_tunnelcmd;
- advanced.imapdir_label = imapdir_label;
- advanced.imapdir_entry = imapdir_entry;
advanced.sent_folder_chkbtn = sent_folder_chkbtn;
advanced.sent_folder_entry = sent_folder_entry;
+ advanced.queue_folder_chkbtn = queue_folder_chkbtn;
+ advanced.queue_folder_entry = queue_folder_entry;
advanced.draft_folder_chkbtn = draft_folder_chkbtn;
advanced.draft_folder_entry = draft_folder_entry;
advanced.trash_folder_chkbtn = trash_folder_chkbtn;
advanced.trash_folder_entry = trash_folder_entry;
}
-static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
- gpointer data)
-{
- prefs_account_cancel();
- return TRUE;
-}
-
-static gboolean prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
-{
- if (event && event->keyval == GDK_Escape)
- prefs_account_cancel();
- return FALSE;
-}
-
-static void prefs_account_ok(void)
-{
- if (prefs_account_apply() == 0)
- gtk_main_quit();
-}
-
static gint prefs_account_apply(void)
{
RecvProtocol protocol;
GtkWidget *menu;
GtkWidget *menuitem;
-
+ gchar *old_id = NULL;
+ gchar *new_id = NULL;
+
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(basic.protocol_optmenu));
menuitem = gtk_menu_get_active(GTK_MENU(menu));
protocol = GPOINTER_TO_INT
alertpanel_error(_("mail command is not entered."));
return -1;
}
-
+
+ if (protocol == A_IMAP4 || protocol == A_NNTP)
+ old_id = g_strdup_printf("#%s/%s",
+ protocol == A_IMAP4 ? "imap":"nntp",
+ tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
+
prefs_set_data_from_dialog(param);
+
+ if (protocol == A_IMAP4 || protocol == A_NNTP) {
+ new_id = g_strdup_printf("#%s/%s",
+ protocol == A_IMAP4 ? "imap":"nntp",
+ tmp_ac_prefs.account_name);
+ if (old_id != NULL && new_id != NULL)
+ prefs_filtering_rename_path(old_id, new_id);
+ g_free(old_id);
+ g_free(new_id);
+ }
return 0;
}
-static void prefs_account_cancel(void)
-{
- cancelled = TRUE;
- gtk_main_quit();
-}
-
static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
{
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry,
}
}
+static void prefs_account_sigfile_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+ gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), TRUE);
+}
+
+static void prefs_account_sigcmd_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+ gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), FALSE);
+}
+
+static void prefs_account_signature_browse_cb(GtkWidget *widget, gpointer data)
+{
+ gchar *filename;
+ gchar *utf8_filename;
+
+ filename = filesel_select_file_open(_("Select signature file"), NULL);
+ if (!filename) return;
+
+ utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+ if (!utf8_filename) {
+ g_warning("prefs_account_signature_browse_cb(): failed to convert character set.");
+ utf8_filename = g_strdup(filename);
+ }
+ gtk_entry_set_text(GTK_ENTRY(entry_sigpath), utf8_filename);
+ g_free(utf8_filename);
+}
+
static void prefs_account_edit_custom_header(void)
{
prefs_custom_header_open(&tmp_ac_prefs);
GtkWidget *menuitem;
switch (type) {
- case SMTPAUTH_LOGIN:
+ case SMTPAUTH_PLAIN:
gtk_option_menu_set_history(optmenu, 1);
break;
- case SMTPAUTH_CRAM_MD5:
+ case SMTPAUTH_LOGIN:
gtk_option_menu_set_history(optmenu, 2);
break;
- case SMTPAUTH_DIGEST_MD5:
+ case SMTPAUTH_CRAM_MD5:
gtk_option_menu_set_history(optmenu, 3);
break;
+ case SMTPAUTH_DIGEST_MD5:
+ gtk_option_menu_set_history(optmenu, 4);
+ break;
case 0:
default:
gtk_option_menu_set_history(optmenu, 0);
(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
gtk_widget_hide(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
+ gtk_widget_hide(receive.local_frame);
gtk_widget_show(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
/* update pop_before_smtp sensitivity */
gtk_toggle_button_set_active
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
if (!tmp_ac_prefs.account_name) {
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
FALSE);
gtk_widget_hide(ssl.pop_frame);
gtk_widget_hide(ssl.imap_frame);
gtk_widget_show(ssl.nntp_frame);
- gtk_widget_hide(ssl.send_frame);
+ gtk_widget_show(ssl.send_frame);
#endif
gtk_widget_hide(advanced.popport_hbox);
gtk_widget_hide(advanced.imapport_hbox);
gtk_widget_show(advanced.crosspost_colormenu);
gtk_widget_hide(advanced.tunnelcmd_chkbtn);
gtk_widget_hide(advanced.tunnelcmd_entry);
- gtk_widget_hide(advanced.imapdir_label);
- gtk_widget_hide(advanced.imapdir_entry);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
case A_LOCAL:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_hide(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
+ gtk_widget_show(receive.local_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
if (!tmp_ac_prefs.account_name) {
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
TRUE);
gtk_widget_hide(advanced.crosspost_colormenu);
gtk_widget_hide(advanced.tunnelcmd_chkbtn);
gtk_widget_hide(advanced.tunnelcmd_entry);
- gtk_widget_hide(advanced.imapdir_label);
- gtk_widget_hide(advanced.imapdir_entry);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
case A_IMAP4:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_set_sensitive(basic.pass_entry, TRUE);
gtk_widget_hide(receive.pop3_frame);
gtk_widget_show(receive.imap_frame);
+ gtk_widget_hide(receive.local_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
if (!tmp_ac_prefs.account_name) {
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
FALSE);
gtk_widget_hide(advanced.crosspost_colormenu);
gtk_widget_show(advanced.tunnelcmd_chkbtn);
gtk_widget_show(advanced.tunnelcmd_entry);
- gtk_widget_show(advanced.imapdir_label);
- gtk_widget_show(advanced.imapdir_entry);
+ gtk_widget_show(receive.imapdir_label);
+ gtk_widget_show(receive.imapdir_entry);
break;
case A_NONE:
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
gtk_widget_hide(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
+ gtk_widget_hide(receive.local_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, FALSE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
/* update pop_before_smtp sensitivity */
gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
pop_bfr_smtp_tm_set_sens(NULL, NULL);
-
+
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), FALSE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE);
gtk_widget_hide(advanced.crosspost_colormenu);
gtk_widget_hide(advanced.tunnelcmd_chkbtn);
gtk_widget_hide(advanced.tunnelcmd_entry);
- gtk_widget_hide(advanced.imapdir_label);
- gtk_widget_hide(advanced.imapdir_entry);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
case A_POP3:
default:
gtk_widget_set_sensitive(receive.pop3_frame, TRUE);
gtk_widget_show(receive.pop3_frame);
gtk_widget_hide(receive.imap_frame);
+ gtk_widget_hide(receive.local_frame);
gtk_widget_hide(receive.frame_maxarticle);
+ gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
pop_bfr_smtp_tm_set_sens(NULL, NULL);
if (!tmp_ac_prefs.account_name) {
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn),
+ TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
TRUE);
gtk_widget_hide(advanced.crosspost_colormenu);
gtk_widget_hide(advanced.tunnelcmd_chkbtn);
gtk_widget_hide(advanced.tunnelcmd_entry);
- gtk_widget_hide(advanced.imapdir_label);
- gtk_widget_hide(advanced.imapdir_entry);
+ gtk_widget_hide(receive.imapdir_label);
+ gtk_widget_hide(receive.imapdir_entry);
break;
}
prefs_pages = g_slist_append(prefs_pages, page);
}
-void prefs_acount_unregister_page(PrefsPage *page)
+void prefs_account_unregister_page(PrefsPage *page)
{
prefs_pages = g_slist_remove(prefs_pages, page);
}
projects / claws.git / blobdiff