/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005 Colin Leroy <colin@colino.net> & The Sylpheed-Claws Team
+ * Copyright (C) 2005-2007 Colin Leroy <colin@colino.net> & 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
*
* 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 "gtk/prefswindow.h"
#include "manage_window.h"
+#ifdef HAVE_LIBETPAN
+#include "imap-thread.h"
+#endif
typedef struct _OtherPage
{
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
GtkWidget *checkbtn_cliplog;
- GtkWidget *loglength_entry;
+ GtkWidget *spinbtn_loglength;
GtkWidget *spinbtn_iotimeout;
+ GtkWidget *chkbtn_never_send_retrcpt;
} OtherPage;
void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *hbox_cliplog;
GtkWidget *checkbtn_cliplog;
GtkWidget *loglength_label;
- GtkWidget *loglength_entry;
+ GtkWidget *spinbtn_loglength;
+ GtkObject *spinbtn_loglength_adj;
GtkTooltips *loglength_tooltip;
+ GtkWidget *label;
GtkWidget *frame_exit;
GtkWidget *vbox_exit;
GtkWidget *label_iotimeout;
GtkWidget *spinbtn_iotimeout;
GtkObject *spinbtn_iotimeout_adj;
- gchar *tmp;
+
+ GtkWidget *chkbtn_never_send_retrcpt;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME (vbox1, frame_addr, _("Address book"));
-
- vbox_addr = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_addr);
- gtk_container_add (GTK_CONTAINER (frame_addr), vbox_addr);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_addr), 8);
+ vbox_addr = gtkut_get_options_frame(vbox1, &frame_addr, _("Address book"));
PACK_CHECK_BUTTON
(vbox_addr, checkbtn_addaddrbyclick,
_("Add address to destination when double-clicked"));
/* Clip Log */
- PACK_FRAME (vbox1, frame_cliplog, _("Log Size"));
+ vbox_cliplog = gtkut_get_options_frame(vbox1, &frame_cliplog, _("Log Size"));
- vbox_cliplog = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_cliplog);
- gtk_container_add (GTK_CONTAINER (frame_cliplog), vbox_cliplog);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_cliplog), 8);
PACK_CHECK_BUTTON (vbox_cliplog, checkbtn_cliplog,
_("Clip the log size"));
- hbox_cliplog = gtk_hbox_new (FALSE, 3);
+ hbox_cliplog = gtk_hbox_new (FALSE, 8);
gtk_container_add (GTK_CONTAINER (vbox_cliplog), hbox_cliplog);
gtk_widget_show (hbox_cliplog);
gtk_widget_show (GTK_WIDGET (loglength_label));
loglength_tooltip = gtk_tooltips_new();
-
- loglength_entry = gtk_entry_new ();
- gtk_widget_set_size_request (GTK_WIDGET (loglength_entry), 64, -1);
- gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_entry,
- FALSE, TRUE, 0);
- gtk_widget_show (GTK_WIDGET (loglength_entry));
- gtk_tooltips_set_tip(GTK_TOOLTIPS(loglength_tooltip), loglength_entry,
+
+ spinbtn_loglength_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 10);
+ spinbtn_loglength = gtk_spin_button_new
+ (GTK_ADJUSTMENT (spinbtn_loglength_adj), 1, 0);
+ gtk_widget_show (spinbtn_loglength);
+ gtk_box_pack_start (GTK_BOX (hbox_cliplog), spinbtn_loglength,
+ FALSE, FALSE, 0);
+ gtk_widget_set_size_request (GTK_WIDGET (spinbtn_loglength), 64, -1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_loglength), TRUE);
+
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(loglength_tooltip), spinbtn_loglength,
_("0 to stop logging in the log window"),
NULL);
- SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_entry);
- /* On Exit */
- PACK_FRAME (vbox1, frame_exit, _("On exit"));
+ label = gtk_label_new(_("lines"));
+ gtk_widget_show (label);
+ gtk_box_pack_start(GTK_BOX(hbox_cliplog), label, FALSE, FALSE, 0);
- vbox_exit = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_exit);
- gtk_container_add (GTK_CONTAINER (frame_exit), vbox_exit);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_exit), 8);
+ SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_label);
+ SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, spinbtn_loglength);
+ SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, label);
+
+ /* On Exit */
+ vbox_exit = gtkut_get_options_frame(vbox1, &frame_exit, _("On exit"));
PACK_CHECK_BUTTON (vbox_exit, checkbtn_confonexit,
_("Confirm on exit"));
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
- label_iotimeout = gtk_label_new (_("Socket I/O timeout:"));
+ label_iotimeout = gtk_label_new (_("Socket I/O timeout"));
gtk_widget_show (label_iotimeout);
gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
gtk_widget_show (label_iotimeout);
gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
+ PACK_CHECK_BUTTON(vbox1, chkbtn_never_send_retrcpt,
+ _("Never send Return Receipts"));
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_addaddrbyclick),
prefs_common.add_address_by_click);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_confonexit),
prefs_common.warn_queued_on_exit);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_cliplog),
prefs_common.cliplog);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_never_send_retrcpt),
+ prefs_common.never_send_retrcpt);
- tmp = g_strdup_printf("%d", prefs_common.loglength);
- gtk_entry_set_text(GTK_ENTRY(loglength_entry), tmp);
- g_free(tmp);
-
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_loglength),
+ prefs_common.loglength);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_iotimeout),
prefs_common.io_timeout_secs);
prefs_other->checkbtn_askonclean = checkbtn_askonclean;
prefs_other->checkbtn_warnqueued = checkbtn_warnqueued;
prefs_other->checkbtn_cliplog = checkbtn_cliplog;
- prefs_other->loglength_entry = loglength_entry;
+ prefs_other->spinbtn_loglength = spinbtn_loglength;
prefs_other->spinbtn_iotimeout = spinbtn_iotimeout;
+ prefs_other->chkbtn_never_send_retrcpt = chkbtn_never_send_retrcpt;
prefs_other->page.widget = vbox1;
}
{
OtherPage *page = (OtherPage *) _page;
MainWindow *mainwindow;
-
- gchar *tmp = gtk_editable_get_chars(GTK_EDITABLE(page->loglength_entry), 0, -1);
-
- if (tmp && atoi(tmp)) {
- prefs_common.loglength = atoi(tmp);
- }
-
+
prefs_common.add_address_by_click = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_addaddrbyclick));
prefs_common.confirm_on_exit = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_warnqueued));
prefs_common.cliplog = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_cliplog));
+ prefs_common.loglength = gtk_spin_button_get_value_as_int(
+ GTK_SPIN_BUTTON(page->spinbtn_loglength));
prefs_common.io_timeout_secs = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_iotimeout));
sock_set_io_timeout(prefs_common.io_timeout_secs);
+#ifdef HAVE_LIBETPAN
+ imap_main_set_timeout(prefs_common.io_timeout_secs);
+#endif
+ prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->chkbtn_never_send_retrcpt));
mainwindow = mainwindow_get_mainwindow();
log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
prefs_common.loglength);
projects / claws.git / blobdiff