/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 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
#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 *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);
{"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,
+ {"mail_command", "/usr/sbin/sendmail", &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,
&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,
+ {"sign_key_id", NULL, &tmp_ac_prefs.sign_key_id, P_STRING,
&privacy.customkey_entry,
prefs_set_data_from_entry, prefs_set_entry},
#endif /* USE_GPGME */
#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);
-static void prefs_account_customhdr_edit (void);
-
#define VSPACING 12
#define VSPACING_NARROW 4
#define BOX_BORDER 16
if (id < 0) g_warning("wrong account id: %d\n", id);
ac_prefs->account_id = id;
- prefs_headers_read_config(ac_prefs);
+ prefs_custom_header_read_config(ac_prefs);
}
void prefs_account_save_config(PrefsAccount *ac_prefs)
{
gboolean new_account = FALSE;
+ if (prefs_rc_is_readonly(ACCOUNT_RC))
+ return ac_prefs;
+
debug_print(_("Opening account preferences window...\n"));
+ inc_autocheck_timer_remove();
+
cancelled = FALSE;
if (!ac_prefs) {
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",
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;
SET_ACTIVATE (menuitem);
MENUITEM_ADD (optmenu_menu, menuitem, _("News (NNTP)"), A_NNTP);
SET_ACTIVATE (menuitem);
- MENUITEM_ADD (optmenu_menu, menuitem, _("Local"), A_LOCAL);
- SET_ACTIVATE (menuitem);
- /*
- MENUITEM_ADD (optmenu_menu, menuitem, _("Local (without SMTP server)"), A_LOCAL_CMD);
+ MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
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 (8, 4, FALSE);
+ serv_table = gtk_table_new (6, 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_spacing (GTK_TABLE (serv_table), 3, 0);
gtk_table_set_col_spacings (GTK_TABLE (serv_table), 8);
nntpserv_entry = gtk_entry_new ();
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_table_set_row_spacing (GTK_TABLE (serv_table), 0, 0); */
+
+ nntpauth_chkbtn = gtk_check_button_new_with_label
+ (_("This server requires authentication"));
+ gtk_widget_show (nntpauth_chkbtn);
+ gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 4, 1, 2,
+ GTK_FILL, 0, 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);
-
- 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), recvserv_entry, 1, 4, 2, 3,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+ smtpserv_entry = gtk_entry_new ();
+ gtk_widget_show (smtpserv_entry);
+ gtk_table_attach (GTK_TABLE (serv_table), smtpserv_entry, 1, 4, 4, 5,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+
mailcmd_entry = gtk_entry_new ();
gtk_widget_show (mailcmd_entry);
- gtk_table_attach (GTK_TABLE (serv_table), mailcmd_entry, 1, 4, 5, 6,
+ gtk_table_attach (GTK_TABLE (serv_table), mailcmd_entry, 1, 4, 6, 7,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
- 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, 0);
- 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);
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_table_attach (GTK_TABLE (serv_table), recvserv_label, 0, 1, 2, 3,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5);
- 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_misc_set_alignment (GTK_MISC (smtpserv_label), 1, 0.5);
- gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);
-
- localmbox_label = gtk_label_new (_("mailbox of the user"));
+ localmbox_label = gtk_label_new (_("Local mailbox file"));
gtk_widget_show (localmbox_label);
gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 3, 4,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (localmbox_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); */
+
+ smtpserv_label = gtk_label_new (_("SMTP server (send)"));
+ gtk_widget_show (smtpserv_label);
+ gtk_table_attach (GTK_TABLE (serv_table), smtpserv_label, 0, 1, 4, 5,
+ GTK_FILL, 0, 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (smtpserv_label), 1, 0.5);
+/* 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_table_attach (GTK_TABLE (serv_table), mailcmd_chkbtn, 0, 4, 5, 6,
GTK_EXPAND | GTK_FILL,
- 0, 0, 0);
+ 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_table_attach (GTK_TABLE (serv_table), mailcmd_label, 0, 1, 6, 7,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (mailcmd_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); */
uid_label = gtk_label_new (_("User ID"));
gtk_widget_show (uid_label);
gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 7, 8,
0, 0, 0, 0);
+ SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, uid_label);
+ SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, pass_label);
+ SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, uid_entry);
+ SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, pass_entry);
+
basic.acname_entry = acname_entry;
basic.default_chkbtn = default_chkbtn;
PACK_CHECK_BUTTON (vbox2, rmmail_chkbtn,
_("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"));
+ _("Download all messages on server"));
+ PACK_CHECK_BUTTON
+ (vbox2, recvatgetall_chkbtn,
+ _("`Get 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);
_("Authenticate with POP3 before sending"));
gtk_widget_set_sensitive(pop_bfr_smtp_chkbtn, FALSE);
- gtk_signal_connect(GTK_OBJECT(customhdr_edit_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_account_customhdr_edit),
- NULL);
-
send.date_chkbtn = date_chkbtn;
send.msgid_chkbtn = msgid_chkbtn;
send.customhdr_chkbtn = customhdr_chkbtn;
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_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn)))) && *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;
}
gtk_main_quit();
}
-static void prefs_account_customhdr_edit(void)
+static void prefs_account_edit_custom_header(void)
{
- prefs_headers_open(&tmp_ac_prefs);
+ prefs_custom_header_open(&tmp_ac_prefs);
}
#if USE_GPGME
-
static void prefs_account_sign_key_set_data_from_radiobtn(PrefParam *pparam)
{
GtkRadioButton *radiobtn;
static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
{
RecvProtocol protocol;
+ gboolean active;
protocol = GPOINTER_TO_INT
(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
gtk_widget_show(basic.nntpserv_label);
gtk_widget_show(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, VSPACING_NARROW);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, TRUE);
gtk_widget_show(basic.nntpauth_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, VSPACING_NARROW);
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),
+ 2, 0);
+ gtk_widget_show(basic.smtpserv_label);
+ gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_hide(basic.localmbox_label);
gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
gtk_widget_hide(basic.mailcmd_label);
gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
gtk_widget_hide(basic.mailcmd_chkbtn);
- gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table), 3, 0);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_show(basic.uid_label);
+ gtk_widget_show(basic.pass_label);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, VSPACING_NARROW);
+
+ gtk_widget_set_sensitive(basic.uid_label, TRUE);
+ gtk_widget_set_sensitive(basic.pass_label, TRUE);
+
/* update userid/passwd sensitive state */
prefs_account_nntpauth_toggled
(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, 0);
+ 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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, 0);
gtk_widget_hide(basic.recvserv_label);
gtk_widget_hide(basic.recvserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, 0);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_show(basic.localmbox_label);
gtk_widget_show(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, VSPACING_NARROW);
gtk_widget_show(basic.mailcmd_label);
gtk_widget_show(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, VSPACING_NARROW);
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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, VSPACING_NARROW);
+ gtk_widget_hide(basic.uid_label);
+ gtk_widget_hide(basic.pass_label);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, 0);
+
+ gtk_widget_set_sensitive(basic.uid_label, TRUE);
+ gtk_widget_set_sensitive(basic.pass_label, TRUE);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
break;
- /*
- 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_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_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);
- break;
- */
case A_IMAP4:
- gtk_widget_set_sensitive(basic.inbox_label, TRUE);
- gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
+ gtk_widget_set_sensitive(basic.inbox_label, FALSE);
+ gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, 0);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpauth_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, 0);
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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, VSPACING_NARROW);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_hide(basic.localmbox_label);
gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
gtk_widget_hide(basic.mailcmd_label);
gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
gtk_widget_hide(basic.mailcmd_chkbtn);
- gtk_table_set_row_spacing
- (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_show(basic.uid_label);
+ gtk_widget_show(basic.pass_label);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, 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: // POP3
+ case A_POP3:
+ default:
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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, 0);
+ gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpauth_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, 0);
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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, VSPACING_NARROW);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_hide(basic.localmbox_label);
gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
gtk_widget_hide(basic.mailcmd_label);
gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
gtk_widget_hide(basic.mailcmd_chkbtn);
- gtk_table_set_row_spacing
- (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_show(basic.uid_label);
+ gtk_widget_show(basic.pass_label);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, 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);
{
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.mailcmd_label, use_mailcmd);
gtk_widget_set_sensitive(basic.smtpserv_entry, !use_mailcmd);
gtk_widget_set_sensitive(basic.smtpserv_label, !use_mailcmd);
+ gtk_widget_set_sensitive(basic.uid_entry, !use_mailcmd);
+ gtk_widget_set_sensitive(basic.pass_entry, !use_mailcmd);
}
projects / claws.git / blobdiff