/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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 "intl.h"
#include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "prefs_common.h"
#include "prefs_display_header.h"
#include "prefs_summary_column.h"
#include "gtkutils.h"
#include "alertpanel.h"
#include "folder.h"
+#include "socket.h"
#include "filesel.h"
#include "folderview.h"
#include "stock_pixmap.h"
#include "quote_fmt.h"
-#if USE_ASPELL
-#include "gtkaspell.h"
-#endif
-
PrefsCommon prefs_common;
static PrefsDialog dialog;
GtkWidget *checkbtn_newmail_manu;
GtkWidget *entry_newmail_notify_cmd;
GtkWidget *hbox_newmail_notify;
-
- GtkWidget *spinbtn_maxarticle;
- GtkObject *spinbtn_maxarticle_adj;
+ GtkWidget *optmenu_recvdialog;
+ GtkWidget *checkbtn_no_recv_err_panel;
+ GtkWidget *checkbtn_close_recv_dialog;
} receive;
static struct Send {
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_queuemsg;
+ GtkWidget *optmenu_senddialog;
GtkWidget *optmenu_charset;
+ GtkWidget *optmenu_encoding_method;
} p_send;
static struct Compose {
- GtkWidget *checkbtn_autosig;
- GtkWidget *entry_sigsep;
-
GtkWidget *entry_fw_quotemark;
GtkWidget *text_fw_quotefmt;
GtkWidget *checkbtn_forward_account_autosel;
GtkWidget *checkbtn_reedit_account_autosel;
GtkWidget *checkbtn_quote;
+ GtkWidget *checkbtn_default_reply_list;
GtkWidget *checkbtn_forward_as_attachment;
GtkWidget *checkbtn_redirect_keep_from;
GtkWidget *checkbtn_smart_wrapping;
GtkWidget *entry_autosave_length;
} compose;
- /* spelling */
-#if USE_ASPELL
-static struct Spelling {
- GtkWidget *checkbtn_enable_aspell;
- GtkWidget *entry_aspell_path;
- GtkWidget *btn_aspell_path;
- GtkWidget *optmenu_dictionary;
- GtkWidget *optmenu_sugmode;
- GtkWidget *misspelled_btn;
- GtkWidget *checkbtn_use_alternate;
- GtkWidget *checkbtn_check_while_typing;
-} spelling;
-#endif
-
static struct Quote {
GtkWidget *entry_quotemark;
GtkWidget *text_quotefmt;
GtkWidget *entry_boldfont;
GtkWidget *chkbtn_folder_unread;
- GtkWidget *chkbtn_display_img;
GtkWidget *entry_ng_abbrev_len;
GtkWidget *spinbtn_ng_abbrev_len;
GtkObject *spinbtn_ng_abbrev_len_adj;
GtkWidget *chkbtn_transhdr;
GtkWidget *chkbtn_swapfrom;
- GtkWidget *chkbtn_hscrollbar;
GtkWidget *chkbtn_useaddrbook;
- GtkWidget *chkbtn_expand_thread;
- GtkWidget *chkbtn_bold_unread;
+ GtkWidget *chkbtn_threadsubj;
GtkWidget *entry_datefmt;
} display;
GtkWidget *spinbtn_scrollstep;
GtkObject *spinbtn_scrollstep_adj;
GtkWidget *chkbtn_halfpage;
+
+ GtkWidget *chkbtn_attach_desc;
} message;
#if USE_GPGME
static struct Interface {
/* GtkWidget *checkbtn_emacs; */
- GtkWidget *checkbtn_show_msg_with_cursor;
+ GtkWidget *checkbtn_always_show_msg;
GtkWidget *checkbtn_openunread;
GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
- GtkWidget *checkbtn_addaddrbyclick;
- GtkWidget *optmenu_recvdialog;
- GtkWidget *optmenu_senddialog;
- GtkWidget *checkbtn_no_recv_err_panel;
- GtkWidget *checkbtn_close_recv_dialog;
GtkWidget *optmenu_nextunreadmsgdialog;
GtkWidget *entry_pixmap_theme;
GtkWidget *combo_pixmap_theme;
GtkWidget *printcmd_entry;
GtkWidget *exteditor_combo;
GtkWidget *exteditor_entry;
+
+ GtkWidget *checkbtn_addaddrbyclick;
GtkWidget *checkbtn_confonexit;
GtkWidget *checkbtn_cleanonexit;
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
GtkWidget *checkbtn_cliplog;
GtkWidget *loglength_entry;
+#if 0
+#ifdef USE_OPENSSL
+ GtkWidget *checkbtn_ssl_ask_unknown_valid;
+#endif
+#endif
+ GtkWidget *spinbtn_iotimeout;
+ GtkObject *spinbtn_iotimeout_adj;
} other;
static struct MessageColorButtons {
static GtkWidget *quote_color_win;
static GtkWidget *color_dialog;
-static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam);
-static void prefs_common_charset_set_optmenu (PrefParam *pparam);
+static void prefs_common_charset_set_data_from_optmenu (PrefParam *pparam);
+static void prefs_common_charset_set_optmenu (PrefParam *pparam);
+static void prefs_common_encoding_set_data_from_optmenu (PrefParam *pparam);
+static void prefs_common_encoding_set_optmenu (PrefParam *pparam);
+static void prefs_common_recv_dialog_set_data_from_optmenu (PrefParam *pparam);
+static void prefs_common_recv_dialog_set_optmenu (PrefParam *pparam);
static void prefs_common_recv_dialog_newmail_notify_toggle_cb (GtkWidget *w,
gpointer data);
static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam);
static void prefs_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam);
static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam);
-#if USE_ASPELL
-static void prefs_dictionary_set_data_from_optmenu (PrefParam *param);
-static void prefs_dictionary_set_optmenu (PrefParam *pparam);
-static void prefs_speller_sugmode_set_data_from_optmenu (PrefParam *pparam);
-static void prefs_speller_sugmode_set_optmenu (PrefParam *pparam);
-#endif
-
-
/*
parameter name, default value, pointer to the prefs variable, data type,
pointer to the widget pointer,
{"inc_local", "TRUE", &prefs_common.inc_local, P_BOOL,
&receive.checkbtn_local,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"filter_on_inc_local", "FALSE", &prefs_common.filter_on_inc, P_BOOL,
+ {"filter_on_inc_local", "TRUE", &prefs_common.filter_on_inc, P_BOOL,
&receive.checkbtn_filter_on_inc,
prefs_set_data_from_toggle, prefs_set_toggle},
{"spool_path", DEFAULT_SPOOL_PATH, &prefs_common.spool_path, P_STRING,
{"newmail_notify_cmd", "", &prefs_common.newmail_notify_cmd, P_STRING,
&receive.entry_newmail_notify_cmd,
prefs_set_data_from_entry, prefs_set_entry},
+ {"receive_dialog_mode", "1", &prefs_common.recv_dialog_mode, P_ENUM,
+ &receive.optmenu_recvdialog,
+ prefs_common_recv_dialog_set_data_from_optmenu,
+ prefs_common_recv_dialog_set_optmenu},
+ {"no_receive_error_panel", "FALSE", &prefs_common.no_recv_err_panel,
+ P_BOOL, &receive.checkbtn_no_recv_err_panel,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"close_receive_dialog", "TRUE", &prefs_common.close_recv_dialog,
+ P_BOOL, &receive.checkbtn_close_recv_dialog,
+ prefs_set_data_from_toggle, prefs_set_toggle},
- {"max_news_articles", "300", &prefs_common.max_articles, P_INT,
- &receive.spinbtn_maxarticle,
- prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-
/* Send */
{"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
&p_send.checkbtn_extsend,
{"queue_message", "FALSE", &prefs_common.queue_msg, P_BOOL,
&p_send.checkbtn_queuemsg,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"send_dialog_mode", "0", &prefs_common.send_dialog_mode, P_ENUM,
+ &p_send.optmenu_senddialog,
+ prefs_common_send_dialog_set_data_from_optmenu,
+ prefs_common_send_dialog_set_optmenu},
{"outgoing_charset", CS_AUTO, &prefs_common.outgoing_charset, P_STRING,
&p_send.optmenu_charset,
prefs_common_charset_set_data_from_optmenu,
prefs_common_charset_set_optmenu},
+ {"encoding_method", "0", &prefs_common.encoding_method, P_ENUM,
+ &p_send.optmenu_encoding_method,
+ prefs_common_encoding_set_data_from_optmenu,
+ prefs_common_encoding_set_optmenu},
/* Compose */
- {"auto_signature", "TRUE", &prefs_common.auto_sig, P_BOOL,
- &compose.checkbtn_autosig,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"signature_separator", "-- ", &prefs_common.sig_sep, P_STRING,
- &compose.entry_sigsep, prefs_set_data_from_entry, prefs_set_entry},
-
{"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
&compose.checkbtn_autoextedit,
prefs_set_data_from_toggle, prefs_set_toggle},
P_INT, &compose.entry_autosave_length,
prefs_set_data_from_entry, prefs_set_entry},
#if USE_ASPELL
- {"enable_aspell", "TRUE", &prefs_common.enable_aspell,
- P_BOOL, &spelling.checkbtn_enable_aspell,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"aspell_path", ASPELL_PATH, &prefs_common.aspell_path,
- P_STRING, &spelling.entry_aspell_path,
- prefs_set_data_from_entry, prefs_set_entry},
- {"dictionary", "", &prefs_common.dictionary,
- P_STRING, &spelling.optmenu_dictionary,
- prefs_dictionary_set_data_from_optmenu, prefs_dictionary_set_optmenu },
- {"aspell_sugmode", "1", &prefs_common.aspell_sugmode,
- P_INT, &spelling.optmenu_sugmode,
- prefs_speller_sugmode_set_data_from_optmenu, prefs_speller_sugmode_set_optmenu },
- {"use_alternate_dict", "FALSE", &prefs_common.use_alternate,
- P_BOOL, &spelling.checkbtn_use_alternate,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"check_while_typing", "TRUE", &prefs_common.check_while_typing,
- P_BOOL, &spelling.checkbtn_check_while_typing,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_INT,
+ {"enable_aspell", "TRUE", &prefs_common.enable_aspell, P_BOOL,
+ NULL, NULL, NULL},
+ {"aspell_path", ASPELL_PATH, &prefs_common.aspell_path, P_STRING,
+ NULL, NULL, NULL},
+ {"dictionary", "", &prefs_common.dictionary, P_STRING,
+ NULL, NULL, NULL},
+ {"aspell_sugmode", "1", &prefs_common.aspell_sugmode, P_INT,
+ NULL, NULL, NULL},
+ {"use_alternate_dict", "FALSE", &prefs_common.use_alternate, P_BOOL,
+ NULL, NULL, NULL},
+ {"check_while_typing", "TRUE", &prefs_common.check_while_typing, P_BOOL,
+ NULL, NULL, NULL},
+ {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_COLOR,
NULL, NULL, NULL},
#endif
{"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
&compose.checkbtn_reedit_account_autosel,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
+ &compose.checkbtn_default_reply_list,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
NULL, NULL, NULL},
/* Display */
{"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
NULL, NULL, NULL},
- {"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
+ {"message_font", "Helvetica 14",
&prefs_common.textfont, P_STRING,
&display.entry_textfont,
prefs_set_data_from_entry, prefs_set_entry},
- {"small_font", "-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
+ {"small_font", "Helvetica 10",
&prefs_common.smallfont, P_STRING,
&display.entry_smallfont,
prefs_set_data_from_entry, prefs_set_entry},
- {"bold_font", "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
+ {"bold_font", "Helvetica Bold 14",
&prefs_common.boldfont, P_STRING,
&display.entry_boldfont,
prefs_set_data_from_entry, prefs_set_entry},
- {"normal_font", "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
+ {"normal_font", "Helvetica 14",
&prefs_common.normalfont, P_STRING,
&display.entry_normalfont,
prefs_set_data_from_entry, prefs_set_entry},
+#if 0 /* sylpheed-gtk2(original) separate font setting with gtk+-1.2 version */
+ /* Obsolete fonts. For coexisting with Gtk+-1.2 version */
+ {"widget_font", NULL, &prefs_common.widgetfont_gtk1, P_STRING,
+ NULL, NULL, NULL},
+ {"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
+ &prefs_common.textfont_gtk1, P_STRING,
+ NULL, NULL, NULL},
+ {"normal_font", DEFAULT_NORMAL_FONT_GTK1, &prefs_common.normalfont_gtk1, P_STRING,
+ NULL, NULL, NULL},
+ {"bold_font", DEFAULT_BOLD_FONT_GTK1, &prefs_common.boldfont_gtk1, P_STRING,
+ NULL, NULL, NULL},
+ {"small_font", DEFAULT_SMALL_FONT_GTK1, &prefs_common.smallfont_gtk1, P_STRING,
+ NULL, NULL, NULL},
+
+ /* new fonts */
+ {"widget_font_gtk2", NULL, &prefs_common.widgetfont, P_STRING,
+ NULL, NULL, NULL},
+ {"message_font_gtk2", DEFAULT_MESSAGE_FONT,
+ &prefs_common.textfont, P_STRING,
+ &display.entry_textfont,
+ prefs_set_data_from_entry, prefs_set_entry},
+ {"normal_font_gtk2", DEFAULT_NORMAL_FONT, &prefs_common.normalfont, P_STRING,
+ NULL, NULL, NULL},
+ {"bold_font_gtk2", DEFAULT_BOLD_FONT, &prefs_common.boldfont, P_STRING,
+ NULL, NULL, NULL},
+ {"small_font_gtk2", DEFAULT_SMALL_FONT, &prefs_common.smallfont, P_STRING,
+ NULL, NULL, NULL},
+ {"title_font_gtk2", DEFAULT_TITLE_FONT, &prefs_common.titlefont, P_STRING,
+ NULL, NULL, NULL},
+#endif
+
{"display_folder_unread_num", "TRUE",
&prefs_common.display_folder_unread, P_BOOL,
&display.chkbtn_folder_unread,
prefs_set_data_from_toggle, prefs_set_toggle},
-
- {"display_img", "TRUE",
- &prefs_common.display_img, P_BOOL,
- &display.chkbtn_display_img,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"newsgroup_abbrev_len", "16",
&prefs_common.ng_abbrev_len, P_INT,
&display.spinbtn_ng_abbrev_len,
{"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
&display.chkbtn_swapfrom,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
- &display.chkbtn_hscrollbar,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"use_address_book", "TRUE", &prefs_common.use_addr_book, P_BOOL,
&display.chkbtn_useaddrbook,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"thread_by_subject", "TRUE", &prefs_common.thread_by_subject, P_BOOL,
+ &display.chkbtn_threadsubj,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"date_format", "%y/%m/%d(%a) %H:%M", &prefs_common.date_format,
P_STRING, &display.entry_datefmt,
prefs_set_data_from_entry, prefs_set_entry},
- {"expand_thread", "TRUE", &prefs_common.expand_thread, P_BOOL,
- &display.chkbtn_expand_thread,
- prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
+ NULL, NULL, NULL},
{"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL,
- &display.chkbtn_bold_unread,
- prefs_set_data_from_toggle, prefs_set_toggle},
+ NULL, NULL, NULL},
+ {"thread_by_subject_max_age", "10", &prefs_common.thread_by_subject_max_age,
+ P_INT, NULL, NULL, NULL },
{"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
NULL, NULL, NULL},
{"summary_col_show_mark", "TRUE",
&prefs_common.summary_col_visible[S_COL_MARK], P_BOOL, NULL, NULL, NULL},
{"summary_col_show_unread", "TRUE",
- &prefs_common.summary_col_visible[S_COL_UNREAD], P_BOOL, NULL, NULL, NULL},
+ &prefs_common.summary_col_visible[S_COL_STATUS], P_BOOL, NULL, NULL, NULL},
{"summary_col_show_mime", "TRUE",
&prefs_common.summary_col_visible[S_COL_MIME], P_BOOL, NULL, NULL, NULL},
{"summary_col_show_subject", "TRUE",
{"summary_col_pos_mark", "0",
&prefs_common.summary_col_pos[S_COL_MARK], P_INT, NULL, NULL, NULL},
{"summary_col_pos_unread", "1",
- &prefs_common.summary_col_pos[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+ &prefs_common.summary_col_pos[S_COL_STATUS], P_INT, NULL, NULL, NULL},
{"summary_col_pos_mime", "2",
&prefs_common.summary_col_pos[S_COL_MIME], P_INT, NULL, NULL, NULL},
{"summary_col_pos_subject", "3",
{"summary_col_size_mark", "10",
&prefs_common.summary_col_size[S_COL_MARK], P_INT, NULL, NULL, NULL},
{"summary_col_size_unread", "13",
- &prefs_common.summary_col_size[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+ &prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
{"summary_col_size_mime", "10",
&prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
{"summary_col_size_subject", "200",
&prefs_common.summary_col_size[S_COL_LOCKED], P_INT, NULL, NULL, NULL},
/* Widget size */
+ {"folderwin_x", "16", &prefs_common.folderwin_x, P_INT,
+ NULL, NULL, NULL},
+ {"folderwin_y", "16", &prefs_common.folderwin_y, P_INT,
+ NULL, NULL, NULL},
{"folderview_width", "179", &prefs_common.folderview_width, P_INT,
NULL, NULL, NULL},
{"folderview_height", "600", &prefs_common.folderview_height, P_INT,
NULL, NULL, NULL},
+ {"folderview_visible", "TRUE", &prefs_common.folderview_visible, P_BOOL,
+ NULL, NULL, NULL},
+
{"folder_col_folder", "150", &prefs_common.folder_col_folder, P_INT,
NULL, NULL, NULL},
{"folder_col_new", "32", &prefs_common.folder_col_new, P_INT,
{"summaryview_height", "173", &prefs_common.summaryview_height, P_INT,
NULL, NULL, NULL},
+ {"main_messagewin_x", "256", &prefs_common.main_msgwin_x, P_INT,
+ NULL, NULL, NULL},
+ {"main_messagewin_y", "210", &prefs_common.main_msgwin_y, P_INT,
+ NULL, NULL, NULL},
+ {"messageview_width", "600", &prefs_common.msgview_width, P_INT,
+ NULL, NULL, NULL},
+ {"messageview_height", "540", &prefs_common.msgview_height, P_INT,
+ NULL, NULL, NULL},
+ {"messageview_visible", "TRUE", &prefs_common.msgview_visible, P_BOOL,
+ NULL, NULL, NULL},
+
{"mainview_x", "64", &prefs_common.mainview_x, P_INT,
NULL, NULL, NULL},
{"mainview_y", "64", &prefs_common.mainview_y, P_INT,
NULL, NULL, NULL},
{"messagewin_height", "540", &prefs_common.msgwin_height, P_INT,
NULL, NULL, NULL},
+ {"sourcewin_width", "600", &prefs_common.sourcewin_width, P_INT,
+ NULL, NULL, NULL},
+ {"sourcewin_height", "500", &prefs_common.sourcewin_height, P_INT,
+ NULL, NULL, NULL},
{"compose_width", "600", &prefs_common.compose_width, P_INT,
NULL, NULL, NULL},
{"compose_height", "560", &prefs_common.compose_height, P_INT,
&message.chkbtn_enablecol,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_INT,
+ {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_COLOR,
NULL, NULL, NULL},
- {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_INT,
+ {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_COLOR,
NULL, NULL, NULL},
- {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_INT,
+ {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_COLOR,
NULL, NULL, NULL},
- {"uri_color", "32512", &prefs_common.uri_col, P_INT,
+ {"uri_color", "32512", &prefs_common.uri_col, P_COLOR,
NULL, NULL, NULL},
- {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_INT,
+ {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR,
NULL, NULL, NULL},
- {"signature_color", "7960953", &prefs_common.signature_col, P_INT,
+ {"signature_color", "7960953", &prefs_common.signature_col, P_COLOR,
NULL, NULL, NULL},
{"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
P_BOOL, NULL, NULL, NULL},
{"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
NULL, NULL, NULL},
+ {"attach_desc", "TRUE", &prefs_common.attach_desc, P_BOOL,
+ &message.chkbtn_attach_desc,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
/* MIME viewer */
{"mime_image_viewer", "display '%s'",
&prefs_common.mime_image_viewer, P_STRING, NULL, NULL, NULL},
/* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
NULL, NULL, NULL}, */
- {"show_message_with_cursor_key", "FALSE",
- &prefs_common.show_msg_with_cursor_key,
- P_BOOL, &interface.checkbtn_show_msg_with_cursor,
+ {"always_show_message_when_selected", "FALSE",
+ &prefs_common.always_show_msg,
+ P_BOOL, &interface.checkbtn_always_show_msg,
prefs_set_data_from_toggle, prefs_set_toggle},
{"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
P_BOOL, &interface.checkbtn_openunread,
{"immediate_execution", "TRUE", &prefs_common.immediate_exec, P_BOOL,
&interface.checkbtn_immedexec,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"receive_dialog_mode", "1", &prefs_common.recv_dialog_mode, P_ENUM,
- &interface.optmenu_recvdialog,
- prefs_common_recv_dialog_set_data_from_optmenu,
- prefs_common_recv_dialog_set_optmenu},
- {"send_dialog_mode", "0", &prefs_common.send_dialog_mode, P_ENUM,
- &interface.optmenu_senddialog,
- prefs_common_send_dialog_set_data_from_optmenu,
- prefs_common_send_dialog_set_optmenu},
- {"no_receive_error_panel", "FALSE", &prefs_common.no_recv_err_panel,
- P_BOOL, &interface.checkbtn_no_recv_err_panel,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"close_receive_dialog", "TRUE", &prefs_common.close_recv_dialog,
- P_BOOL, &interface.checkbtn_close_recv_dialog,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"nextunreadmsg_dialog", NULL, &prefs_common.next_unread_msg_dialog, P_ENUM,
&interface.optmenu_nextunreadmsgdialog,
prefs_nextunreadmsgdialog_set_data_from_optmenu,
prefs_nextunreadmsgdialog_set_optmenu},
- {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
- P_BOOL, &interface.checkbtn_addaddrbyclick,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"pixmap_theme_path", DEFAULT_PIXMAP_THEME,
&prefs_common.pixmap_theme_path, P_STRING,
&interface.entry_pixmap_theme, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
+ NULL, NULL, NULL},
/* Other */
- {"uri_open_command", "netscape -remote 'openURL(%s,raise)'",
+ {"uri_open_command", DEFAULT_BROWSER_CMD,
&prefs_common.uri_cmd, P_STRING,
&other.uri_entry, prefs_set_data_from_entry, prefs_set_entry},
{"print_command", "lpr %s", &prefs_common.print_cmd, P_STRING,
&prefs_common.ext_editor_cmd, P_STRING,
&other.exteditor_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
+ P_BOOL, &other.checkbtn_addaddrbyclick,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{"confirm_on_exit", "TRUE", &prefs_common.confirm_on_exit, P_BOOL,
&other.checkbtn_confonexit,
prefs_set_data_from_toggle, prefs_set_toggle},
{"warn_queued_on_exit", "TRUE", &prefs_common.warn_queued_on_exit,
P_BOOL, &other.checkbtn_warnqueued,
prefs_set_data_from_toggle, prefs_set_toggle},
+#if 0
+#ifdef USE_OPENSSL
+ {"ssl_ask_unknown_valid", "TRUE", &prefs_common.ssl_ask_unknown_valid,
+ P_BOOL, &other.checkbtn_ssl_ask_unknown_valid,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+#endif
+#endif
{"work_offline", "FALSE", &prefs_common.work_offline, P_BOOL,
NULL, NULL, NULL},
+ {"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
+ NULL, NULL, NULL},
+ {"io_timeout_secs", "60", &prefs_common.io_timeout_secs,
+ P_INT, &other.spinbtn_iotimeout,
+ prefs_set_data_from_spinbtn, prefs_set_spinbtn},
{"hide_score", "-9999", &prefs_common.kill_score, P_INT,
NULL, NULL, NULL},
{"important_score", "1", &prefs_common.important_score, P_INT,
NULL, NULL, NULL},
- {"clip_log", "FALSE", &prefs_common.cliplog, P_BOOL,
+ {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
&other.checkbtn_cliplog,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"log_length", "1000", &prefs_common.loglength, P_INT,
+ {"log_length", "500", &prefs_common.loglength, P_INT,
&other.loglength_entry,
prefs_set_data_from_entry, prefs_set_entry},
{"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
NULL, NULL, NULL},
+ {"color_new", "179", &prefs_common.color_new, P_COLOR,
+ NULL, NULL, NULL},
+
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
GtkWidget **widget);
static void date_format_cancel_btn_clicked (GtkButton *button,
GtkWidget **widget);
-static void date_format_key_pressed (GtkWidget *keywidget,
+static gboolean date_format_key_pressed (GtkWidget *keywidget,
GdkEventKey *event,
GtkWidget **widget);
static gboolean date_format_on_delete (GtkWidget *dialogwidget,
static void prefs_quote_colors_dialog (void);
static void prefs_quote_colors_dialog_create (void);
-static void prefs_quote_colors_key_pressed (GtkWidget *widget,
+static gboolean prefs_quote_colors_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void quote_color_set_dialog (GtkWidget *widget,
gpointer data);
static void quote_colors_set_dialog_cancel (GtkWidget *widget,
gpointer data);
-static void quote_colors_set_dialog_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
+static gboolean quote_colors_set_dialog_key_pressed (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
static void set_button_bg_color (GtkWidget *widget,
gint color);
static void prefs_enable_message_color_toggled (void);
static void prefs_font_select (GtkButton *button, GtkEntry *entry);
-static void prefs_font_selection_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data);
+static gboolean prefs_font_selection_key_pressed (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
static void prefs_font_selection_ok (GtkButton *button, GtkEntry *entry);
static void prefs_keybind_select (void);
static gint prefs_keybind_deleted (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static void prefs_keybind_key_pressed (GtkWidget *widget,
+static gboolean prefs_keybind_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void prefs_keybind_cancel (void);
static gint prefs_common_deleted (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static void prefs_common_key_pressed (GtkWidget *widget,
+static gboolean prefs_common_key_pressed(GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void prefs_common_ok (void);
static void prefs_common_apply (void);
static void prefs_common_cancel (void);
-void prefs_common_init() {
- prefs_common.fltlist = NULL;
+void prefs_common_init(void)
+{
prefs_common.disphdr_list = NULL;
}
+PrefsCommon *prefs_common_get(void)
+{
+ return &prefs_common;
+}
+
void prefs_common_read_config(void)
{
FILE *fp;
}
manage_window_set_transient(GTK_WINDOW(dialog.window));
- gtk_notebook_set_page(GTK_NOTEBOOK(dialog.notebook), 0);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog.notebook), 0);
gtk_widget_grab_focus(dialog.ok_btn);
prefs_set_dialog(param);
prefs_dialog_create(&dialog);
gtk_window_set_title (GTK_WINDOW(dialog.window),
_("Common Preferences"));
- gtk_signal_connect (GTK_OBJECT(dialog.window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_common_deleted), NULL);
- gtk_signal_connect (GTK_OBJECT(dialog.window), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_common_key_pressed), NULL);
+ g_signal_connect (G_OBJECT(dialog.window), "delete_event",
+ G_CALLBACK(prefs_common_deleted), NULL);
+ g_signal_connect (G_OBJECT(dialog.window), "key_press_event",
+ G_CALLBACK(prefs_common_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
- gtk_signal_connect (GTK_OBJECT(dialog.ok_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_common_ok), NULL);
- gtk_signal_connect (GTK_OBJECT(dialog.apply_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_common_apply), NULL);
+ g_signal_connect (G_OBJECT(dialog.ok_btn), "clicked",
+ G_CALLBACK(prefs_common_ok), NULL);
+ g_signal_connect (G_OBJECT(dialog.apply_btn), "clicked",
+ G_CALLBACK(prefs_common_apply), NULL);
gtk_signal_connect_object (GTK_OBJECT(dialog.cancel_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_common_cancel),
GTK_OBJECT(dialog.window));
SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"), page++);
prefs_compose_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
-#if USE_ASPELL
- prefs_spelling_create();
- SET_NOTEBOOK_LABEL(dialog.notebook, _("Spell Checker"), page++);
-#endif
prefs_quote_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Quote"), page++);
prefs_display_create();
GtkWidget *entry_newmail_notify_cmd;
GtkWidget *label_newmail_notify_cmd;
- GtkWidget *frame_news;
- GtkWidget *label_maxarticle;
- GtkWidget *spinbtn_maxarticle;
- GtkObject *spinbtn_maxarticle_adj;
+ GtkWidget *hbox_recvdialog;
+ GtkWidget *label_recvdialog;
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ GtkWidget *optmenu_recvdialog;
+ GtkWidget *checkbtn_no_recv_err_panel;
+ GtkWidget *checkbtn_close_recv_dialog;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
(GTK_ADJUSTMENT (spinbtn_autochk_adj), 1, 0);
gtk_widget_show (spinbtn_autochk);
gtk_box_pack_start (GTK_BOX (hbox_autochk), spinbtn_autochk, FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_autochk, 64, -1);
+ gtk_widget_set_size_request (spinbtn_autochk, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_autochk), TRUE);
label_autochk2 = gtk_label_new (_("minute(s)"));
PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
_("Update all local folders after incorporation"));
+
+ /* receive dialog */
+ hbox_recvdialog = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox_recvdialog);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox_recvdialog, FALSE, FALSE, 0);
+
+ label_recvdialog = gtk_label_new (_("Show receive dialog"));
+ gtk_misc_set_alignment(GTK_MISC(label_recvdialog), 0, 0.5);
+ gtk_widget_show (label_recvdialog);
+ gtk_box_pack_start (GTK_BOX (hbox_recvdialog), label_recvdialog, FALSE, FALSE, 0);
+
+ optmenu_recvdialog = gtk_option_menu_new ();
+ gtk_widget_show (optmenu_recvdialog);
+ gtk_box_pack_start (GTK_BOX (hbox_recvdialog), optmenu_recvdialog, FALSE, FALSE, 0);
+
+ menu = gtk_menu_new ();
+ MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
+ MENUITEM_ADD (menu, menuitem, _("Only on manual receiving"),
+ RECV_DIALOG_MANUAL);
+ MENUITEM_ADD (menu, menuitem, _("Never"), RECV_DIALOG_NEVER);
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
+ _("Don't popup error dialog on receive error"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_close_recv_dialog,
+ _("Close receive dialog when finished"));
PACK_FRAME(vbox1, frame_newmail, _("Run command when new mail "
"arrives"));
PACK_CHECK_BUTTON (hbox, checkbtn_newmail_manu,
_("after manual checking"));
gtk_box_pack_start (GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(checkbtn_newmail_auto), "toggled",
- GTK_SIGNAL_FUNC(prefs_common_recv_dialog_newmail_notify_toggle_cb),
- NULL);
- gtk_signal_connect(GTK_OBJECT(checkbtn_newmail_manu), "toggled",
- GTK_SIGNAL_FUNC(prefs_common_recv_dialog_newmail_notify_toggle_cb),
- NULL);
+ g_signal_connect(G_OBJECT(checkbtn_newmail_auto), "toggled",
+ G_CALLBACK(prefs_common_recv_dialog_newmail_notify_toggle_cb),
+ NULL);
+ g_signal_connect(G_OBJECT(checkbtn_newmail_manu), "toggled",
+ G_CALLBACK(prefs_common_recv_dialog_newmail_notify_toggle_cb),
+ NULL);
hbox_newmail_notify = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
prefs_common.newmail_notify_auto ||
prefs_common.newmail_notify_manu);
- PACK_FRAME(vbox1, frame_news, _("News"));
-
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (frame_news), hbox);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-
- label_maxarticle = gtk_label_new
- (_("Maximum number of articles to download\n"
- "(unlimited if 0 is specified)"));
- gtk_widget_show (label_maxarticle);
- gtk_box_pack_start (GTK_BOX (hbox), label_maxarticle, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label_maxarticle), GTK_JUSTIFY_LEFT);
-
- spinbtn_maxarticle_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 (hbox), spinbtn_maxarticle,
- FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_maxarticle, 64, -1);
- gtk_spin_button_set_numeric
- (GTK_SPIN_BUTTON (spinbtn_maxarticle), TRUE);
-
receive.checkbtn_incext = checkbtn_incext;
receive.entry_incext = entry_incext;
/* receive.button_incext = button_incext; */
receive.checkbtn_newmail_manu = checkbtn_newmail_manu;
receive.hbox_newmail_notify = hbox_newmail_notify;
receive.entry_newmail_notify_cmd = entry_newmail_notify_cmd;
-
- receive.spinbtn_maxarticle = spinbtn_maxarticle;
- receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj;
+ receive.optmenu_recvdialog = optmenu_recvdialog;
+ receive.checkbtn_no_recv_err_panel = checkbtn_no_recv_err_panel;
+ receive.checkbtn_close_recv_dialog = checkbtn_close_recv_dialog;
}
static void prefs_send_create(void)
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_queuemsg;
GtkWidget *label_outcharset;
- GtkWidget *optmenu;
+ GtkWidget *optmenu_charset;
GtkWidget *optmenu_menu;
GtkWidget *menuitem;
- GtkWidget *label_charset_desc;
+ GtkTooltips *charset_tooltip;
+ GtkWidget *optmenu_encoding;
+ GtkWidget *label_encoding;
+ GtkTooltips *encoding_tooltip;
+ GtkWidget *label_senddialog;
+ GtkWidget *menu;
+ GtkWidget *optmenu_senddialog;
+ GtkWidget *hbox_senddialog;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (vbox2, checkbtn_savemsg,
- _("Save sent messages to Sent"));
+ _("Save sent messages to Sent folder"));
PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg,
_("Queue messages that fail to send"));
+ hbox_senddialog = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox_senddialog, FALSE, FALSE, 0);
+
+ label_senddialog = gtk_label_new (_("Show send dialog"));
+ gtk_widget_show (label_senddialog);
+ gtk_box_pack_start (GTK_BOX (hbox_senddialog), label_senddialog, FALSE, FALSE, 0);
+
+ optmenu_senddialog = gtk_option_menu_new ();
+ gtk_widget_show (optmenu_senddialog);
+ gtk_box_pack_start (GTK_BOX (hbox_senddialog), optmenu_senddialog, FALSE, FALSE, 0);
+
+ menu = gtk_menu_new ();
+ MENUITEM_ADD (menu, menuitem, _("Always"), SEND_DIALOG_ALWAYS);
+ MENUITEM_ADD (menu, menuitem, _("Never"), SEND_DIALOG_NEVER);
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_senddialog), menu);
+
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
gtk_widget_show (label_outcharset);
gtk_box_pack_start (GTK_BOX (hbox1), label_outcharset, FALSE, FALSE, 0);
- optmenu = gtk_option_menu_new ();
- gtk_widget_show (optmenu);
- gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
+ charset_tooltip = gtk_tooltips_new();
+
+ optmenu_charset = gtk_option_menu_new ();
+ gtk_widget_show (optmenu_charset);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(charset_tooltip), optmenu_charset,
+ _("If `Automatic' is selected, the optimal encoding"
+ " for the current locale will be used"),
+ NULL);
+ gtk_box_pack_start (GTK_BOX (hbox1), optmenu_charset, FALSE, FALSE, 0);
optmenu_menu = gtk_menu_new ();
-#define SET_MENUITEM(str, charset) \
+#define SET_MENUITEM(str, data) \
{ \
- MENUITEM_ADD(optmenu_menu, menuitem, str, charset); \
+ MENUITEM_ADD(optmenu_menu, menuitem, str, data); \
}
SET_MENUITEM(_("Automatic (Recommended)"), CS_AUTO);
SET_MENUITEM(_("7bit ascii (US-ASCII)"), CS_US_ASCII);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
SET_MENUITEM(_("Unicode (UTF-8)"), CS_UTF_8);
#endif
SET_MENUITEM(_("Western European (ISO-8859-1)"), CS_ISO_8859_1);
SET_MENUITEM(_("Baltic (ISO-8859-4)"), CS_ISO_8859_4);
SET_MENUITEM(_("Greek (ISO-8859-7)"), CS_ISO_8859_7);
SET_MENUITEM(_("Turkish (ISO-8859-9)"), CS_ISO_8859_9);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
SET_MENUITEM(_("Cyrillic (ISO-8859-5)"), CS_ISO_8859_5);
#endif
SET_MENUITEM(_("Cyrillic (KOI8-R)"), CS_KOI8_R);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
SET_MENUITEM(_("Cyrillic (Windows-1251)"), CS_WINDOWS_1251);
SET_MENUITEM(_("Cyrillic (KOI8-U)"), CS_KOI8_U);
#endif
SET_MENUITEM(_("Thai (TIS-620)"), CS_TIS_620);
SET_MENUITEM(_("Thai (Windows-874)"), CS_WINDOWS_874);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_charset),
+ optmenu_menu);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
- label_charset_desc = gtk_label_new
- (_("If `Automatic' is selected, the optimal encoding\n"
- "for the current locale will be used."));
- gtk_widget_show (label_charset_desc);
- gtk_box_pack_start (GTK_BOX (hbox1), label_charset_desc,
- FALSE, FALSE, 0);
- gtk_label_set_justify(GTK_LABEL (label_charset_desc), GTK_JUSTIFY_LEFT);
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ label_encoding = gtk_label_new (_("Transfer encoding"));
+ gtk_widget_show (label_encoding);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_encoding, FALSE, FALSE, 0);
+
+ encoding_tooltip = gtk_tooltips_new();
+
+ optmenu_encoding = gtk_option_menu_new ();
+ gtk_widget_show (optmenu_encoding);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(encoding_tooltip), optmenu_encoding,
+ _("Specify Content-Transfer-Encoding used when"
+ " message body contains non-ASCII characters"),
+ NULL);
+ gtk_box_pack_start (GTK_BOX (hbox1), optmenu_encoding, FALSE, FALSE, 0);
+
+ optmenu_menu = gtk_menu_new ();
+
+ SET_MENUITEM(_("Automatic"), CTE_AUTO);
+ SET_MENUITEM("base64", CTE_BASE64);
+ SET_MENUITEM("quoted-printable", CTE_QUOTED_PRINTABLE);
+ SET_MENUITEM("8bit", CTE_8BIT);
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_encoding),
+ optmenu_menu);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
p_send.checkbtn_extsend = checkbtn_extsend;
p_send.entry_extsend = entry_extsend;
p_send.checkbtn_savemsg = checkbtn_savemsg;
p_send.checkbtn_queuemsg = checkbtn_queuemsg;
+ p_send.optmenu_senddialog = optmenu_senddialog;
- p_send.optmenu_charset = optmenu;
+ p_send.optmenu_charset = optmenu_charset;
+ p_send.optmenu_encoding_method = optmenu_encoding;
}
static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpointer data)
gtk_widget_set_sensitive(receive.hbox_newmail_notify, toggled);
}
-#if USE_ASPELL
-static void prefs_dictionary_set_data_from_optmenu(PrefParam *param)
-{
- gchar *str;
- gchar *dict_fullname;
-
- g_return_if_fail(param);
- g_return_if_fail(param->data);
- g_return_if_fail(param->widget);
- g_return_if_fail(*(param->widget));
-
- dict_fullname = gtkaspell_get_dictionary_menu_active_item
- (gtk_option_menu_get_menu(GTK_OPTION_MENU(*(param->widget))));
- str = *((gchar **) param->data);
- if (str)
- g_free(str);
- *((gchar **) param->data) = dict_fullname;
-}
-
-static void prefs_dictionary_set_optmenu(PrefParam *pparam)
-{
- GList *cur;
- GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
- GtkWidget *menu;
- GtkWidget *menuitem;
- gchar *dict_name;
- gint n = 0;
-
- g_return_if_fail(optmenu != NULL);
- g_return_if_fail(pparam->data != NULL);
-
- if (*(gchar **) pparam->data) {
- menu = gtk_option_menu_get_menu(optmenu);
- for (cur = GTK_MENU_SHELL(menu)->children;
- cur != NULL; cur = cur->next) {
- menuitem = GTK_WIDGET(cur->data);
- dict_name = gtk_object_get_data(GTK_OBJECT(menuitem),
- "dict_name");
- if (!strcmp2(dict_name, *((gchar **)pparam->data))) {
- gtk_option_menu_set_history(optmenu, n);
- return;
- }
- n++;
- }
- }
-
- gtk_option_menu_set_history(optmenu, 0);
- prefs_dictionary_set_data_from_optmenu(pparam);
-}
-
-static void prefs_speller_sugmode_set_data_from_optmenu(PrefParam *param)
-{
- gint sugmode;
- g_return_if_fail(param);
- g_return_if_fail(param->data);
- g_return_if_fail(param->widget);
- g_return_if_fail(*(param->widget));
-
- sugmode = gtkaspell_get_sugmode_from_option_menu
- (GTK_OPTION_MENU(*(param->widget)));
- *((gint *) param->data) = sugmode;
-}
-
-static void prefs_speller_sugmode_set_optmenu(PrefParam *pparam)
-{
- GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
- gint sugmode;
-
- g_return_if_fail(optmenu != NULL);
- g_return_if_fail(pparam->data != NULL);
-
- sugmode = *(gint *) pparam->data;
- gtkaspell_sugmode_option_menu_set(optmenu, sugmode);
-}
-
-
-static void prefs_spelling_checkbtn_enable_aspell_toggle_cb
- (GtkWidget *widget,
- gpointer data)
-{
- gboolean toggled;
-
- toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-
- gtk_widget_set_sensitive(spelling.entry_aspell_path, toggled);
- gtk_widget_set_sensitive(spelling.optmenu_dictionary, toggled);
- gtk_widget_set_sensitive(spelling.optmenu_sugmode, toggled);
- gtk_widget_set_sensitive(spelling.btn_aspell_path, toggled);
- gtk_widget_set_sensitive(spelling.misspelled_btn, toggled);
- gtk_widget_set_sensitive(spelling.checkbtn_use_alternate, toggled);
- gtk_widget_set_sensitive(spelling.checkbtn_check_while_typing, toggled);
-}
-
-static void prefs_spelling_btn_aspell_path_clicked_cb(GtkWidget *widget,
- gpointer data)
-{
- gchar *file_path, *tmp;
- GtkWidget *new_menu;
-
- file_path = filesel_select_file(_("Select dictionaries location"),
- prefs_common.aspell_path);
- if (file_path == NULL) {
- /* don't change */
- }
- else {
- tmp=g_dirname(file_path);
-
- if (prefs_common.aspell_path)
- g_free(prefs_common.aspell_path);
- prefs_common.aspell_path = g_strdup_printf("%s%s",tmp,
- G_DIR_SEPARATOR_S);
-
- new_menu = gtkaspell_dictionary_option_menu_new(prefs_common.aspell_path);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(spelling.optmenu_dictionary),
- new_menu);
-
- gtk_entry_set_text(GTK_ENTRY(spelling.entry_aspell_path),
- prefs_common.aspell_path);
- /* select first one */
- gtk_option_menu_set_history(GTK_OPTION_MENU(
- spelling.optmenu_dictionary), 0);
-
- if (prefs_common.dictionary)
- g_free(prefs_common.dictionary);
-
- prefs_common.dictionary =
- gtkaspell_get_dictionary_menu_active_item(
- gtk_option_menu_get_menu(
- GTK_OPTION_MENU(
- spelling.optmenu_dictionary)));
- g_free(tmp);
-
- }
-}
-
-static void prefs_spelling_create()
-{
- GtkWidget *vbox1;
- GtkWidget *frame_spell;
- GtkWidget *vbox_spell;
- GtkWidget *hbox_aspell_path;
- GtkWidget *checkbtn_enable_aspell;
- GtkWidget *label_aspell_path;
- GtkWidget *entry_aspell_path;
- GtkWidget *btn_aspell_path;
- GtkWidget *spell_table;
- GtkWidget *label_dictionary;
- GtkWidget *optmenu_dictionary;
- GtkWidget *sugmode_label;
- GtkWidget *sugmode_optmenu;
- GtkWidget *checkbtn_use_alternate;
- GtkWidget *help_label;
- GtkWidget *checkbtn_check_while_typing;
- GtkWidget *color_label;
- GtkWidget *col_align;
-
- 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), VBOX_BORDER);
-
- /* spell checker defaults */
- PACK_FRAME(vbox1, frame_spell, _("Global spelling checker settings"));
- vbox_spell = gtk_vbox_new(FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_spell);
- gtk_container_add(GTK_CONTAINER(frame_spell), vbox_spell);
- gtk_container_set_border_width(GTK_CONTAINER(vbox_spell), 8);
-
- PACK_CHECK_BUTTON(vbox_spell, checkbtn_enable_aspell,
- _("Enable spell checker"));
-
- gtk_signal_connect(GTK_OBJECT(checkbtn_enable_aspell), "toggled",
- GTK_SIGNAL_FUNC(prefs_spelling_checkbtn_enable_aspell_toggle_cb),
- NULL);
-
- /* Check while typing */
- PACK_CHECK_BUTTON(vbox_spell, checkbtn_check_while_typing,
- _("Check while typing"));
-
- PACK_CHECK_BUTTON(vbox_spell, checkbtn_use_alternate,
- _("Enable alternate dictionary"));
-
- help_label = gtk_label_new(_("Enabling alternate dictionary makes switching\nwith the last used dictionary faster."));
- gtk_widget_show(help_label);
- gtk_box_pack_start(GTK_BOX(vbox_spell), help_label, FALSE, TRUE, 0);
-
- spell_table = gtk_table_new(4, 3, FALSE);
- gtk_container_set_border_width (GTK_CONTAINER (spell_table), VSPACING);
- gtk_table_set_row_spacings(GTK_TABLE(spell_table), 8);
- gtk_table_set_col_spacings(GTK_TABLE(spell_table), 8);
-
- gtk_box_pack_start(GTK_BOX(vbox_spell), spell_table, TRUE, TRUE, 0);
-
- label_aspell_path = gtk_label_new (_("Dictionaries path:"));
- gtk_misc_set_alignment(GTK_MISC(label_aspell_path), 1.0, 0.5);
- gtk_widget_show(label_aspell_path);
- gtk_table_attach (GTK_TABLE (spell_table), label_aspell_path, 0, 1, 0,
- 1, GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
-
- hbox_aspell_path = gtk_hbox_new (FALSE, 8);
- gtk_table_attach (GTK_TABLE (spell_table), hbox_aspell_path, 1, 2, 0,
- 1, GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_widget_show(hbox_aspell_path);
-
- entry_aspell_path = gtk_entry_new();
- gtk_widget_show(entry_aspell_path);
- gtk_box_pack_start(GTK_BOX(hbox_aspell_path), entry_aspell_path, TRUE,
- TRUE, 0);
-
- gtk_widget_set_sensitive(entry_aspell_path, prefs_common.enable_aspell);
-
- btn_aspell_path = gtk_button_new_with_label(" ... ");
- gtk_widget_show(btn_aspell_path);
- gtk_box_pack_start(GTK_BOX(hbox_aspell_path), btn_aspell_path, FALSE, FALSE, 0);
- gtk_widget_set_sensitive(btn_aspell_path, prefs_common.enable_aspell);
-
- gtk_signal_connect(GTK_OBJECT(btn_aspell_path), "clicked",
- GTK_SIGNAL_FUNC(prefs_spelling_btn_aspell_path_clicked_cb),
- NULL);
-
- label_dictionary = gtk_label_new(_("Default dictionary:"));
- gtk_misc_set_alignment(GTK_MISC(label_dictionary), 1.0, 0.5);
- gtk_widget_show(label_dictionary);
- gtk_table_attach (GTK_TABLE (spell_table), label_dictionary, 0, 1, 1, 2,
- GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
-
- optmenu_dictionary = gtk_option_menu_new();
- gtk_widget_show(optmenu_dictionary);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary),
- gtkaspell_dictionary_option_menu_new(
- prefs_common.aspell_path));
- gtk_table_attach (GTK_TABLE (spell_table), optmenu_dictionary, 1, 2, 1,
- 2, GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_aspell);
-
- /* Suggestion mode */
- sugmode_label = gtk_label_new(_("Default suggestion mode"));
- gtk_misc_set_alignment(GTK_MISC(sugmode_label), 1.0, 0.5);
- gtk_widget_show(sugmode_label);
- gtk_table_attach(GTK_TABLE (spell_table), sugmode_label, 0, 1, 2, 3,
- GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
-
- sugmode_optmenu = gtk_option_menu_new();
- gtk_widget_show(sugmode_optmenu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
- gtkaspell_sugmode_option_menu_new(prefs_common.aspell_sugmode));
- gtk_table_attach(GTK_TABLE(spell_table), sugmode_optmenu, 1, 2, 2, 3,
- GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_widget_set_sensitive(sugmode_optmenu, prefs_common.enable_aspell);
-
- /* Color */
- color_label = gtk_label_new(_("Misspelled word color:"));
- gtk_misc_set_alignment(GTK_MISC(color_label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (spell_table), color_label, 0, 1, 3, 4,
- GTK_FILL, GTK_SHRINK, 0, 0);
- gtk_widget_show(color_label);
-
- col_align = gtk_alignment_new(0.0, 0.5, 0, 0);
- gtk_widget_show(col_align);
- gtk_table_attach (GTK_TABLE (spell_table), col_align, 1, 2, 3, 4,
- GTK_FILL, GTK_SHRINK, 0, 0);
-
- spelling.misspelled_btn = gtk_button_new_with_label ("");
- set_button_bg_color(spelling.misspelled_btn,
- prefs_common.misspelled_col);
- gtk_widget_set_usize (spelling.misspelled_btn, 30, 20);
- gtk_widget_set_sensitive(spelling.misspelled_btn, prefs_common.enable_aspell);
- gtk_signal_connect (GTK_OBJECT (spelling.misspelled_btn), "clicked",
- GTK_SIGNAL_FUNC(quote_color_set_dialog), "Misspelled word");
- gtk_container_add(GTK_CONTAINER(col_align), spelling.misspelled_btn);
-
-
- spelling.checkbtn_enable_aspell = checkbtn_enable_aspell;
- spelling.entry_aspell_path = entry_aspell_path;
- spelling.btn_aspell_path = btn_aspell_path;
- spelling.optmenu_dictionary = optmenu_dictionary;
- spelling.optmenu_sugmode = sugmode_optmenu;
- spelling.checkbtn_use_alternate = checkbtn_use_alternate;
- spelling.checkbtn_check_while_typing = checkbtn_check_while_typing;
-}
-
-#endif
-
-
static void prefs_compose_create(void)
{
GtkWidget *vbox1;
GtkWidget *vbox2;
- GtkWidget *hbox1;
-
- GtkWidget *frame_sig;
- GtkWidget *vbox_sig;
- GtkWidget *checkbtn_autosig;
- GtkWidget *label_sigsep;
- GtkWidget *entry_sigsep;
GtkWidget *checkbtn_autoextedit;
GtkWidget *checkbtn_autowrap;
GtkWidget *checkbtn_wrapatsend;
+ GtkWidget *checkbtn_default_reply_list;
+
GtkWidget *checkbtn_forward_as_attachment;
GtkWidget *checkbtn_redirect_keep_from;
GtkWidget *checkbtn_smart_wrapping;
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME(vbox1, frame_sig, _("Signature"));
-
- vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_sig);
- gtk_container_add (GTK_CONTAINER (frame_sig), vbox_sig);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_sig), 8);
-
- PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
- _("Insert signature automatically"));
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
- label_sigsep = gtk_label_new (_("Signature separator"));
- gtk_widget_show (label_sigsep);
- gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
-
- entry_sigsep = gtk_entry_new ();
- gtk_widget_show (entry_sigsep);
- gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
-
- gtk_widget_set_usize (entry_sigsep, 64, -1);
-
/* Account autoselection */
PACK_FRAME(vbox1, frame_autosel, _("Automatic account selection"));
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+ PACK_CHECK_BUTTON (vbox2, checkbtn_default_reply_list,
+ _("Reply button invokes mailing list reply"));
+
PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
_("Automatically launch the external editor"));
gtk_box_pack_start (GTK_BOX (vbox1), hbox_autosave, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (hbox_autosave, checkbtn_autosave,
- _("Autosave to drafts every "));
+ _("Autosave to Drafts folder every "));
entry_autosave_length = gtk_entry_new();
- gtk_widget_set_usize (entry_autosave_length, 64, -1);
+ gtk_widget_set_size_request (entry_autosave_length, 64, -1);
gtk_widget_show (entry_autosave_length);
gtk_box_pack_start (GTK_BOX (hbox_autosave), entry_autosave_length, FALSE, FALSE, 0);
(GTK_ADJUSTMENT (spinbtn_undolevel_adj), 1, 0);
gtk_widget_show (spinbtn_undolevel);
gtk_box_pack_start (GTK_BOX (hbox_undolevel), spinbtn_undolevel, FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_undolevel, 64, -1);
+ gtk_widget_set_size_request (spinbtn_undolevel, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_undolevel), TRUE);
/* line-wrapping */
(GTK_ADJUSTMENT (spinbtn_linewrap_adj), 1, 0);
gtk_widget_show (spinbtn_linewrap);
gtk_box_pack_start (GTK_BOX (hbox3), spinbtn_linewrap, FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_linewrap, 64, -1);
+ gtk_widget_set_size_request (spinbtn_linewrap, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_linewrap), TRUE);
label_linewrap = gtk_label_new (_("characters"));
compose.entry_quotemark = entry_quotemark;
compose.text_quotefmt = text_quotefmt;
*/
- compose.checkbtn_autosig = checkbtn_autosig;
- compose.entry_sigsep = entry_sigsep;
compose.checkbtn_autoextedit = checkbtn_autoextedit;
checkbtn_smart_wrapping;
compose.checkbtn_block_cursor =
checkbtn_block_cursor;
-
+ compose.checkbtn_default_reply_list = checkbtn_default_reply_list;
}
static void prefs_quote_create(void)
entry_quotemark = gtk_entry_new ();
gtk_widget_show (entry_quotemark);
gtk_box_pack_start (GTK_BOX (hbox2), entry_quotemark, FALSE, FALSE, 0);
- gtk_widget_set_usize (entry_quotemark, 64, -1);
+ gtk_widget_set_size_request (entry_quotemark, 64, -1);
scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwin_quotefmt);
(GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- text_quotefmt = gtk_text_new (NULL, NULL);
+ text_quotefmt = gtk_text_view_new ();
gtk_widget_show (text_quotefmt);
gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt), text_quotefmt);
- gtk_text_set_editable (GTK_TEXT (text_quotefmt), TRUE);
- gtk_widget_set_usize(text_quotefmt, -1, 60);
+ gtk_text_view_set_editable (GTK_TEXT_VIEW(text_quotefmt), TRUE);
+ gtk_widget_set_size_request(text_quotefmt, -1, 60);
/* forward */
gtk_widget_show (entry_fw_quotemark);
gtk_box_pack_start (GTK_BOX (hbox2), entry_fw_quotemark,
FALSE, FALSE, 0);
- gtk_widget_set_usize (entry_fw_quotemark, 64, -1);
+ gtk_widget_set_size_request (entry_fw_quotemark, 64, -1);
scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwin_quotefmt);
(GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- text_fw_quotefmt = gtk_text_new (NULL, NULL);
+ text_fw_quotefmt = gtk_text_view_new ();
gtk_widget_show (text_fw_quotefmt);
gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt),
text_fw_quotefmt);
- gtk_text_set_editable (GTK_TEXT (text_fw_quotefmt), TRUE);
- gtk_widget_set_usize(text_fw_quotefmt, -1, 60);
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (text_fw_quotefmt), TRUE);
+ gtk_widget_set_size_request(text_fw_quotefmt, -1, 60);
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
gtk_button_new_with_label (_(" Description of symbols "));
gtk_widget_show (btn_quotedesc);
gtk_box_pack_start (GTK_BOX (hbox1), btn_quotedesc, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(btn_quotedesc), "clicked",
- GTK_SIGNAL_FUNC(quote_fmt_quote_description), NULL);
+ g_signal_connect(G_OBJECT(btn_quotedesc), "clicked",
+ G_CALLBACK(quote_fmt_quote_description), NULL);
/* quote chars */
- PACK_FRAME (vbox1, frame_quote, _("Quoting characters"));
+ PACK_FRAME (vbox1, frame_quote, _("Quotation characters"));
vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (vbox_quote);
gtk_widget_show (entry_quote_chars);
gtk_box_pack_start (GTK_BOX (hbox2), entry_quote_chars,
FALSE, FALSE, 0);
- gtk_widget_set_usize (entry_quote_chars, 64, -1);
+ gtk_widget_set_size_request (entry_quote_chars, 64, -1);
compose.checkbtn_reply_with_quote= checkbtn_reply_with_quote;
GtkWidget *label_textfont;
GtkWidget *entry_textfont;
GtkWidget *button_textfont;
- GtkWidget *chkbtn_display_img;
GtkWidget *chkbtn_transhdr;
GtkWidget *chkbtn_folder_unread;
GtkWidget *hbox1;
GtkWidget *frame_summary;
GtkWidget *vbox2;
GtkWidget *chkbtn_swapfrom;
- GtkWidget *chkbtn_hscrollbar;
GtkWidget *chkbtn_useaddrbook;
- GtkWidget *chkbtn_expand_thread;
- GtkWidget *chkbtn_bold_unread;
+ GtkWidget *chkbtn_threadsubj;
GtkWidget *vbox3;
GtkWidget *label_datefmt;
GtkWidget *button_datefmt;
gtk_widget_show (button_textfont);
gtk_table_attach (GTK_TABLE (table1), button_textfont, 2, 3, 0, 1,
0, 0, 0, 0);
- gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked",
- GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont);
+ g_signal_connect (G_OBJECT (button_textfont), "clicked",
+ G_CALLBACK (prefs_font_select), entry_textfont);
tmplabel = gtk_label_new (_("Small"));
gtk_misc_set_alignment(GTK_MISC(tmplabel), 0, 0.5);
gtk_widget_show (tmpbutton);
gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 1, 2,
0, 0, 0, 0);
- gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
- GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+ g_signal_connect (G_OBJECT(tmpbutton), "clicked",
+ G_CALLBACK(prefs_font_select), tmpentry);
display.entry_smallfont = tmpentry;
tmplabel = gtk_label_new (_("Normal"));
gtk_widget_show (tmpbutton);
gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 2, 3,
0, 0, 0, 0);
- gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
- GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+ g_signal_connect (G_OBJECT(tmpbutton), "clicked",
+ G_CALLBACK(prefs_font_select), tmpentry);
display.entry_normalfont = tmpentry;
tmplabel = gtk_label_new (_("Bold"));
gtk_widget_show (tmpbutton);
gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 3, 4,
0, 0, 0, 0);
- gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
- GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+ g_signal_connect (G_OBJECT(tmpbutton), "clicked",
+ G_CALLBACK(prefs_font_select), tmpentry);
display.entry_boldfont = tmpentry;
vbox2 = gtk_vbox_new (FALSE, 0);
PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
_("Display unread number next to folder name"));
- PACK_CHECK_BUTTON (vbox2, chkbtn_display_img,
- _("Automatically display images"));
-
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
label_ng_abbrev = gtk_label_new
- (_("Abbreviate newsgroups longer than"));
+ (_("Abbreviate newsgroup names longer than"));
gtk_widget_show (label_ng_abbrev);
gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
gtk_widget_show (spinbtn_ng_abbrev_len);
gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_ng_abbrev_len,
FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_ng_abbrev_len, 56, -1);
+ gtk_widget_set_size_request (spinbtn_ng_abbrev_len, 56, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_ng_abbrev_len),
TRUE);
PACK_CHECK_BUTTON
(vbox2, chkbtn_swapfrom,
- _("Display recipient on `From' column if sender is yourself"));
+ _("Display recipient in `From' column if sender is yourself"));
PACK_CHECK_BUTTON
(vbox2, chkbtn_useaddrbook,
_("Display sender using address book"));
PACK_CHECK_BUTTON
- (vbox2, chkbtn_hscrollbar, _("Enable horizontal scroll bar"));
- PACK_CHECK_BUTTON
- (vbox2, chkbtn_expand_thread, _("Expand threads"));
- PACK_CHECK_BUTTON
- (vbox2, chkbtn_bold_unread,
- _("Display unread messages with bold font"));
+ (vbox2, chkbtn_threadsubj,
+ _("Thread using subject in addition to standard headers"));
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
gtk_widget_show (button_datefmt);
gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (button_datefmt), "clicked",
- GTK_SIGNAL_FUNC (date_format_create), NULL);
+ g_signal_connect (G_OBJECT (button_datefmt), "clicked",
+ G_CALLBACK (date_format_create), NULL);
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
button_dispitem = gtk_button_new_with_label
- (_(" Set displayed items of summary... "));
+ (_(" Set displayed items in summary... "));
gtk_widget_show (button_dispitem);
gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (button_dispitem), "clicked",
- GTK_SIGNAL_FUNC (prefs_summary_column_open),
- NULL);
+ g_signal_connect (G_OBJECT (button_dispitem), "clicked",
+ G_CALLBACK (prefs_summary_column_open),
+ NULL);
display.entry_textfont = entry_textfont;
display.button_textfont = button_textfont;
- display.chkbtn_display_img = chkbtn_display_img;
display.chkbtn_transhdr = chkbtn_transhdr;
display.chkbtn_folder_unread = chkbtn_folder_unread;
display.spinbtn_ng_abbrev_len = spinbtn_ng_abbrev_len;
display.spinbtn_ng_abbrev_len_adj = spinbtn_ng_abbrev_len_adj;
display.chkbtn_swapfrom = chkbtn_swapfrom;
- display.chkbtn_hscrollbar = chkbtn_hscrollbar;
- display.chkbtn_expand_thread = chkbtn_expand_thread;
- display.chkbtn_bold_unread = chkbtn_bold_unread;
display.chkbtn_useaddrbook = chkbtn_useaddrbook;
+ display.chkbtn_threadsubj = chkbtn_threadsubj;
display.entry_datefmt = entry_datefmt;
}
GtkWidget *spinbtn_scrollstep;
GtkWidget *chkbtn_halfpage;
+ GtkWidget *chkbtn_attach_desc;
+
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), VBOX_BORDER);
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
PACK_CHECK_BUTTON (hbox1, chkbtn_enablecol,
_("Enable coloration of message"));
- gtk_signal_connect (GTK_OBJECT (chkbtn_enablecol), "toggled",
- GTK_SIGNAL_FUNC (prefs_enable_message_color_toggled),
- NULL);
+ g_signal_connect(G_OBJECT(chkbtn_enablecol), "toggled",
+ G_CALLBACK(prefs_enable_message_color_toggled),
+ NULL);
button_edit_col = gtk_button_new_with_label (_(" Edit... "));
gtk_widget_show (button_edit_col);
gtk_box_pack_end (GTK_BOX (hbox1), button_edit_col, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (button_edit_col), "clicked",
- GTK_SIGNAL_FUNC (prefs_quote_colors_dialog), NULL);
+ g_signal_connect (G_OBJECT (button_edit_col), "clicked",
+ G_CALLBACK(prefs_quote_colors_dialog), NULL);
SET_TOGGLE_SENSITIVITY(chkbtn_enablecol, button_edit_col);
- 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, chkbtn_mbalnum,
- _("Display 2-byte alphabet and numeric with 1-byte character"));
+ _("Display multi-byte alphanumeric as\n"
+ "ASCII character (Japanese only)"));
+ gtk_label_set_justify (GTK_LABEL (GTK_BIN(chkbtn_mbalnum)->child),
+ GTK_JUSTIFY_LEFT);
+
PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
_("Display header pane above message view"));
gtk_widget_show (button_edit_disphdr);
gtk_box_pack_end (GTK_BOX (hbox1), button_edit_disphdr,
FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (button_edit_disphdr), "clicked",
- GTK_SIGNAL_FUNC (prefs_display_header_open),
- NULL);
+ g_signal_connect (G_OBJECT (button_edit_disphdr), "clicked",
+ G_CALLBACK (prefs_display_header_open),
+ NULL);
SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
gtk_widget_show (spinbtn_linespc);
gtk_box_pack_start (GTK_BOX (hbox_linespc), spinbtn_linespc,
FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_linespc, 64, -1);
+ gtk_widget_set_size_request (spinbtn_linespc, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_linespc), TRUE);
label_linespc = gtk_label_new (_("pixel(s)"));
gtk_widget_show (spinbtn_scrollstep);
gtk_box_pack_start (GTK_BOX (hbox_scr), spinbtn_scrollstep,
FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_scrollstep, 64, -1);
+ gtk_widget_set_size_request (spinbtn_scrollstep, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_scrollstep),
TRUE);
SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
+ vbox3 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox3);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox3, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON(vbox3, chkbtn_attach_desc,
+ _("Show attachment descriptions (rather than names)"));
+
+
message.chkbtn_enablecol = chkbtn_enablecol;
message.button_edit_col = button_edit_col;
message.chkbtn_mbalnum = chkbtn_mbalnum;
message.spinbtn_scrollstep = spinbtn_scrollstep;
message.spinbtn_scrollstep_adj = spinbtn_scrollstep_adj;
message.chkbtn_halfpage = chkbtn_halfpage;
+
+ message.chkbtn_attach_desc = chkbtn_attach_desc;
}
#if USE_GPGME
GtkWidget *checkbtn_store_passphrase;
GtkObject *spinbtn_store_passphrase_adj;
GtkWidget *spinbtn_store_passphrase;
+ GtkTooltips *store_tooltip;
GtkWidget *checkbtn_passphrase_grab;
GtkWidget *checkbtn_gpg_warning;
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_usize (hbox_spc, 12, -1);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
label = gtk_label_new (_("Expire after"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+ store_tooltip = gtk_tooltips_new();
+
spinbtn_store_passphrase_adj = gtk_adjustment_new (0, 0, 1440, 1, 5, 5);
spinbtn_store_passphrase = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_store_passphrase_adj), 1, 0);
gtk_widget_show (spinbtn_store_passphrase);
- gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_store_passphrase, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(store_tooltip), spinbtn_store_passphrase,
+ _("Setting to '0' will store the passphrase"
+ " for the whole session"),
+ NULL);
+ gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_store_passphrase, FALSE, FALSE, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_store_passphrase),
TRUE);
- gtk_widget_set_usize (spinbtn_store_passphrase, 64, -1);
+ gtk_widget_set_size_request (spinbtn_store_passphrase, 64, -1);
label = gtk_label_new (_("minute(s) "));
gtk_widget_show (label);
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_usize (hbox_spc, 12, -1);
-
- label = gtk_label_new (_("(Setting to '0' will store the passphrase\n"
- " for the whole session)"));
- 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);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, vbox3);
GtkWidget *vbox2;
GtkWidget *vbox3;
/* GtkWidget *checkbtn_emacs; */
- GtkWidget *checkbtn_show_msg_with_cursor;
+ GtkWidget *checkbtn_always_show_msg;
GtkWidget *checkbtn_openunread;
GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
+ GtkTooltips *immedexec_tooltip;
GtkWidget *hbox1;
GtkWidget *label;
- GtkWidget *dialogs_table;
- GtkWidget *optmenu_recvdialog;
- GtkWidget *optmenu_senddialog;
GtkWidget *menu;
GtkWidget *menuitem;
- GtkWidget *checkbtn_no_recv_err_panel;
- GtkWidget *checkbtn_close_recv_dialog;
-
- GtkWidget *frame_addr;
- GtkWidget *vbox_addr;
- GtkWidget *checkbtn_addaddrbyclick;
GtkWidget *button_keybind;
- GtkWidget *hbox2;
+ GtkWidget *hbox_nextunreadmsgdialog;
GtkWidget *optmenu_nextunreadmsgdialog;
- GtkWidget *optmenu_nextunreadmsgdialog_menu;
- GtkWidget *nextunreadmsgdialog_menuitem;
GtkWidget *frame_pixmap_theme;
GtkWidget *vbox_pixmap_theme;
GTK_JUSTIFY_LEFT); */
PACK_CHECK_BUTTON
- (vbox2, checkbtn_show_msg_with_cursor,
- _("Open message when cursor keys are pressed on summary"));
+ (vbox2, checkbtn_always_show_msg,
+ _("Always open messages in summary when selected"));
PACK_CHECK_BUTTON
(vbox2, checkbtn_openunread,
gtk_widget_show (vbox3);
gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, FALSE, 0);
+ immedexec_tooltip = gtk_tooltips_new();
+
PACK_CHECK_BUTTON
(vbox3, checkbtn_immedexec,
_("Execute immediately when moving or deleting messages"));
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(immedexec_tooltip), checkbtn_immedexec,
+ _("Messages will be marked until execution"
+ " if this is turned off"),
+ NULL);
hbox1 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
- label = gtk_label_new
- (_("(Messages will be marked until execution\n"
- " if this is turned off)"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8);
- gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-
- PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
-
- dialogs_table = gtk_table_new (2, 2, FALSE);
- gtk_widget_show (dialogs_table);
- gtk_container_add (GTK_CONTAINER (vbox2), dialogs_table);
- gtk_container_set_border_width (GTK_CONTAINER (dialogs_table), 8);
- gtk_table_set_row_spacings (GTK_TABLE (dialogs_table), VSPACING_NARROW);
- gtk_table_set_col_spacings (GTK_TABLE (dialogs_table), 8);
-
- label = gtk_label_new (_("Show send dialog"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 0, 1,
- GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
-
- optmenu_senddialog = gtk_option_menu_new ();
- gtk_widget_show (optmenu_senddialog);
- gtk_table_attach (GTK_TABLE (dialogs_table), optmenu_senddialog, 1, 2, 0, 1,
- GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
- menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Always"), SEND_DIALOG_ALWAYS);
- MENUITEM_ADD (menu, menuitem, _("Never"), SEND_DIALOG_NEVER);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_senddialog), menu);
-
- label = gtk_label_new (_("Show receive dialog"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 1, 2,
- GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
- optmenu_recvdialog = gtk_option_menu_new ();
- gtk_widget_show (optmenu_recvdialog);
- gtk_table_attach (GTK_TABLE (dialogs_table), optmenu_recvdialog, 1, 2, 1, 2,
- GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
- menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
- MENUITEM_ADD (menu, menuitem, _("Only if a window is active"),
- RECV_DIALOG_ACTIVE);
- MENUITEM_ADD (menu, menuitem, _("Never"), RECV_DIALOG_NEVER);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);
-
- PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
- _("Don't popup error dialog on receive error"));
-
- PACK_CHECK_BUTTON (vbox2, checkbtn_close_recv_dialog,
- _("Close receive dialog when finished"));
-
- 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);
-
- PACK_CHECK_BUTTON
- (vbox_addr, checkbtn_addaddrbyclick,
- _("Add address to destination when double-clicked"));
-
/* Next Unread Message Dialog */
- hbox2 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox2);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
+ hbox_nextunreadmsgdialog = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox_nextunreadmsgdialog, FALSE, FALSE, 0);
- label = gtk_label_new (_("Show no-unread-message dialog"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+ label = gtk_label_new (_("Show no-unread-message dialog"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox_nextunreadmsgdialog), label, FALSE, FALSE, 8);
optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
gtk_widget_show (optmenu_nextunreadmsgdialog);
- gtk_box_pack_start (GTK_BOX (hbox2), optmenu_nextunreadmsgdialog,
- FALSE, FALSE, 0);
-
- optmenu_nextunreadmsgdialog_menu = gtk_menu_new ();
- MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
- _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
- MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
- _("Assume 'Yes'"), NEXTUNREADMSGDIALOG_ASSUME_YES);
- MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
- _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog),
- optmenu_nextunreadmsgdialog_menu);
-
-
- /* Receive Dialog */
-/* hbox = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-
- label = gtk_label_new (_("Show receive Dialog"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
- recvdialog_optmenu = gtk_option_menu_new ();
- gtk_widget_show (recvdialog_optmenu);
- gtk_box_pack_start (GTK_BOX (hbox), recvdialog_optmenu, FALSE, FALSE, 0);
-
- recvdialog_optmenu_menu = gtk_menu_new ();
-
- MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Always"), RECVDIALOG_ALWAYS);
- MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Only if a sylpheed window is active"), RECVDIALOG_WINDOW_ACTIVE);
- MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Never"), RECVDIALOG_NEVER);
+ gtk_box_pack_start (GTK_BOX (hbox_nextunreadmsgdialog), optmenu_nextunreadmsgdialog, FALSE, FALSE, 8);
+
+ menu = gtk_menu_new ();
+ MENUITEM_ADD (menu, menuitem, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
+ MENUITEM_ADD (menu, menuitem, _("Assume 'Yes'"),
+ NEXTUNREADMSGDIALOG_ASSUME_YES);
+ MENUITEM_ADD (menu, menuitem, _("Assume 'No'"),
+ NEXTUNREADMSGDIALOG_ASSUME_NO);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (recvdialog_optmenu), recvdialog_optmenu_menu); */
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), menu);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
button_keybind = gtk_button_new_with_label (_(" Set key bindings... "));
gtk_widget_show (button_keybind);
gtk_box_pack_start (GTK_BOX (hbox1), button_keybind, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked",
- GTK_SIGNAL_FUNC (prefs_keybind_select), NULL);
+ g_signal_connect (G_OBJECT (button_keybind), "clicked",
+ G_CALLBACK (prefs_keybind_select), NULL);
PACK_FRAME(vbox1, frame_pixmap_theme, _("Icon theme"));
stock_pixmap_themes_list_free(avail_pixmap_themes);
/* interface.checkbtn_emacs = checkbtn_emacs; */
- interface.checkbtn_show_msg_with_cursor
- = checkbtn_show_msg_with_cursor;
+ interface.checkbtn_always_show_msg = checkbtn_always_show_msg;
interface.checkbtn_openunread = checkbtn_openunread;
interface.checkbtn_mark_as_read_on_newwin
= checkbtn_mark_as_read_on_newwin;
interface.checkbtn_openinbox = checkbtn_openinbox;
interface.checkbtn_immedexec = checkbtn_immedexec;
- interface.optmenu_recvdialog = optmenu_recvdialog;
- interface.optmenu_senddialog = optmenu_senddialog;
- interface.checkbtn_no_recv_err_panel = checkbtn_no_recv_err_panel;
- interface.checkbtn_close_recv_dialog = checkbtn_close_recv_dialog;
- interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
interface.combo_pixmap_theme = combo_pixmap_theme;
interface.entry_pixmap_theme = entry_pixmap_theme;
GtkWidget *exteditor_combo;
GtkWidget *exteditor_entry;
+ GtkWidget *frame_addr;
+ GtkWidget *vbox_addr;
+ GtkWidget *checkbtn_addaddrbyclick;
+
GtkWidget *frame_cliplog;
GtkWidget *vbox_cliplog;
GtkWidget *hbox_cliplog;
GtkWidget *checkbtn_cliplog;
GtkWidget *loglength_label;
GtkWidget *loglength_entry;
+ GtkTooltips *loglength_tooltip;
GtkWidget *frame_exit;
GtkWidget *vbox_exit;
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
+ GtkWidget *label_iotimeout;
+ GtkWidget *spinbtn_iotimeout;
+ GtkObject *spinbtn_iotimeout_adj;
+
+#if 0
+#ifdef USE_OPENSSL
+ GtkWidget *frame_ssl;
+ GtkWidget *vbox_ssl;
+ GtkWidget *hbox_ssl;
+ GtkWidget *checkbtn_ssl_ask_unknown_valid;
+#endif
+#endif
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_table_attach (GTK_TABLE (ext_table), uri_combo, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtkut_combo_set_items (GTK_COMBO (uri_combo),
+ DEFAULT_BROWSER_CMD,
+ "galeon --new-tab '%s'",
"galeon '%s'",
"mozilla -remote 'openurl(%s,new-window)'",
- "netscape -remote 'openURL(%s,raise)'",
+ "netscape -remote 'openURL(%s, new-window)'",
"netscape '%s'",
- "gnome-moz-remote --raise --newwin '%s'",
+ "gnome-moz-remote --newwin '%s'",
"kfmclient openURL '%s'",
"opera -newwindow '%s'",
"kterm -e w3m '%s'",
NULL);
exteditor_entry = GTK_COMBO (exteditor_combo)->entry;
+ 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);
+
+ PACK_CHECK_BUTTON
+ (vbox_addr, checkbtn_addaddrbyclick,
+ _("Add address to destination when double-clicked"));
+
/* Clip Log */
PACK_FRAME (vbox1, frame_cliplog, _("Log Size"));
gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_label,
FALSE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (loglength_label));
+
+ loglength_tooltip = gtk_tooltips_new();
+
loglength_entry = gtk_entry_new ();
- gtk_widget_set_usize (GTK_WIDGET (loglength_entry), 64, -1);
+ 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,
+ _("0 to stop logging in the log window"),
+ NULL);
+ gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_label,
+ FALSE, TRUE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_entry);
+#if 0
+#ifdef USE_OPENSSL
+ /* SSL */
+ PACK_FRAME (vbox1, frame_ssl, _("Security"));
+
+ vbox_ssl = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox_ssl);
+ gtk_container_add (GTK_CONTAINER (frame_ssl), vbox_ssl);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_ssl), 8);
+ PACK_CHECK_BUTTON (vbox_ssl, checkbtn_ssl_ask_unknown_valid,
+ _("Ask before accepting SSL certificates"));
+ hbox_ssl = gtk_hbox_new (FALSE, 3);
+ gtk_container_add (GTK_CONTAINER (vbox_ssl), hbox_ssl);
+ gtk_widget_show (hbox_ssl);
+#endif
+#endif
+
/* On Exit */
PACK_FRAME (vbox1, frame_exit, _("On exit"));
PACK_CHECK_BUTTON (vbox_exit, checkbtn_warnqueued,
_("Warn if there are queued messages"));
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ 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);
+
+ spinbtn_iotimeout_adj = gtk_adjustment_new (60, 0, 1000, 1, 10, 10);
+ spinbtn_iotimeout = gtk_spin_button_new
+ (GTK_ADJUSTMENT (spinbtn_iotimeout_adj), 1, 0);
+ gtk_widget_show (spinbtn_iotimeout);
+ gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_iotimeout,
+ FALSE, FALSE, 0);
+ gtk_widget_set_size_request (spinbtn_iotimeout, 64, -1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_iotimeout), TRUE);
+
+ label_iotimeout = gtk_label_new (_("seconds"));
+ gtk_widget_show (label_iotimeout);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
+
other.uri_combo = uri_combo;
other.uri_entry = uri_entry;
other.printcmd_entry = printcmd_entry;
other.exteditor_combo = exteditor_combo;
other.exteditor_entry = exteditor_entry;
+ other.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
+
other.checkbtn_cliplog = checkbtn_cliplog;
other.loglength_entry = loglength_entry;
other.checkbtn_cleanonexit = checkbtn_cleanonexit;
other.checkbtn_askonclean = checkbtn_askonclean;
other.checkbtn_warnqueued = checkbtn_warnqueued;
+
+ other.spinbtn_iotimeout = spinbtn_iotimeout;
+ other.spinbtn_iotimeout_adj = spinbtn_iotimeout_adj;
+
+#if 0
+#ifdef USE_OPENSSL
+ other.checkbtn_ssl_ask_unknown_valid = checkbtn_ssl_ask_unknown_valid;
+#endif
+#endif
}
static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
g_return_if_fail(*widget != NULL);
g_return_if_fail(display.entry_datefmt != NULL);
- datefmt_sample = GTK_WIDGET(gtk_object_get_data
- (GTK_OBJECT(*widget), "datefmt_sample"));
+ datefmt_sample = GTK_WIDGET(g_object_get_data
+ (G_OBJECT(*widget), "datefmt_sample"));
g_return_if_fail(datefmt_sample != NULL);
text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1);
*widget = NULL;
}
-static void date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
- GtkWidget **widget)
+static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
+ GtkWidget **widget)
{
if (event && event->keyval == GDK_Escape)
date_format_cancel_btn_clicked(NULL, widget);
+ return FALSE;
}
static gboolean date_format_on_delete(GtkWidget *dialogwidget,
if (text)
strftime(buffer, sizeof buffer, text, cal_time);
g_free(text);
- gtk_label_set_text(example, buffer);
+
+ text = conv_codeset_strdup(buffer,
+ conv_get_current_charset_str(),
+ CS_UTF_8);
+ if (!text)
+ text = g_strdup(buffer);
+
+ gtk_label_set_text(example, text);
+
+ g_free(text);
}
static void date_format_select_row(GtkWidget *date_format_list, gint row,
{
gint cur_pos;
gchar *format;
- gchar *old_format;
+ const gchar *old_format;
gchar *new_format;
GtkWidget *datefmt_sample;
if (datefmt_win) return datefmt_win;
- datefmt_win = gtk_window_new(GTK_WINDOW_DIALOG);
+ datefmt_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(datefmt_win), 8);
gtk_window_set_title(GTK_WINDOW(datefmt_win), _("Date format"));
gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
- gtk_widget_set_usize(datefmt_win, 440, 280);
+ gtk_widget_set_size_request(datefmt_win, 440, 280);
vbox1 = gtk_vbox_new(FALSE, 10);
gtk_widget_show(vbox1);
gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5);
- datefmt_entry = gtk_entry_new_with_max_length(256);
+ datefmt_entry = gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(datefmt_entry), 256);
gtk_widget_show(datefmt_entry);
gtk_table_attach(GTK_TABLE(table), datefmt_entry, 1, 2, 0, 1,
(GTK_EXPAND | GTK_FILL), 0, 0, 0);
/* we need the "sample" entry box; add it as data so callbacks can
* get the entry box */
- gtk_object_set_data(GTK_OBJECT(datefmt_win), "datefmt_sample",
- datefmt_entry);
+ g_object_set_data(G_OBJECT(datefmt_win), "datefmt_sample",
+ datefmt_entry);
label2 = gtk_label_new(_("Example"));
gtk_widget_show(label2);
date_format_entry_on_change(GTK_EDITABLE(datefmt_entry),
GTK_LABEL(label3));
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(date_format_ok_btn_clicked),
- &datefmt_win);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(date_format_cancel_btn_clicked),
- &datefmt_win);
- gtk_signal_connect(GTK_OBJECT(datefmt_win), "key_press_event",
- GTK_SIGNAL_FUNC(date_format_key_pressed),
- &datefmt_win);
- gtk_signal_connect(GTK_OBJECT(datefmt_win), "delete_event",
- GTK_SIGNAL_FUNC(date_format_on_delete),
- &datefmt_win);
- gtk_signal_connect(GTK_OBJECT(datefmt_entry), "changed",
- GTK_SIGNAL_FUNC(date_format_entry_on_change),
- label3);
-
- gtk_signal_connect(GTK_OBJECT(datefmt_clist), "select_row",
- GTK_SIGNAL_FUNC(date_format_select_row),
- datefmt_win);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(date_format_ok_btn_clicked),
+ &datefmt_win);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(date_format_cancel_btn_clicked),
+ &datefmt_win);
+ g_signal_connect(G_OBJECT(datefmt_win), "key_press_event",
+ G_CALLBACK(date_format_key_pressed),
+ &datefmt_win);
+ g_signal_connect(G_OBJECT(datefmt_win), "delete_event",
+ G_CALLBACK(date_format_on_delete),
+ &datefmt_win);
+ g_signal_connect(G_OBJECT(datefmt_entry), "changed",
+ G_CALLBACK(date_format_entry_on_change),
+ label3);
+
+ g_signal_connect(G_OBJECT(datefmt_clist), "select_row",
+ G_CALLBACK(date_format_select_row),
+ datefmt_win);
gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
GtkWidget *recycle_colors_btn;
GtkWidget *frame_colors;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(window), 2);
gtk_window_set_title(GTK_WINDOW(window), _("Set message colors"));
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
color_buttons.quote_level1_btn = gtk_button_new();
gtk_table_attach (GTK_TABLE (table), color_buttons.quote_level1_btn,
0, 1, 0, 1, 0, 0, 0, 0);
- gtk_widget_set_usize (color_buttons.quote_level1_btn, 40, 30);
+ gtk_widget_set_size_request (color_buttons.quote_level1_btn, 40, 30);
gtk_container_set_border_width
(GTK_CONTAINER (color_buttons.quote_level1_btn), 5);
color_buttons.quote_level2_btn = gtk_button_new();
gtk_table_attach (GTK_TABLE (table), color_buttons.quote_level2_btn,
0, 1, 1, 2, 0, 0, 0, 0);
- gtk_widget_set_usize (color_buttons.quote_level2_btn, 40, 30);
+ gtk_widget_set_size_request (color_buttons.quote_level2_btn, 40, 30);
gtk_container_set_border_width (GTK_CONTAINER (color_buttons.quote_level2_btn), 5);
color_buttons.quote_level3_btn = gtk_button_new_with_label ("");
gtk_table_attach (GTK_TABLE (table), color_buttons.quote_level3_btn,
0, 1, 2, 3, 0, 0, 0, 0);
- gtk_widget_set_usize (color_buttons.quote_level3_btn, 40, 30);
+ gtk_widget_set_size_request (color_buttons.quote_level3_btn, 40, 30);
gtk_container_set_border_width
(GTK_CONTAINER (color_buttons.quote_level3_btn), 5);
color_buttons.uri_btn = gtk_button_new_with_label ("");
gtk_table_attach (GTK_TABLE (table), color_buttons.uri_btn,
0, 1, 3, 4, 0, 0, 0, 0);
- gtk_widget_set_usize (color_buttons.uri_btn, 40, 30);
+ gtk_widget_set_size_request (color_buttons.uri_btn, 40, 30);
gtk_container_set_border_width (GTK_CONTAINER (color_buttons.uri_btn), 5);
color_buttons.tgt_folder_btn = gtk_button_new_with_label ("");
gtk_table_attach (GTK_TABLE (table), color_buttons.tgt_folder_btn,
0, 1, 4, 5, 0, 0, 0, 0);
- gtk_widget_set_usize (color_buttons.tgt_folder_btn, 40, 30);
+ gtk_widget_set_size_request (color_buttons.tgt_folder_btn, 40, 30);
gtk_container_set_border_width (GTK_CONTAINER (color_buttons.tgt_folder_btn), 5);
color_buttons.signature_btn = gtk_button_new_with_label ("");
gtk_table_attach (GTK_TABLE (table), color_buttons.signature_btn,
0, 1, 5, 6, 0, 0, 0, 0);
- gtk_widget_set_usize (color_buttons.signature_btn, 40, 30);
+ gtk_widget_set_size_request (color_buttons.signature_btn, 40, 30);
gtk_container_set_border_width (GTK_CONTAINER (color_buttons.signature_btn), 5);
quotelevel1_label = gtk_label_new (_("Quoted Text - First Level"));
gtk_widget_grab_default(ok_btn);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_quote_colors_key_pressed),
- NULL);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(gtk_main_quit), NULL);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(prefs_quote_colors_key_pressed),
+ NULL);
- gtk_signal_connect(GTK_OBJECT(color_buttons.quote_level1_btn), "clicked",
- GTK_SIGNAL_FUNC(quote_color_set_dialog), "LEVEL1");
- gtk_signal_connect(GTK_OBJECT(color_buttons.quote_level2_btn), "clicked",
- GTK_SIGNAL_FUNC(quote_color_set_dialog), "LEVEL2");
- gtk_signal_connect(GTK_OBJECT(color_buttons.quote_level3_btn), "clicked",
- GTK_SIGNAL_FUNC(quote_color_set_dialog), "LEVEL3");
- gtk_signal_connect(GTK_OBJECT(color_buttons.uri_btn), "clicked",
- GTK_SIGNAL_FUNC(quote_color_set_dialog), "URI");
- gtk_signal_connect(GTK_OBJECT(color_buttons.tgt_folder_btn), "clicked",
- GTK_SIGNAL_FUNC(quote_color_set_dialog), "TGTFLD");
- gtk_signal_connect(GTK_OBJECT(color_buttons.signature_btn), "clicked",
- GTK_SIGNAL_FUNC(quote_color_set_dialog), "SIGNATURE");
- gtk_signal_connect(GTK_OBJECT(recycle_colors_btn), "toggled",
- GTK_SIGNAL_FUNC(prefs_recycle_colors_toggled), NULL);
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+ g_signal_connect(G_OBJECT(color_buttons.quote_level1_btn), "clicked",
+ G_CALLBACK(quote_color_set_dialog), "LEVEL1");
+ g_signal_connect(G_OBJECT(color_buttons.quote_level2_btn), "clicked",
+ G_CALLBACK(quote_color_set_dialog), "LEVEL2");
+ g_signal_connect(G_OBJECT(color_buttons.quote_level3_btn), "clicked",
+ G_CALLBACK(quote_color_set_dialog), "LEVEL3");
+ g_signal_connect(G_OBJECT(color_buttons.uri_btn), "clicked",
+ G_CALLBACK(quote_color_set_dialog), "URI");
+ g_signal_connect(G_OBJECT(color_buttons.tgt_folder_btn), "clicked",
+ G_CALLBACK(quote_color_set_dialog), "TGTFLD");
+ g_signal_connect(G_OBJECT(color_buttons.signature_btn), "clicked",
+ G_CALLBACK(quote_color_set_dialog), "SIGNATURE");
+ g_signal_connect(G_OBJECT(recycle_colors_btn), "toggled",
+ G_CALLBACK(prefs_recycle_colors_toggled), NULL);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(gtk_main_quit), NULL);
/* show message button colors and recycle options */
set_button_bg_color(color_buttons.quote_level1_btn,
quote_color_win = window;
}
-static void prefs_quote_colors_key_pressed(GtkWidget *widget,
- GdkEventKey *event, gpointer data)
+static gboolean prefs_quote_colors_key_pressed(GtkWidget *widget,
+ GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape)
gtk_main_quit();
+ return FALSE;
}
static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
} else if(g_strcasecmp(type, "SIGNATURE") == 0) {
title = _("Pick color for signatures");
rgbvalue = prefs_common.signature_col;
-#if USE_ASPELL
- } else if(g_strcasecmp(type, "Misspelled word") == 0) {
- title = _("Pick color for misspelled word");
- rgbvalue = prefs_common.misspelled_col;
-#endif
} else { /* Should never be called */
g_warning("Unrecognized datatype '%s' in quote_color_set_dialog\n", type);
return;
gtk_window_set_policy(GTK_WINDOW(color_dialog), FALSE, FALSE, FALSE);
manage_window_set_transient(GTK_WINDOW(color_dialog));
- gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
- "clicked", GTK_SIGNAL_FUNC(quote_colors_set_dialog_ok), data);
- gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
- "clicked", GTK_SIGNAL_FUNC(quote_colors_set_dialog_cancel), data);
- gtk_signal_connect(GTK_OBJECT(color_dialog), "key_press_event",
- GTK_SIGNAL_FUNC(quote_colors_set_dialog_key_pressed),
- data);
+ g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
+ "clicked", G_CALLBACK(quote_colors_set_dialog_ok), data);
+ g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
+ "clicked", G_CALLBACK(quote_colors_set_dialog_cancel), data);
+ g_signal_connect(G_OBJECT(color_dialog), "key_press_event",
+ G_CALLBACK(quote_colors_set_dialog_key_pressed),
+ data);
/* preselect the previous color in the color selection dialog */
color[0] = (gdouble) ((rgbvalue & 0xff0000) >> 16) / 255.0;
} else if (g_strcasecmp(type, "SIGNATURE") == 0) {
prefs_common.signature_col = rgbvalue;
set_button_bg_color(color_buttons.signature_btn, rgbvalue);
-#if USE_ASPELL
- } else if (g_strcasecmp(type, "Misspelled word") == 0) {
- prefs_common.misspelled_col = rgbvalue;
- set_button_bg_color(spelling.misspelled_btn, rgbvalue);
-#endif
} else
fprintf( stderr, "Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type );
gtk_widget_destroy(color_dialog);
}
-static void quote_colors_set_dialog_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
+static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
{
gtk_widget_destroy(color_dialog);
+ return FALSE;
}
static void set_button_bg_color(GtkWidget *widget, gint rgbvalue)
if (!font_sel_win) {
font_sel_win = gtk_font_selection_dialog_new
(_("Font selection"));
- gtk_window_position(GTK_WINDOW(font_sel_win),
- GTK_WIN_POS_CENTER);
- gtk_signal_connect(GTK_OBJECT(font_sel_win), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
- NULL);
- gtk_signal_connect
- (GTK_OBJECT(font_sel_win), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_font_selection_key_pressed),
+ gtk_window_set_position(GTK_WINDOW(font_sel_win),
+ GTK_WIN_POS_CENTER);
+ g_signal_connect(G_OBJECT(font_sel_win), "delete_event",
+ G_CALLBACK(gtk_widget_hide_on_delete),
+ NULL);
+ g_signal_connect
+ (G_OBJECT(font_sel_win), "key_press_event",
+ G_CALLBACK(prefs_font_selection_key_pressed),
NULL);
- gtk_signal_connect_object
- (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
+ g_signal_connect_closure
+ (G_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
"clicked",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
- GTK_OBJECT(font_sel_win));
+ g_cclosure_new_swap(G_CALLBACK(gtk_widget_hide_on_delete),
+ font_sel_win, NULL),
+ FALSE);
}
if(font_sel_conn_id) {
gtk_signal_disconnect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button), font_sel_conn_id);
}
- font_sel_conn_id = gtk_signal_connect
- (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
+ font_sel_conn_id = g_signal_connect
+ (G_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
"clicked",
- GTK_SIGNAL_FUNC(prefs_font_selection_ok),
+ G_CALLBACK(prefs_font_selection_ok),
entry);
printf("%i\n", font_sel_conn_id);
gtk_widget_show(font_sel_win);
}
-static void prefs_font_selection_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
+static gboolean prefs_font_selection_key_pressed(GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
gtk_widget_hide(font_sel_win);
+ return FALSE;
}
static void prefs_font_selection_ok(GtkButton *button, GtkEntry *entry)
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- window = gtk_window_new (GTK_WINDOW_DIALOG);
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_title (GTK_WINDOW (window), _("Key bindings"));
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
label = gtk_label_new
- (_("Select the preset of key bindings.\n"
- "You can also modify each menu's shortcuts by pressing\n"
- "any key(s) when placing the mouse pointer on the item."));
+ (_("Select preset:"));
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
"Mutt",
_("Old Sylpheed"),
NULL);
- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (combo)->entry), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO (combo)->entry), FALSE);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ label = gtk_label_new
+ (_("You can also modify each menu shortcut by pressing\n"
+ "any key(s) when placing the mouse pointer on the item."));
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- gtk_signal_connect (GTK_OBJECT (window), "delete_event",
- GTK_SIGNAL_FUNC (prefs_keybind_deleted), NULL);
- gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
- GTK_SIGNAL_FUNC (prefs_keybind_key_pressed), NULL);
- gtk_signal_connect (GTK_OBJECT (ok_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_keybind_apply_clicked),
- NULL);
- gtk_signal_connect (GTK_OBJECT (cancel_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_keybind_cancel),
- NULL);
+ g_signal_connect (G_OBJECT (window), "delete_event",
+ G_CALLBACK (prefs_keybind_deleted), NULL);
+ g_signal_connect (G_OBJECT (window), "key_press_event",
+ G_CALLBACK (prefs_keybind_key_pressed), NULL);
+ g_signal_connect (G_OBJECT (ok_btn), "clicked",
+ G_CALLBACK (prefs_keybind_apply_clicked),
+ NULL);
+ g_signal_connect (G_OBJECT (cancel_btn), "clicked",
+ G_CALLBACK (prefs_keybind_cancel),
+ NULL);
gtk_widget_show_all(window);
keybind.combo = combo;
}
-static void prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
+static gboolean prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
prefs_keybind_cancel();
+ return FALSE;
}
static gint prefs_keybind_deleted(GtkWidget *widget, GdkEventAny *event,
keybind.window = NULL;
keybind.combo = NULL;
}
+
+struct KeyBind {
+ const gchar *accel_path;
+ const gchar *accel_key;
+};
+
+static void prefs_keybind_apply(struct KeyBind keybind[], gint num)
+{
+ gint i;
+ guint key;
+ GdkModifierType mods;
+
+ for (i = 0; i < num; i++) {
+ const gchar *accel_key
+ = keybind[i].accel_key ? keybind[i].accel_key : "";
+ gtk_accelerator_parse(accel_key, &key, &mods);
+ gtk_accel_map_change_entry(keybind[i].accel_path,
+ key, mods, TRUE);
+ }
+}
static void prefs_keybind_apply_clicked(GtkWidget *widget)
{
GtkEntry *entry = GTK_ENTRY(GTK_COMBO(keybind.combo)->entry);
- gchar *text;
- gchar *rc_str;
-
- static gchar *default_menurc =
- "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
- "(menu-path \"<Main>/File/Save as...\" \"<control>S\")\n"
- "(menu-path \"<Main>/File/Print...\" \"\")\n"
- "(menu-path \"<Main>/File/Exit\" \"<control>Q\")\n"
-
- "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
- "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
- "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
- "(menu-path \"<Main>/Edit/Search folder...\" \"<shift><control>F\")\n"
-
- "(menu-path \"<Main>/View/Expand Summary View\" \"V\")\n"
- "(menu-path \"<Main>/View/Expand Message View\" \"<shift>V\")\n"
- "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
- "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
- "(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
- "(menu-path \"<Main>/View/Go to/Prev unread message\" \"<shift>P\")\n"
- "(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
- "(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
- "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
- "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
- "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
- "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
-
- "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
- "(menu-path \"<Main>/Message/Compose an email message\" \"<control>M\")\n"
- "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
- "(menu-path \"<Main>/Message/Reply to/all\" \"<shift><control>R\")\n"
- "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
- "(menu-path \"<Main>/Message/Forward\" \"<control><alt>F\")\n"
- /* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */
- "(menu-path \"<Main>/Message/Move...\" \"<control>O\")\n"
- "(menu-path \"<Main>/Message/Copy...\" \"<shift><control>O\")\n"
- "(menu-path \"<Main>/Message/Delete\" \"<control>D\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
- "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
-
- "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
- "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
-
- "(menu-path \"<Compose>/File/Close\" \"<control>W\")\n"
- "(menu-path \"<Compose>/Edit/Select all\" \"<control>A\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"\")";
-
- static gchar *mew_wl_menurc =
- "(menu-path \"<Main>/File/Empty trash\" \"<shift>D\")\n"
- "(menu-path \"<Main>/File/Save as...\" \"Y\")\n"
- "(menu-path \"<Main>/File/Print...\" \"<shift>numbersign\")\n"
- "(menu-path \"<Main>/File/Exit\" \"<shift>Q\")\n"
-
- "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
- "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
- "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
- "(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"
-
- "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
- "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
- "(menu-path \"<Main>/View/Thread view\" \"<shift>T\")\n"
- "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
- "(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
- "(menu-path \"<Main>/View/Go to/Prev unread message\" \"<shift>P\")\n"
- "(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
- "(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
- "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
- "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
- "(menu-path \"<Main>/View/Show all headers\" \"<shift>H\")\n"
- "(menu-path \"<Main>/View/Update\" \"<shift>S\")\n"
-
- "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
- "(menu-path \"<Main>/Message/Compose an email message\" \"W\")\n"
- "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
- "(menu-path \"<Main>/Message/Reply to/all\" \"<shift>A\")\n"
- "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
- "(menu-path \"<Main>/Message/Forward\" \"F\")\n"
- /* "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift>F\")\n" */
- "(menu-path \"<Main>/Message/Move...\" \"O\")\n"
- "(menu-path \"<Main>/Message/Copy...\" \"<shift>O\")\n"
- "(menu-path \"<Main>/Message/Delete\" \"D\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
- "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as read\" \"<shift>R\")\n"
-
- "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
- "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
-
- "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
- "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
-
- static gchar *mutt_menurc =
- "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
- "(menu-path \"<Main>/File/Save as...\" \"S\")\n"
- "(menu-path \"<Main>/File/Print...\" \"P\")\n"
- "(menu-path \"<Main>/File/Exit\" \"Q\")\n"
-
- "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
- "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
- "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
- "(menu-path \"<Main>/Edit/Search messages...\" \"slash\")\n"
-
- "(menu-path \"<Main>/View/Toggle summary view\" \"V\")\n"
- "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
- "(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Prev unread message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Next unread message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Other folder...\" \"C\")\n"
- "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
- "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
- "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
- "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
-
- "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
- "(menu-path \"<Main>/Message/Compose new message\" \"M\")\n"
- "(menu-path \"<Main>/Message/Reply\" \"R\")\n"
- "(menu-path \"<Main>/Message/Reply to/all\" \"G\")\n"
- "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
- "(menu-path \"<Main>/Message/Forward\" \"F\")\n"
- "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n"
- "(menu-path \"<Main>/Message/Move...\" \"<control>O\")\n"
- "(menu-path \"<Main>/Message/Copy...\" \"<shift>C\")\n"
- "(menu-path \"<Main>/Message/Delete\" \"D\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>F\")\n"
- "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>N\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
-
- "(menu-path \"<Main>/Tools/Address book\" \"<shift><control>A\")\n"
- "(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
-
- "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
- "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
-
- static gchar *old_sylpheed_menurc =
- "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
- "(menu-path \"<Main>/File/Save as...\" \"\")\n"
- "(menu-path \"<Main>/File/Print...\" \"<alt>P\")\n"
- "(menu-path \"<Main>/File/Exit\" \"<alt>Q\")\n"
-
- "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
- "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
- "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
- "(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"
-
- "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
- "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
- "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
- "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
- "(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
- "(menu-path \"<Main>/View/Go to/Prev unread message\" \"<shift>P\")\n"
- "(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
- "(menu-path \"<Main>/View/Go to/Other folder...\" \"<alt>G\")\n"
- "(menu-path \"<Main>/View/Open in new window\" \"<shift><control>N\")\n"
- "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
- "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
- "(menu-path \"<Main>/View/Update\" \"<alt>U\")\n"
-
- "(menu-path \"<Main>/Message/Get new mail\" \"<alt>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><alt>I\")\n"
- "(menu-path \"<Main>/Message/Compose an email message\" \"<alt>N\")\n"
- "(menu-path \"<Main>/Message/Reply\" \"<alt>R\")\n"
- "(menu-path \"<Main>/Message/Reply to/all\" \"<shift><alt>R\")\n"
- "(menu-path \"<Main>/Message/Reply to/sender\" \"<control><alt>R\")\n"
- "(menu-path \"<Main>/Message/Reply to/mailing list\" \"<control>L\")\n"
- "(menu-path \"<Main>/Message/Forward\" \"<shift><alt>F\")\n"
- /* "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift><control>F\")\n" */
- "(menu-path \"<Main>/Message/Move...\" \"<alt>O\")\n"
- "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
- "(menu-path \"<Main>/Message/Delete\" \"<alt>D\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
- "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
-
- "(menu-path \"<Main>/Tools/Address book\" \"<alt>A\")\n"
- "(menu-path \"<Main>/Tools/Execute\" \"<alt>X\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"<alt>L\")\n"
-
- "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
- "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
-
- static gchar *empty_menurc =
- "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
- "(menu-path \"<Main>/File/Save as...\" \"\")\n"
- "(menu-path \"<Main>/File/Print...\" \"\")\n"
- "(menu-path \"<Main>/File/Exit\" \"\")\n"
-
- "(menu-path \"<Main>/Edit/Copy\" \"\")\n"
- "(menu-path \"<Main>/Edit/Select all\" \"\")\n"
- "(menu-path \"<Main>/Edit/Find in current message...\" \"\")\n"
- "(menu-path \"<Main>/Edit/Search folder...\" \"\")\n"
-
- "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
- "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
- "(menu-path \"<Main>/View/Thread view\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Prev unread message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Next unread message\" \"\")\n"
- "(menu-path \"<Main>/View/Go to/Other folder...\" \"\")\n"
- "(menu-path \"<Main>/View/Open in new window\" \"\")\n"
- "(menu-path \"<Main>/View/View source\" \"\")\n"
- "(menu-path \"<Main>/View/Show all headers\" \"\")\n"
- "(menu-path \"<Main>/View/Update\" \"\")\n"
-
- "(menu-path \"<Main>/Message/Get new mail\" \"\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"\")\n"
- "(menu-path \"<Main>/Message/Compose an email message\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/all\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/mailing list\" \"\")\n"
- "(menu-path \"<Main>/Message/Forward\" \"\")\n"
- /* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */
- "(menu-path \"<Main>/Message/Move...\" \"\")\n"
- "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
- "(menu-path \"<Main>/Message/Delete\" \"\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark\" \"\")\n"
- "(menu-path \"<Main>/Message/Mark/Unmark\" \"\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"\")\n"
- "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
-
- "(menu-path \"<Main>/Tools/Address book\" \"\")\n"
- "(menu-path \"<Main>/Tools/Execute\" \"\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"\")\n"
-
- "(menu-path \"<Compose>/File/Close\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"\")\n"
- "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"\")";
+ const gchar *text;
+ struct KeyBind *menurc;
+ gint n_menurc;
+
+ static struct KeyBind default_menurc[] = {
+ {"<Main>/File/Empty trash", ""},
+ {"<Main>/File/Save as...", "<control>S"},
+ {"<Main>/File/Print...", ""},
+ {"<Main>/File/Exit", "<control>Q"},
+
+ {"<Main>/Edit/Copy", "<control>C"},
+ {"<Main>/Edit/Select all", "<control>A"},
+ {"<Main>/Edit/Find in current message...", "<control>F"},
+ {"<Main>/Edit/Search folder...", "<shift><control>F"},
+
+ {"<Main>/View/Expand Summary View", "V"},
+ {"<Main>/View/Expand Message View", "<shift>V"},
+ {"<Main>/View/Thread view", "<control>T"},
+ {"<Main>/View/Go to/Prev message", "P"},
+ {"<Main>/View/Go to/Next message", "N"},
+ {"<Main>/View/Go to/Prev unread message", "<shift>P"},
+ {"<Main>/View/Go to/Next unread message", "<shift>N"},
+ {"<Main>/View/Go to/Other folder...", "G"},
+ {"<Main>/View/Open in new window", "<control><alt>N"},
+ {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Show all headers", "<control>H"},
+ {"<Main>/View/Update", "<control><alt>U"},
+
+ {"<Main>/Message/Get new mail", "<control>I"},
+ {"<Main>/Message/Get from all accounts", "<shift><control>I"},
+ {"<Main>/Message/Compose an email message", "<control>M"},
+ {"<Main>/Message/Reply", "<control>R"},
+ {"<Main>/Message/Reply to/all", "<shift><control>R"},
+ {"<Main>/Message/Reply to/sender", ""},
+ {"<Main>/Message/Reply to/mailing list", "<control>L"},
+ {"<Main>/Message/Forward", "<control><alt>F"},
+ /* {"<Main>/Message/Forward as attachment", ""}, */
+ {"<Main>/Message/Move...", "<control>O"},
+ {"<Main>/Message/Copy...", "<shift><control>O"},
+ {"<Main>/Message/Delete", "<control>D"},
+ {"<Main>/Message/Mark/Mark", "<shift>asterisk"},
+ {"<Main>/Message/Mark/Unmark", "U"},
+ {"<Main>/Message/Mark/Mark as unread", "<shift>exclam"},
+ {"<Main>/Message/Mark/Mark as read", ""},
+
+ {"<Main>/Tools/Address book", "<shift><control>A"},
+ {"<Main>/Tools/Execute", "X"},
+ {"<Main>/Tools/Log window", "<shift><control>L"},
+
+ {"<Compose>/File/Close", "<control>W"},
+ {"<Compose>/Edit/Select all", "<control>A"},
+ {"<Compose>/Edit/Advanced/Move a word backward", ""},
+ {"<Compose>/Edit/Advanced/Move a word forward", ""},
+ {"<Compose>/Edit/Advanced/Move to beginning of line", ""},
+ {"<Compose>/Edit/Advanced/Delete a word backward", ""},
+ {"<Compose>/Edit/Advanced/Delete a word forward", ""},
+ };
- text = gtk_entry_get_text(entry);
+ static struct KeyBind mew_wl_menurc[] = {
+ {"<Main>/File/Empty trash", "<shift>D"},
+ {"<Main>/File/Save as...", "Y"},
+ {"<Main>/File/Print...", "<shift>numbersign"},
+ {"<Main>/File/Exit", "<shift>Q"},
+
+ {"<Main>/Edit/Copy", "<control>C"},
+ {"<Main>/Edit/Select all", "<control>A"},
+ {"<Main>/Edit/Find in current message...", "<control>F"},
+ {"<Main>/Edit/Search folder...", "<control>S"},
+
+ {"<Main>/View/Expand Summary View", ""},
+ {"<Main>/View/Expand Message View", ""},
+ {"<Main>/View/Thread view", "<shift>T"},
+ {"<Main>/View/Go to/Prev message", "P"},
+ {"<Main>/View/Go to/Next message", "N"},
+ {"<Main>/View/Go to/Prev unread message", "<shift>P"},
+ {"<Main>/View/Go to/Next unread message", "<shift>N"},
+ {"<Main>/View/Go to/Other folder...", "G"},
+ {"<Main>/View/Open in new window", "<control><alt>N"},
+ {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Show all headers", "<shift>H"},
+ {"<Main>/View/Update", "<shift>S"},
+
+ {"<Main>/Message/Get new mail", "<control>I"},
+ {"<Main>/Message/Get from all accounts", "<shift><control>I"},
+ {"<Main>/Message/Compose an email message", "W"},
+ {"<Main>/Message/Reply", "<control>R"},
+ {"<Main>/Message/Reply to/all", "<shift>A"},
+ {"<Main>/Message/Reply to/sender", ""},
+ {"<Main>/Message/Reply to/mailing list", "<control>L"},
+ {"<Main>/Message/Forward", "F"},
+ /* {"<Main>/Message/Forward as attachment", "<shift>F"}, */
+ {"<Main>/Message/Move...", "O"},
+ {"<Main>/Message/Copy...", "<shift>O"},
+ {"<Main>/Message/Delete", "D"},
+ {"<Main>/Message/Mark/Mark", "<shift>asterisk"},
+ {"<Main>/Message/Mark/Unmark", "U"},
+ {"<Main>/Message/Mark/Mark as unread", "<shift>exclam"},
+ {"<Main>/Message/Mark/Mark as read", "<shift>R"},
+
+ {"<Main>/Tools/Address book", "<shift><control>A"},
+ {"<Main>/Tools/Execute", "X"},
+ {"<Main>/Tools/Log window", "<shift><control>L"},
+
+ {"<Compose>/File/Close", "<alt>W"},
+ {"<Compose>/Edit/Select all", ""},
+ {"<Compose>/Edit/Advanced/Move a word backward," "<alt>B"},
+ {"<Compose>/Edit/Advanced/Move a word forward", "<alt>F"},
+ {"<Compose>/Edit/Advanced/Move to beginning of line", "<control>A"},
+ {"<Compose>/Edit/Advanced/Delete a word backward", "<control>W"},
+ {"<Compose>/Edit/Advanced/Delete a word forward", "<alt>D"},
+ };
- if (!strcmp(text, _("Default")))
- rc_str = default_menurc;
- else if (!strcmp(text, "Mew / Wanderlust"))
- rc_str = mew_wl_menurc;
- else if (!strcmp(text, "Mutt"))
- rc_str = mutt_menurc;
- else if (!strcmp(text, _("Old Sylpheed")))
- rc_str = old_sylpheed_menurc;
- else
+ static struct KeyBind mutt_menurc[] = {
+ {"<Main>/File/Empty trash", ""},
+ {"<Main>/File/Save as...", "S"},
+ {"<Main>/File/Print...", "P"},
+ {"<Main>/File/Exit", "Q"},
+
+ {"<Main>/Edit/Copy", "<control>C"},
+ {"<Main>/Edit/Select all", "<control>A"},
+ {"<Main>/Edit/Find in current message...", "<control>F"},
+ {"<Main>/Edit/Search messages...", "slash"},
+
+ {"<Main>/View/Toggle summary view", "V"},
+ {"<Main>/View/Thread view", "<control>T"},
+ {"<Main>/View/Go to/Prev message", ""},
+ {"<Main>/View/Go to/Next message", ""},
+ {"<Main>/View/Go to/Prev unread message", ""},
+ {"<Main>/View/Go to/Next unread message", ""},
+ {"<Main>/View/Go to/Other folder...", "C"},
+ {"<Main>/View/Open in new window", "<control><alt>N"},
+ {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Show all headers", "<control>H"},
+ {"<Main>/View/Update", "<control><alt>U"},
+
+ {"<Main>/Message/Get new mail", "<control>I"},
+ {"<Main>/Message/Get from all accounts", "<shift><control>I"},
+ {"<Main>/Message/Compose new message", "M"},
+ {"<Main>/Message/Reply", "R"},
+ {"<Main>/Message/Reply to/all", "G"},
+ {"<Main>/Message/Reply to/sender", ""},
+ {"<Main>/Message/Reply to/mailing list", "<control>L"},
+ {"<Main>/Message/Forward", "F"},
+ {"<Main>/Message/Forward as attachment", ""},
+ {"<Main>/Message/Move...", "<control>O"},
+ {"<Main>/Message/Copy...", "<shift>C"},
+ {"<Main>/Message/Delete", "D"},
+ {"<Main>/Message/Mark/Mark", "<shift>F"},
+ {"<Main>/Message/Mark/Unmark", "U"},
+ {"<Main>/Message/Mark/Mark as unread", "<shift>N"},
+ {"<Main>/Message/Mark/Mark as read", ""},
+
+ {"<Main>/Tools/Address book", "<shift><control>A"},
+ {"<Main>/Tools/Execute", "X"},
+ {"<Main>/Tools/Log window", "<shift><control>L"},
+
+ {"<Compose>/File/Close", "<alt>W"},
+ {"<Compose>/Edit/Select all", ""},
+ {"<Compose>/Edit/Advanced/Move a word backward", "<alt>B"},
+ {"<Compose>/Edit/Advanced/Move a word forward", "<alt>F"},
+ {"<Compose>/Edit/Advanced/Move to beginning of line", "<control>A"},
+ {"<Compose>/Edit/Advanced/Delete a word backward", "<control>W"},
+ {"<Compose>/Edit/Advanced/Delete a word forward", "<alt>D"},
+ };
+
+ static struct KeyBind old_sylpheed_menurc[] = {
+ {"<Main>/File/Empty trash", ""},
+ {"<Main>/File/Save as...", ""},
+ {"<Main>/File/Print...", "<alt>P"},
+ {"<Main>/File/Exit", "<alt>Q"},
+
+ {"<Main>/Edit/Copy", "<control>C"},
+ {"<Main>/Edit/Select all", "<control>A"},
+ {"<Main>/Edit/Find in current message...", "<control>F"},
+ {"<Main>/Edit/Search folder...", "<control>S"},
+
+ {"<Main>/View/Expand Summary View", ""},
+ {"<Main>/View/Expand Message View", ""},
+ {"<Main>/View/Thread view", "<control>T"},
+ {"<Main>/View/Go to/Prev message", "P"},
+ {"<Main>/View/Go to/Next message", "N"},
+ {"<Main>/View/Go to/Prev unread message", "<shift>P"},
+ {"<Main>/View/Go to/Next unread message", "<shift>N"},
+ {"<Main>/View/Go to/Other folder...", "<alt>G"},
+ {"<Main>/View/Open in new window", "<shift><control>N"},
+ {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Show all headers", "<control>H"},
+ {"<Main>/View/Update", "<alt>U"},
+
+ {"<Main>/Message/Get new mail", "<alt>I"},
+ {"<Main>/Message/Get from all accounts", "<shift><alt>I"},
+ {"<Main>/Message/Compose an email message", "<alt>N"},
+ {"<Main>/Message/Reply", "<alt>R"},
+ {"<Main>/Message/Reply to/all", "<shift><alt>R"},
+ {"<Main>/Message/Reply to/sender", "<control><alt>R"},
+ {"<Main>/Message/Reply to/mailing list", "<control>L"},
+ {"<Main>/Message/Forward", "<shift><alt>F"},
+ /* "(menu-path \"<Main>/Message/Forward as attachment", "<shift><control>F"}, */
+ {"<Main>/Message/Move...", "<alt>O"},
+ {"<Main>/Message/Copy...", ""},
+ {"<Main>/Message/Delete", "<alt>D"},
+ {"<Main>/Message/Mark/Mark", "<shift>asterisk"},
+ {"<Main>/Message/Mark/Unmark", "U"},
+ {"<Main>/Message/Mark/Mark as unread", "<shift>exclam"},
+ {"<Main>/Message/Mark/Mark as read", ""},
+
+ {"<Main>/Tools/Address book", "<alt>A"},
+ {"<Main>/Tools/Execute", "<alt>X"},
+ {"<Main>/Tools/Log window", "<alt>L"},
+
+ {"<Compose>/File/Close", "<alt>W"},
+ {"<Compose>/Edit/Select all", ""},
+ {"<Compose>/Edit/Advanced/Move a word backward", "<alt>B"},
+ {"<Compose>/Edit/Advanced/Move a word forward", "<alt>F"},
+ {"<Compose>/Edit/Advanced/Move to beginning of line", "<control>A"},
+ {"<Compose>/Edit/Advanced/Delete a word backward", "<control>W"},
+ {"<Compose>/Edit/Advanced/Delete a word forward", "<alt>D"},
+ };
+
+ text = gtk_entry_get_text(entry);
+
+ if (!strcmp(text, _("Default"))) {
+ menurc = default_menurc;
+ n_menurc = G_N_ELEMENTS(default_menurc);
+ } else if (!strcmp(text, "Mew / Wanderlust")) {
+ menurc = mew_wl_menurc;
+ n_menurc = G_N_ELEMENTS(mew_wl_menurc);
+ } else if (!strcmp(text, "Mutt")) {
+ menurc = mutt_menurc;
+ n_menurc = G_N_ELEMENTS(mutt_menurc);
+ } else if (!strcmp(text, _("Old Sylpheed"))) {
+ menurc = old_sylpheed_menurc;
+ n_menurc = G_N_ELEMENTS(old_sylpheed_menurc);
+ } else {
return;
+ }
- gtk_item_factory_parse_rc_string(empty_menurc);
- gtk_item_factory_parse_rc_string(rc_str);
+ /* prefs_keybind_apply(empty_menurc, G_N_ELEMENTS(empty_menurc)); */
+ prefs_keybind_apply(menurc, n_menurc);
gtk_widget_destroy(keybind.window);
keybind.window = NULL;
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
menuitem = gtk_menu_get_active(GTK_MENU(menu));
- charset = gtk_object_get_user_data(GTK_OBJECT(menuitem));
+ charset = g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
g_free(*((gchar **)pparam->data));
*((gchar **)pparam->data) = g_strdup(charset);
}
static void prefs_common_charset_set_optmenu(PrefParam *pparam)
{
- GList *cur;
GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
- GtkWidget *menu;
- GtkWidget *menuitem;
- gchar *charset;
- gint n = 0;
+ gint index;
g_return_if_fail(optmenu != NULL);
g_return_if_fail(*((gchar **)pparam->data) != NULL);
- menu = gtk_option_menu_get_menu(optmenu);
- for (cur = GTK_MENU_SHELL(menu)->children;
- cur != NULL; cur = cur->next) {
- menuitem = GTK_WIDGET(cur->data);
- charset = gtk_object_get_user_data(GTK_OBJECT(menuitem));
- if (!strcmp(charset, *((gchar **)pparam->data))) {
- gtk_option_menu_set_history(optmenu, n);
- return;
- }
- n++;
+ index = menu_find_option_menu_index(optmenu, *((gchar **)pparam->data),
+ (GCompareFunc)strcmp);
+ if (index >= 0)
+ gtk_option_menu_set_history(optmenu, index);
+ else {
+ gtk_option_menu_set_history(optmenu, 0);
+ prefs_common_charset_set_data_from_optmenu(pparam);
}
+}
- gtk_option_menu_set_history(optmenu, 0);
- prefs_common_charset_set_data_from_optmenu(pparam);
+static void prefs_common_encoding_set_data_from_optmenu(PrefParam *pparam)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ *((TransferEncodingMethod *)pparam->data) = GPOINTER_TO_INT
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+}
+
+static void prefs_common_encoding_set_optmenu(PrefParam *pparam)
+{
+ TransferEncodingMethod method =
+ *((TransferEncodingMethod *)pparam->data);
+ GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+ gint index;
+
+ g_return_if_fail(optmenu != NULL);
+
+ index = menu_find_option_menu_index(optmenu, GINT_TO_POINTER(method),
+ NULL);
+ if (index >= 0)
+ gtk_option_menu_set_history(optmenu, index);
+ else {
+ gtk_option_menu_set_history(optmenu, 0);
+ prefs_common_encoding_set_data_from_optmenu(pparam);
+ }
}
static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam)
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
menuitem = gtk_menu_get_active(GTK_MENU(menu));
*((RecvDialogMode *)pparam->data) = GPOINTER_TO_INT
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
}
static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam)
GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
GtkWidget *menu;
GtkWidget *menuitem;
+ gint index;
- switch (mode) {
- case RECV_DIALOG_ALWAYS:
+ index = menu_find_option_menu_index(optmenu, GINT_TO_POINTER(mode),
+ NULL);
+ if (index >= 0)
+ gtk_option_menu_set_history(optmenu, index);
+ else {
gtk_option_menu_set_history(optmenu, 0);
- break;
- case RECV_DIALOG_ACTIVE:
- gtk_option_menu_set_history(optmenu, 1);
- break;
- case RECV_DIALOG_NEVER:
- gtk_option_menu_set_history(optmenu, 2);
- break;
- default:
- break;
+ prefs_common_recv_dialog_set_data_from_optmenu(pparam);
}
menu = gtk_option_menu_get_menu(optmenu);
return TRUE;
}
-static void prefs_common_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
+static gboolean prefs_common_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
prefs_common_cancel();
+ return FALSE;
}
static void prefs_common_ok(void)
static void prefs_common_apply(void)
{
- gchar *entry_pixmap_theme_str;
+ const gchar *entry_pixmap_theme_str;
gboolean update_pixmap_theme;
+ gchar *backup_theme_path;
entry_pixmap_theme_str = gtk_entry_get_text(GTK_ENTRY(interface.entry_pixmap_theme));
if (entry_pixmap_theme_str &&
update_pixmap_theme = TRUE;
else
update_pixmap_theme = FALSE;
-
+
+ /*!< FIXME: prefs_set_data_from_dialog() clears and frees all strings,
+ * but prefs_common.pixmap_theme_path is stored in the StockPixmapData
+ * in stock_pixmap.c::pixmaps[].icon_path, and used when reflecting
+ * the pixmap changes. Work around by saving the old one and freeing
+ * it later. */
+ backup_theme_path = prefs_common.pixmap_theme_path;
+ prefs_common.pixmap_theme_path = g_strdup(backup_theme_path);
prefs_set_data_from_dialog(param);
+ sock_set_io_timeout(prefs_common.io_timeout_secs);
- if (update_pixmap_theme)
- {
+ if (update_pixmap_theme) {
main_window_reflect_prefs_all_real(TRUE);
compose_reflect_prefs_pixmap_theme();
} else
main_window_reflect_prefs_all_real(FALSE);
+
+ /*!< FIXME: Now it's safe to delete the backup path */
+ g_free(backup_theme_path);
prefs_common_save_config();
projects / claws.git / blobdiff