#include "stock_pixmap.h"
#include "quote_fmt.h"
-#if USE_PSPELL
-#include "gtkspell.h"
+#if USE_ASPELL
+#include "gtkaspell.h"
#endif
PrefsCommon prefs_common;
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 *checkbtn_block_cursor;
GtkWidget *checkbtn_reply_with_quote;
+
+ GtkWidget *checkbtn_autosave;
+ GtkWidget *entry_autosave_length;
} compose;
/* spelling */
-#if USE_PSPELL
+#if USE_ASPELL
static struct Spelling {
- GtkWidget *checkbtn_enable_pspell;
- GtkWidget *entry_pspell_path;
- GtkWidget *btn_pspell_path;
+ GtkWidget *checkbtn_enable_aspell;
+ GtkWidget *entry_aspell_path;
+ GtkWidget *btn_aspell_path;
GtkWidget *optmenu_dictionary;
GtkWidget *optmenu_sugmode;
GtkWidget *misspelled_btn;
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 *spinbtn_scrollstep;
GtkObject *spinbtn_scrollstep_adj;
GtkWidget *chkbtn_halfpage;
+
+ GtkWidget *chkbtn_display_img;
+ GtkWidget *chkbtn_resize_image;
} message;
#if USE_GPGME
/* GtkWidget *checkbtn_emacs; */
GtkWidget *checkbtn_show_msg_with_cursor;
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 *quote_level3_btn;
GtkWidget *uri_btn;
GtkWidget *tgt_folder_btn;
+ GtkWidget *signature_btn;
} color_buttons;
static struct KeybindDialog {
gpointer data);
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_send_dialog_set_data_from_optmenu(PrefParam *pparam);
+static void prefs_common_send_dialog_set_optmenu(PrefParam *pparam);
static void prefs_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam);
static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam);
-#if USE_PSPELL
+#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);
{"smart_wrapping", "TRUE", &prefs_common.smart_wrapping,
P_BOOL, &compose.checkbtn_smart_wrapping,
prefs_set_data_from_toggle, prefs_set_toggle},
-#if USE_PSPELL
- {"enable_pspell", "TRUE", &prefs_common.enable_pspell,
- P_BOOL, &spelling.checkbtn_enable_pspell,
+ {"autosave", "FALSE", &prefs_common.autosave,
+ P_BOOL, &compose.checkbtn_autosave,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"pspell_path", PSPELL_PATH, &prefs_common.pspell_path,
- P_STRING, &spelling.entry_pspell_path,
+ {"autosave_length", "50", &prefs_common.autosave_length,
+ 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 },
- {"pspell_sugmode", "1", &prefs_common.pspell_sugmode,
+ {"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,
&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.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,
NULL, NULL, NULL},
{"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
NULL, NULL, NULL},
+ {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
+ NULL, NULL, NULL},
{"folderview_vscrollbar_policy", "0",
&prefs_common.folderview_vscrollbar_policy, P_ENUM,
NULL, NULL, NULL},
{"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_INT,
NULL, NULL, NULL},
- {"signature_color", "0", &prefs_common.sig_col, P_USHORT,
+ {"signature_color", "7960953", &prefs_common.signature_col, P_INT,
NULL, NULL, NULL},
{"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
P_BOOL, NULL, NULL, NULL},
&message.chkbtn_halfpage,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"display_img", "TRUE", &prefs_common.display_img, P_BOOL,
+ &message.chkbtn_display_img,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+ {"resize_image", "TRUE", &prefs_common.resize_image, P_BOOL,
+ &message.chkbtn_resize_image,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
NULL, NULL, NULL},
{"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
P_BOOL, &interface.checkbtn_openunread,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"mark_as_read_on_new_window", "FALSE",
+ &prefs_common.mark_as_read_on_new_window,
+ P_BOOL, &interface.checkbtn_mark_as_read_on_newwin,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"open_inbox_on_inc", "FALSE", &prefs_common.open_inbox_on_inc,
P_BOOL, &interface.checkbtn_openinbox,
prefs_set_data_from_toggle, prefs_set_toggle},
&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,
{"work_offline", "FALSE", &prefs_common.work_offline, P_BOOL,
NULL, NULL, NULL},
- {"kill_score", "-9999", &prefs_common.kill_score, P_INT,
+ {"hide_score", "-9999", &prefs_common.kill_score, P_INT,
NULL, NULL, NULL},
{"important_score", "1", &prefs_common.important_score, P_INT,
NULL, NULL, NULL},
static void prefs_common_create (void);
static void prefs_receive_create (void);
static void prefs_send_create (void);
-static void prefs_compose_create (void);
+#ifdef USE_ASPELL
static void prefs_spelling_create (void);
+#endif
+static void prefs_compose_create (void);
static void prefs_quote_create (void);
static void prefs_display_create (void);
static void prefs_message_create (void);
static void prefs_common_cancel (void);
void prefs_common_init() {
- prefs_common.fltlist = NULL;
prefs_common.disphdr_list = NULL;
}
{
gint page = 0;
- debug_print(_("Creating common preferences window...\n"));
+ debug_print("Creating common preferences window...\n");
prefs_dialog_create(&dialog);
gtk_window_set_title (GTK_WINDOW(dialog.window),
SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"), page++);
prefs_compose_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
-#if USE_PSPELL
+#if USE_ASPELL
prefs_spelling_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Spell Checker"), page++);
#endif
gtk_widget_set_sensitive(receive.hbox_newmail_notify, toggled);
}
-#if USE_PSPELL
+#if USE_ASPELL
static void prefs_dictionary_set_data_from_optmenu(PrefParam *param)
{
gchar *str;
g_return_if_fail(param->widget);
g_return_if_fail(*(param->widget));
- dict_fullname = gtkpspell_get_dictionary_menu_active_item
+ 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_return_if_fail(param->widget);
g_return_if_fail(*(param->widget));
- sugmode = gtkpspell_get_sugmode_from_option_menu
+ sugmode = gtkaspell_get_sugmode_from_option_menu
(GTK_OPTION_MENU(*(param->widget)));
*((gint *) param->data) = sugmode;
}
g_return_if_fail(pparam->data != NULL);
sugmode = *(gint *) pparam->data;
- gtkpspell_sugmode_option_menu_set(optmenu, sugmode);
+ gtkaspell_sugmode_option_menu_set(optmenu, sugmode);
}
-static void prefs_spelling_checkbtn_enable_pspell_toggle_cb
+static void prefs_spelling_checkbtn_enable_aspell_toggle_cb
(GtkWidget *widget,
gpointer data)
{
toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- gtk_widget_set_sensitive(spelling.entry_pspell_path, toggled);
+ 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_pspell_path, 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_pspell_path_clicked_cb(GtkWidget *widget,
+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.pspell_path);
+ prefs_common.aspell_path);
if (file_path == NULL) {
/* don't change */
}
else {
tmp=g_dirname(file_path);
- if (prefs_common.pspell_path)
- g_free(prefs_common.pspell_path);
- prefs_common.pspell_path = g_strdup_printf("%s%s",tmp,
+ 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 = gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path);
+ 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_pspell_path),
- prefs_common.pspell_path);
+ 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);
g_free(prefs_common.dictionary);
prefs_common.dictionary =
- gtkpspell_get_dictionary_menu_active_item(
+ gtkaspell_get_dictionary_menu_active_item(
gtk_option_menu_get_menu(
GTK_OPTION_MENU(
spelling.optmenu_dictionary)));
GtkWidget *vbox1;
GtkWidget *frame_spell;
GtkWidget *vbox_spell;
- GtkWidget *hbox_pspell_path;
- GtkWidget *checkbtn_enable_pspell;
- GtkWidget *label_pspell_path;
- GtkWidget *entry_pspell_path;
- GtkWidget *btn_pspell_path;
+ 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;
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_pspell,
- _("Enable spell checker (EXPERIMENTAL)"));
+ PACK_CHECK_BUTTON(vbox_spell, checkbtn_enable_aspell,
+ _("Enable spell checker"));
- gtk_signal_connect(GTK_OBJECT(checkbtn_enable_pspell), "toggled",
- GTK_SIGNAL_FUNC(prefs_spelling_checkbtn_enable_pspell_toggle_cb),
+ gtk_signal_connect(GTK_OBJECT(checkbtn_enable_aspell), "toggled",
+ GTK_SIGNAL_FUNC(prefs_spelling_checkbtn_enable_aspell_toggle_cb),
NULL);
/* Check while typing */
gtk_box_pack_start(GTK_BOX(vbox_spell), spell_table, TRUE, TRUE, 0);
- label_pspell_path = gtk_label_new (_("Dictionaries path:"));
- gtk_misc_set_alignment(GTK_MISC(label_pspell_path), 1.0, 0.5);
- gtk_widget_show(label_pspell_path);
- gtk_table_attach (GTK_TABLE (spell_table), label_pspell_path, 0, 1, 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_pspell_path = gtk_hbox_new (FALSE, 8);
- gtk_table_attach (GTK_TABLE (spell_table), hbox_pspell_path, 1, 2, 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_pspell_path);
+ gtk_widget_show(hbox_aspell_path);
- entry_pspell_path = gtk_entry_new();
- gtk_widget_show(entry_pspell_path);
- gtk_box_pack_start(GTK_BOX(hbox_pspell_path), entry_pspell_path, TRUE,
+ 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_pspell_path, prefs_common.enable_pspell);
+ gtk_widget_set_sensitive(entry_aspell_path, prefs_common.enable_aspell);
- btn_pspell_path = gtk_button_new_with_label(" ... ");
- gtk_widget_show(btn_pspell_path);
- gtk_box_pack_start(GTK_BOX(hbox_pspell_path), btn_pspell_path, FALSE, FALSE, 0);
- gtk_widget_set_sensitive(btn_pspell_path, prefs_common.enable_pspell);
+ 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_pspell_path), "clicked",
- GTK_SIGNAL_FUNC(prefs_spelling_btn_pspell_path_clicked_cb),
+ 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:"));
optmenu_dictionary = gtk_option_menu_new();
gtk_widget_show(optmenu_dictionary);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary),
- gtkpspell_dictionary_option_menu_new(
- prefs_common.pspell_path));
+ 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_pspell);
+ gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_aspell);
/* Suggestion mode */
sugmode_label = gtk_label_new(_("Default suggestion mode"));
sugmode_optmenu = gtk_option_menu_new();
gtk_widget_show(sugmode_optmenu);
gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
- gtkpspell_sugmode_option_menu_new(prefs_common.pspell_sugmode));
+ 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_pspell);
+ gtk_widget_set_sensitive(sugmode_optmenu, prefs_common.enable_aspell);
/* Color */
color_label = gtk_label_new(_("Misspelled word color:"));
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_pspell);
+ 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_pspell = checkbtn_enable_pspell;
- spelling.entry_pspell_path = entry_pspell_path;
- spelling.btn_pspell_path = btn_pspell_path;
+ 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;
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;
GtkWidget *checkbtn_block_cursor;
GtkWidget *frame_msgwrap;
+ GtkWidget *hbox_autosave;
+ GtkWidget *checkbtn_autosave;
+ GtkWidget *entry_autosave_length;
+ GtkWidget *label_autosave_length;
+
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
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"));
PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
_("Keep the original 'From' header when redirecting"));
+
+ hbox_autosave = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox_autosave);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox_autosave, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON (hbox_autosave, checkbtn_autosave,
+ _("Autosave to drafts every "));
+
+ entry_autosave_length = gtk_entry_new();
+ gtk_widget_set_usize (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);
+
+ label_autosave_length = gtk_label_new(_("characters"));
+ gtk_widget_show (label_autosave_length);
+ gtk_box_pack_start (GTK_BOX (hbox_autosave), label_autosave_length, FALSE, FALSE, 0);
+
hbox_undolevel = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox_undolevel);
gtk_box_pack_start (GTK_BOX (vbox1), hbox_undolevel, FALSE, FALSE, 0);
compose.spinbtn_undolevel = spinbtn_undolevel;
compose.spinbtn_undolevel_adj = spinbtn_undolevel_adj;
- compose.spinbtn_linewrap = spinbtn_linewrap;
- compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
- compose.checkbtn_wrapquote = checkbtn_wrapquote;
- compose.checkbtn_autowrap = checkbtn_autowrap;
- compose.checkbtn_wrapatsend = checkbtn_wrapatsend;
+ compose.spinbtn_linewrap = spinbtn_linewrap;
+ compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj;
+ compose.checkbtn_wrapquote = checkbtn_wrapquote;
+ compose.checkbtn_autowrap = checkbtn_autowrap;
+ compose.checkbtn_wrapatsend = checkbtn_wrapatsend;
+ compose.checkbtn_autosave = checkbtn_autosave;
+ compose.entry_autosave_length = entry_autosave_length;
+
compose.checkbtn_forward_as_attachment =
checkbtn_forward_as_attachment;
compose.checkbtn_redirect_keep_from =
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)
GtkWidget *label_textfont;
GtkWidget *entry_textfont;
GtkWidget *button_textfont;
- GtkWidget *chkbtn_display_img;
GtkWidget *chkbtn_transhdr;
GtkWidget *chkbtn_folder_unread;
GtkWidget *hbox1;
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);
button_dispitem = gtk_button_new_with_label
- (_(" Set display item of summary... "));
+ (_(" Set displayed items of 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",
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;
GtkWidget *spinbtn_scrollstep;
GtkWidget *chkbtn_halfpage;
+ GtkWidget *chkbtn_display_img;
+ GtkWidget *chkbtn_resize_image;
+
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
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_display_img,
+ _("Automatically display attached images"));
+
+ PACK_CHECK_BUTTON(vbox3, chkbtn_resize_image,
+ _("Resize attached images"));
+
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_display_img = chkbtn_display_img;
+ message.chkbtn_resize_image = chkbtn_resize_image;
}
#if USE_GPGME
/* GtkWidget *checkbtn_emacs; */
GtkWidget *checkbtn_show_msg_with_cursor;
GtkWidget *checkbtn_openunread;
+ GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
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;
(vbox2, checkbtn_openunread,
_("Open first unread message when entering a folder"));
+ PACK_CHECK_BUTTON
+ (vbox2, checkbtn_mark_as_read_on_newwin,
+ _("Only mark message as read when opened in new window"));
+
PACK_CHECK_BUTTON
(vbox2, checkbtn_openinbox,
_("Go to inbox after receiving new mail"));
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
- PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
- _("No popup error dialog on receive error"));
+ 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);
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 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_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+ 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_box_pack_start (GTK_BOX (hbox1), optmenu_recvdialog,
- FALSE, FALSE, 0);
+ 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);
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);
interface.checkbtn_show_msg_with_cursor
= checkbtn_show_msg_with_cursor;
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;
gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_entry,
FALSE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (loglength_entry));
+ loglength_label = gtk_label_new (_("(0 to stop logging in the log window)"));
+ gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_label,
+ FALSE, TRUE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_entry);
/* On Exit */
GtkWidget *quotelevel2_label;
GtkWidget *quotelevel3_label;
GtkWidget *uri_label;
+ GtkWidget *signature_label;
GtkWidget *tgt_folder_label;
GtkWidget *hbbox;
GtkWidget *ok_btn;
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
PACK_FRAME(vbox, frame_colors, _("Colors"));
- table = gtk_table_new (4, 2, FALSE);
+ table = gtk_table_new (5, 2, FALSE);
gtk_container_add (GTK_CONTAINER (frame_colors), table);
gtk_container_set_border_width (GTK_CONTAINER (table), 8);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_widget_set_usize (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_container_set_border_width (GTK_CONTAINER (color_buttons.signature_btn), 5);
+
quotelevel1_label = gtk_label_new (_("Quoted Text - First Level"));
gtk_table_attach (GTK_TABLE (table), quotelevel1_label, 1, 2, 0, 1,
(GTK_EXPAND | GTK_FILL), 0, 0, 0);
gtk_label_set_justify (GTK_LABEL (tgt_folder_label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (tgt_folder_label), 0, 0.5);
+ signature_label = gtk_label_new (_("Signatures"));
+ gtk_table_attach (GTK_TABLE (table), signature_label, 1, 2, 5, 6,
+ (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+ gtk_label_set_justify (GTK_LABEL (signature_label), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment (GTK_MISC (signature_label), 0, 0.5);
+
PACK_CHECK_BUTTON (vbox, recycle_colors_btn,
_("Recycle quote colors"));
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",
prefs_common.uri_col);
set_button_bg_color(color_buttons.tgt_folder_btn,
prefs_common.tgt_folder_col);
+ set_button_bg_color(color_buttons.signature_btn,
+ prefs_common.signature_col);
gtk_toggle_button_set_active((GtkToggleButton *)recycle_colors_btn,
prefs_common.recycle_quote_colors);
} else if(g_strcasecmp(type, "TGTFLD") == 0) {
title = _("Pick color for target folder");
rgbvalue = prefs_common.tgt_folder_col;
-#if USE_PSPELL
+ } 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;
prefs_common.tgt_folder_col = rgbvalue;
set_button_bg_color(color_buttons.tgt_folder_btn, rgbvalue);
folderview_set_target_folder_color(prefs_common.tgt_folder_col);
-#if USE_PSPELL
+ } 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);
"(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 header\" \"<control>H\")\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 sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to all\" \"<shift><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>/Tools/Address book\" \"<shift><control>A\")\n"
"(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\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 \"<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 header\" \"<shift>H\")\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 sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to all\" \"<shift>A\")\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>/Tools/Address book\" \"<shift><control>A\")\n"
"(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\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 \"<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 header\" \"<control>H\")\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/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>/Tools/Address book\" \"<shift><control>A\")\n"
"(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tools/Log window\" \"<control>L\")\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 \"<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 header\" \"<control>H\")\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 sender\" \"<control><alt>R\")\n"
- "(menu-path \"<Main>/Message/Reply to all\" \"<shift><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>/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 header\" \"\")\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 sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to all\" \"\")\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"
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_recv_dialog_set_data_from_optmenu(PrefParam *pparam)
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
+static void prefs_common_send_dialog_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));
+ *((SendDialogMode *)pparam->data) = GPOINTER_TO_INT
+ (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_common_send_dialog_set_optmenu(PrefParam *pparam)
+{
+ SendDialogMode mode = *((SendDialogMode *)pparam->data);
+ GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ switch (mode) {
+ case SEND_DIALOG_ALWAYS:
+ gtk_option_menu_set_history(optmenu, 0);
+ break;
+ case SEND_DIALOG_NEVER:
+ gtk_option_menu_set_history(optmenu, 1);
+ break;
+ default:
+ break;
+ }
+
+ menu = gtk_option_menu_get_menu(optmenu);
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
static gint prefs_common_deleted(GtkWidget *widget, GdkEventAny *event,
gpointer data)
{
projects / claws.git / blobdiff