#include "prefs.h"
#include "prefs_common.h"
#include "prefs_display_header.h"
+#include "prefs_summary_column.h"
#include "mainwindow.h"
#include "summaryview.h"
#include "messageview.h"
#include "gtkutils.h"
#include "alertpanel.h"
#include "folder.h"
-#include "gtkspell.h"
#include "filesel.h"
#include "folderview.h"
+#if USE_PSPELL
+#include "gtkspell.h"
+#endif
+
PrefsCommon prefs_common;
static PrefsDialog dialog;
} receive;
static struct Send {
- GtkWidget *checkbtn_sendext;
- GtkWidget *entry_sendext;
- GtkWidget *button_sendext;
+ GtkWidget *checkbtn_extsend;
+ GtkWidget *entry_extsend;
+ GtkWidget *button_extsend;
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_queuemsg;
GtkWidget *entry_fw_quotemark;
GtkWidget *text_fw_quotefmt;
+ GtkWidget *checkbtn_autoextedit;
GtkWidget *checkbtn_reply_account_autosel;
GtkWidget *checkbtn_forward_account_autosel;
GtkWidget *checkbtn_reedit_account_autosel;
GtkWidget * checkbtn_forward_as_attachment;
GtkWidget * checkbtn_smart_wrapping;
+ GtkWidget * checkbtn_block_cursor;
/* spelling */
- GtkWidget *checkbtn_enable_ispell;
- GtkWidget *entry_ispell_path;
- GtkWidget *btn_ispell_path;
- GtkWidget *optmenu_dictionary_path;
+#if USE_PSPELL
+ GtkWidget *checkbtn_enable_pspell;
+ GtkWidget *entry_pspell_path;
+ GtkWidget *btn_pspell_path;
+ GtkWidget *optmenu_dictionary;
+#endif
+
} compose;
static struct Display {
#if USE_GPGME
static struct Privacy {
GtkWidget *checkbtn_default_encrypt;
+ GtkWidget *checkbtn_ascii_armored;
GtkWidget *checkbtn_default_sign;
GtkWidget *checkbtn_auto_check_signatures;
GtkWidget *checkbtn_gpg_signature_popup;
GtkWidget *checkbtn_warnqueued;
GtkWidget *checkbtn_addaddrbyclick;
GtkWidget *optmenu_recvdialog;
+ GtkWidget *optmenu_nextunreadmsgdialog;
} interface;
static struct Other {
static void prefs_common_default_signkey_set_data_from_optmenu
(PrefParam *pparam);
static void prefs_common_default_signkey_set_optmenu (PrefParam *pparam);
+static void prefs_common_ascii_armored_warning(GtkWidget* widget,
+ gpointer unused);
#endif
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_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam);
+static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam);
+#if USE_PSPELL
static void prefs_dictionary_set_data_from_optmenu(PrefParam *param);
static void prefs_dictionary_set_optmenu(PrefParam *pparam);
+#endif
/*
{"use_ext_inc", "FALSE", &prefs_common.use_extinc, P_BOOL,
&receive.checkbtn_incext,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"ext_inc_path", DEFAULT_INC_PATH, &prefs_common.extinc_path, P_STRING,
+ {"ext_inc_path", DEFAULT_INC_PATH, &prefs_common.extinc_cmd, P_STRING,
&receive.entry_incext,
prefs_set_data_from_entry, prefs_set_entry},
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
/* Send */
- {"use_ext_send", "FALSE", &prefs_common.use_extsend, P_BOOL,
- &send.checkbtn_sendext,
+ {"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
+ &send.checkbtn_extsend,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"ext_send_path", NULL, &prefs_common.extsend_path, P_STRING,
- &send.entry_sendext, prefs_set_data_from_entry, prefs_set_entry},
+ {"ext_sendmail_cmd", DEFAULT_SENDMAIL_CMD,
+ &prefs_common.extsend_cmd, P_STRING,
+ &send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry},
{"save_message", "TRUE", &prefs_common.savemsg, P_BOOL,
&send.checkbtn_savemsg,
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},
{"reply_account_autoselect", "TRUE",
&prefs_common.reply_account_autosel, P_BOOL,
&compose.checkbtn_reply_account_autosel,
{"smart_wrapping", "TRUE", &prefs_common.smart_wrapping,
P_BOOL, &compose.checkbtn_smart_wrapping,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"enable_ispell", "TRUE", &prefs_common.enable_ispell,
- P_BOOL, &compose.checkbtn_enable_ispell,
+ {"block_cursor", "FALSE", &prefs_common.block_cursor,
+ P_BOOL, &compose.checkbtn_block_cursor,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+#if USE_PSPELL
+ {"enable_pspell", "TRUE", &prefs_common.enable_pspell,
+ P_BOOL, &compose.checkbtn_enable_pspell,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"ispell_path", ISPELL_PATH, &prefs_common.ispell_path,
- P_STRING, &compose.entry_ispell_path,
+ {"pspell_path", "/usr/local/share/pspell/", &prefs_common.pspell_path,
+ P_STRING, &compose.entry_pspell_path,
prefs_set_data_from_entry, prefs_set_entry},
- {"dictionary_path", "", &prefs_common.dictionary_path,
- P_STRING, &compose.optmenu_dictionary_path,
+ {"dictionary", "", &prefs_common.dictionary,
+ P_STRING, &compose.optmenu_dictionary,
prefs_dictionary_set_data_from_optmenu, prefs_dictionary_set_optmenu },
-
+#endif
{"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
NULL, NULL, NULL},
{"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
NULL, NULL, NULL},
- {"show_mark", "TRUE", &prefs_common.show_mark, P_BOOL,
- NULL, NULL, NULL},
- {"show_unread", "TRUE", &prefs_common.show_unread, P_BOOL,
- NULL, NULL, NULL},
- {"show_mime", "TRUE", &prefs_common.show_mime, P_BOOL,
- NULL, NULL, NULL},
- {"show_number", "FALSE", &prefs_common.show_number, P_BOOL,
- NULL, NULL, NULL},
- {"show_score", "TRUE", &prefs_common.show_score, P_BOOL,
- NULL, NULL, NULL},
- {"show_size", "FALSE", &prefs_common.show_size, P_BOOL,
- NULL, NULL, NULL},
- {"show_date", "TRUE", &prefs_common.show_date, P_BOOL,
- NULL, NULL, NULL},
- {"show_from", "TRUE", &prefs_common.show_from, P_BOOL,
- NULL, NULL, NULL},
- {"show_subject", "TRUE", &prefs_common.show_subject, 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},
+ {"summary_col_show_mime", "TRUE",
+ &prefs_common.summary_col_visible[S_COL_MIME], P_BOOL, NULL, NULL, NULL},
+ {"summary_col_show_subject", "TRUE",
+ &prefs_common.summary_col_visible[S_COL_SUBJECT], P_BOOL, NULL, NULL, NULL},
+ {"summary_col_show_from", "TRUE",
+ &prefs_common.summary_col_visible[S_COL_FROM], P_BOOL, NULL, NULL, NULL},
+ {"summary_col_show_date", "TRUE",
+ &prefs_common.summary_col_visible[S_COL_DATE], P_BOOL, NULL, NULL, NULL},
+ {"summary_col_show_size", "TRUE",
+ &prefs_common.summary_col_visible[S_COL_SIZE], P_BOOL, NULL, NULL, NULL},
+ {"summary_col_show_number", "FALSE",
+ &prefs_common.summary_col_visible[S_COL_NUMBER], P_BOOL, NULL, NULL, NULL},
+ {"summary_col_show_score", "FALSE",
+ &prefs_common.summary_col_visible[S_COL_SCORE], P_BOOL, NULL, NULL, NULL},
+
+ {"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},
+ {"summary_col_pos_mime", "2",
+ &prefs_common.summary_col_pos[S_COL_MIME], P_INT, NULL, NULL, NULL},
+ {"summary_col_pos_subject", "3",
+ &prefs_common.summary_col_pos[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
+ {"summary_col_pos_from", "4",
+ &prefs_common.summary_col_pos[S_COL_FROM], P_INT, NULL, NULL, NULL},
+ {"summary_col_pos_date", "5",
+ &prefs_common.summary_col_pos[S_COL_DATE], P_INT, NULL, NULL, NULL},
+ {"summary_col_pos_size", "6",
+ &prefs_common.summary_col_pos[S_COL_SIZE], P_INT, NULL, NULL, NULL},
+ {"summary_col_pos_number", "7",
+ &prefs_common.summary_col_pos[S_COL_NUMBER], P_INT, NULL, NULL, NULL},
+ {"summary_col_pos_score", "8",
+ &prefs_common.summary_col_pos[S_COL_SCORE], P_INT, NULL, NULL, NULL},
+
+ {"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},
+ {"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_SUBJECT], P_INT, NULL, NULL, NULL},
+ {"summary_col_size_from", "120",
+ &prefs_common.summary_col_size[S_COL_FROM], P_INT, NULL, NULL, NULL},
+ {"summary_col_size_date", "118",
+ &prefs_common.summary_col_size[S_COL_DATE], P_INT, NULL, NULL, NULL},
+ {"summary_col_size_size", "45",
+ &prefs_common.summary_col_size[S_COL_SIZE], P_INT, NULL, NULL, NULL},
+ {"summary_col_size_number", "40",
+ &prefs_common.summary_col_size[S_COL_NUMBER], P_INT, NULL, NULL, NULL},
+ {"summary_col_size_score", "40",
+ &prefs_common.summary_col_size[S_COL_SCORE], P_INT, NULL, NULL, NULL},
/* Widget size */
{"folderview_width", "179", &prefs_common.folderview_width, P_INT,
NULL, NULL, NULL},
{"folder_col_total", "32", &prefs_common.folder_col_total, P_INT,
NULL, NULL, NULL},
+
{"summaryview_width", "600", &prefs_common.summaryview_width, P_INT,
NULL, NULL, NULL},
{"summaryview_height", "173", &prefs_common.summaryview_height, P_INT,
NULL, NULL, NULL},
- {"summary_col_mark", "10", &prefs_common.summary_col_mark, P_INT,
- NULL, NULL, NULL},
- {"summary_col_unread", "13", &prefs_common.summary_col_unread, P_INT,
- NULL, NULL, NULL},
- {"summary_col_mime", "10", &prefs_common.summary_col_mime, P_INT,
- NULL, NULL, NULL},
- {"summary_col_number", "40", &prefs_common.summary_col_number, P_INT,
- NULL, NULL, NULL},
- {"summary_col_score", "40", &prefs_common.summary_col_score,
- P_INT, NULL, NULL, NULL},
- {"summary_col_size", "48", &prefs_common.summary_col_size, P_INT,
- NULL, NULL, NULL},
- {"summary_col_date", "120", &prefs_common.summary_col_date, P_INT,
- NULL, NULL, NULL},
- {"summary_col_from", "140", &prefs_common.summary_col_from, P_INT,
- NULL, NULL, NULL},
- {"summary_col_subject", "200", &prefs_common.summary_col_subject,
- P_INT, NULL, NULL, NULL},
+
{"mainview_x", "64", &prefs_common.mainview_x, P_INT,
NULL, NULL, NULL},
{"mainview_y", "64", &prefs_common.mainview_y, P_INT,
{"default_encrypt", "FALSE", &prefs_common.default_encrypt, P_BOOL,
&privacy.checkbtn_default_encrypt,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"ascii_armored", "FALSE", &prefs_common.ascii_armored, P_BOOL,
+ &privacy.checkbtn_ascii_armored,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"default_sign", "FALSE", &prefs_common.default_sign, P_BOOL,
&privacy.checkbtn_default_sign,
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},
+ {"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,
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
-#define VSPACING 12
-#define VSPACING_NARROW 3
-
-#define VBOX_BORDER 16
-#define DEFAULT_ENTRY_WIDTH 80
-#define PREFSBUFSIZE 1024
-
/* widget creating functions */
static void prefs_common_create (void);
static void prefs_receive_create (void);
static void prefs_enable_message_color_toggled (void);
static void prefs_recycle_colors_toggled (GtkWidget *widget);
-/* functions for setting items of SummaryView */
-static void prefs_summary_display_item_dialog_create
- (gboolean *cancelled);
-static void display_item_ok (GtkWidget *widget,
- gboolean *cancelled);
-static void display_item_cancel (GtkWidget *widget,
- gboolean *cancelled);
-static gint display_item_delete_event (GtkWidget *widget,
- GdkEventAny *event,
- gboolean *cancelled);
-static void display_item_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gboolean *cancelled);
-
static void prefs_font_select (GtkButton *button, GtkEntry *entry);
static void prefs_font_selection_key_pressed (GtkWidget *widget,
if (prefs_rc_is_readonly(COMMON_RC))
return;
- inc_autocheck_timer_remove();
+ inc_lock();
if (!dialog.window) {
prefs_common_create();
GtkWidget *hbox;
GtkWidget *label_incext;
GtkWidget *entry_incext;
- GtkWidget *button_incext;
+ /* GtkWidget *button_incext; */
GtkWidget *frame_spool;
GtkWidget *checkbtn_local;
entry_incext = gtk_entry_new ();
gtk_widget_show (entry_incext);
gtk_box_pack_start (GTK_BOX (hbox), entry_incext, TRUE, TRUE, 0);
-
+#if 0
button_incext = gtk_button_new_with_label ("... ");
-
gtk_widget_show (button_incext);
gtk_box_pack_start (GTK_BOX (hbox), button_incext, FALSE, FALSE, 0);
-
+#endif
PACK_FRAME(vbox1, frame_spool, _("Local spool"));
vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (entry_spool);
gtk_box_pack_start (GTK_BOX (hbox), entry_spool, TRUE, TRUE, 0);
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk,
_("Auto-check new mail"));
- label_autochk1 = gtk_label_new (_("each"));
+ label_autochk1 = gtk_label_new (_("every"));
gtk_widget_show (label_autochk1);
gtk_box_pack_start (GTK_BOX (hbox_autochk), label_autochk1, FALSE, FALSE, 0);
receive.checkbtn_incext = checkbtn_incext;
receive.entry_incext = entry_incext;
- receive.button_incext = button_incext;
+ /* receive.button_incext = button_incext; */
receive.checkbtn_local = checkbtn_local;
receive.checkbtn_filter_on_inc = checkbtn_filter_on_inc;
{
GtkWidget *vbox1;
GtkWidget *vbox2;
- GtkWidget *frame_sendext;
- GtkWidget *vbox_sendext;
- GtkWidget *checkbtn_sendext;
+ GtkWidget *frame_extsend;
+ GtkWidget *vbox_extsend;
+ GtkWidget *checkbtn_extsend;
GtkWidget *hbox1;
- GtkWidget *label_sendext;
- GtkWidget *entry_sendext;
- GtkWidget *button_sendext;
+ GtkWidget *label_extsend;
+ GtkWidget *entry_extsend;
+ /* GtkWidget *button_extsend; */
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_queuemsg;
GtkWidget *label_outcharset;
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME(vbox1, frame_sendext, _("External program"));
-
- gtk_widget_set_sensitive(frame_sendext, FALSE);
+ PACK_FRAME(vbox1, frame_extsend, _("External program"));
- vbox_sendext = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_sendext);
- gtk_container_add (GTK_CONTAINER (frame_sendext), vbox_sendext);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_sendext), 8);
+ vbox_extsend = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ gtk_widget_show (vbox_extsend);
+ gtk_container_add (GTK_CONTAINER (frame_extsend), vbox_extsend);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_extsend), 8);
- PACK_CHECK_BUTTON (vbox_sendext, checkbtn_sendext,
+ PACK_CHECK_BUTTON (vbox_extsend, checkbtn_extsend,
_("Use external program for sending"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox_sendext), hbox1, FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(checkbtn_sendext, hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_extsend), hbox1, FALSE, FALSE, 0);
+ SET_TOGGLE_SENSITIVITY(checkbtn_extsend, hbox1);
- label_sendext = gtk_label_new (_("Program path"));
- gtk_widget_show (label_sendext);
- gtk_box_pack_start (GTK_BOX (hbox1), label_sendext, FALSE, FALSE, 0);
+ label_extsend = gtk_label_new (_("Program path"));
+ gtk_widget_show (label_extsend);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_extsend, FALSE, FALSE, 0);
- entry_sendext = gtk_entry_new ();
- gtk_widget_show (entry_sendext);
- gtk_box_pack_start (GTK_BOX (hbox1), entry_sendext, TRUE, TRUE, 0);
+ entry_extsend = gtk_entry_new ();
+ gtk_widget_show (entry_extsend);
+ gtk_box_pack_start (GTK_BOX (hbox1), entry_extsend, TRUE, TRUE, 0);
- button_sendext = gtk_button_new_with_label ("... ");
- gtk_widget_show (button_sendext);
- gtk_box_pack_start (GTK_BOX (hbox1), button_sendext, FALSE, FALSE, 0);
+#if 0
+ button_extsend = gtk_button_new_with_label ("... ");
+ gtk_widget_show (button_extsend);
+ gtk_box_pack_start (GTK_BOX (hbox1), button_extsend, FALSE, FALSE, 0);
+#endif
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
- send.checkbtn_sendext = checkbtn_sendext;
- send.entry_sendext = entry_sendext;
- send.button_sendext = button_sendext;
+ send.checkbtn_extsend = checkbtn_extsend;
+ send.entry_extsend = entry_extsend;
+ /* send.button_extsend = button_extsend; */
send.checkbtn_savemsg = checkbtn_savemsg;
send.checkbtn_queuemsg = checkbtn_queuemsg;
send.optmenu_charset = optmenu;
}
+#if USE_PSPELL
static void prefs_dictionary_set_data_from_optmenu(PrefParam *param)
{
gchar *str;
- gchar *dict_path;
+ gchar *dict_name;
g_return_if_fail(param);
g_return_if_fail(param->data);
g_return_if_fail(param->widget);
g_return_if_fail(*(param->widget));
- dict_path = gtkspell_get_dictionary_menu_active_item
+ dict_name = gtkpspell_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_path;
+ *((gchar **) param->data) = dict_name;
}
static void prefs_dictionary_set_optmenu(PrefParam *pparam)
GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
GtkWidget *menu;
GtkWidget *menuitem;
- gchar *dict_path;
+ gchar *dict_name;
gint n = 0;
g_return_if_fail(optmenu != NULL);
for (cur = GTK_MENU_SHELL(menu)->children;
cur != NULL; cur = cur->next) {
menuitem = GTK_WIDGET(cur->data);
- dict_path = gtk_object_get_data(GTK_OBJECT(menuitem), "full_path");
- if (!strcmp(dict_path, *((gchar **)pparam->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;
}
prefs_dictionary_set_data_from_optmenu(pparam);
}
-static void prefs_compose_checkbtn_enable_ispell_toggle_cb
+static void prefs_compose_checkbtn_enable_pspell_toggle_cb
(GtkWidget *widget,
gpointer data)
{
gboolean toggled;
toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- gtk_widget_set_sensitive(compose.entry_ispell_path, toggled);
- gtk_widget_set_sensitive(compose.optmenu_dictionary_path, toggled);
- gtk_widget_set_sensitive(compose.btn_ispell_path, toggled);
+ gtk_widget_set_sensitive(compose.entry_pspell_path, toggled);
+ gtk_widget_set_sensitive(compose.optmenu_dictionary, toggled);
+ gtk_widget_set_sensitive(compose.btn_pspell_path, toggled);
}
-static void prefs_compose_btn_ispell_path_clicked_cb(GtkWidget *widget,
+static void prefs_compose_btn_pspell_path_clicked_cb(GtkWidget *widget,
gpointer data)
{
- gchar *file_path;
+ gchar *file_path, *tmp;
GtkWidget *new_menu;
- file_path = filesel_select_file(_("Select spelling checker location"),
- prefs_common.ispell_path);
+ file_path = filesel_select_file(_("Select dictionaries location"),
+ prefs_common.pspell_path);
if (file_path == NULL) {
/* don't change */
}
else {
- if (prefs_common.ispell_path)
- g_free(prefs_common.ispell_path);
- prefs_common.ispell_path = file_path;
-
- new_menu = gtkspell_dictionary_option_menu_new(file_path);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(compose.optmenu_dictionary_path),
+ 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,G_DIR_SEPARATOR_S);
+
+ new_menu = gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path);
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(compose.optmenu_dictionary),
new_menu);
- gtk_entry_set_text(GTK_ENTRY(compose.entry_ispell_path), file_path);
+ gtk_entry_set_text(GTK_ENTRY(compose.entry_pspell_path), prefs_common.pspell_path);
/* select first one */
- gtk_option_menu_set_history(GTK_OPTION_MENU(compose.optmenu_dictionary_path), 0);
+ gtk_option_menu_set_history(GTK_OPTION_MENU(compose.optmenu_dictionary), 0);
- prefs_common.dictionary_path = gtkspell_get_dictionary_menu_active_item(
- gtk_option_menu_get_menu(GTK_OPTION_MENU(compose.optmenu_dictionary_path)));
- }
+ prefs_common.dictionary = gtkpspell_get_dictionary_menu_active_item(
+ gtk_option_menu_get_menu(GTK_OPTION_MENU(compose.optmenu_dictionary)));
+ g_free(tmp);
+
+ }
}
+#endif
static void prefs_compose_create(void)
{
GtkWidget *vbox1;
+ GtkWidget *vbox2;
+ GtkWidget *vbox3;
/*
GtkWidget *frame_quote;
GtkWidget *checkbtn_forward_account_autosel;
GtkWidget *checkbtn_reedit_account_autosel;
+ GtkWidget *checkbtn_autoextedit;
+
GtkWidget *vbox_linewrap;
GtkWidget *hbox3;
GtkWidget *checkbtn_forward_as_attachment;
GtkWidget *checkbtn_smart_wrapping;
+ GtkWidget *checkbtn_block_cursor;
+#if USE_PSPELL
GtkWidget *frame_spell;
GtkWidget *hbox_spell;
GtkWidget *vbox_spell;
- GtkWidget *hbox_ispell_path;
- GtkWidget *checkbtn_enable_ispell;
- GtkWidget *label_ispell_path;
- GtkWidget *entry_ispell_path;
- GtkWidget *btn_ispell_path;
- GtkWidget *hbox_dictionary_path;
- GtkWidget *label_dictionary_path;
- GtkWidget *optmenu_dictionary_path;
-
+ GtkWidget *hbox_pspell_path;
+ GtkWidget *checkbtn_enable_pspell;
+ GtkWidget *label_pspell_path;
+ GtkWidget *entry_pspell_path;
+ GtkWidget *btn_pspell_path;
+ GtkWidget *hbox_dictionary;
+ GtkWidget *label_dictionary;
+ GtkWidget *optmenu_dictionary;
+#endif
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
- PACK_CHECK_BUTTON (vbox_quote, checkbtn_quote,
- _("Quote message when replying"));
-
- hbox1 = gtk_hbox_new (FALSE, 8);
+ hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+ hbox2 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox2);
+ gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
label_quotemark = gtk_label_new (_("Quotation mark"));
gtk_widget_show (label_quotemark);
- gtk_box_pack_start (GTK_BOX (hbox1), label_quotemark, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), label_quotemark, FALSE, FALSE, 0);
entry_quotemark = gtk_entry_new ();
gtk_widget_show (entry_quotemark);
- gtk_box_pack_start (GTK_BOX (hbox1), entry_quotemark, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), entry_quotemark, FALSE, FALSE, 0);
gtk_widget_set_usize (entry_quotemark, 64, -1);
+ PACK_CHECK_BUTTON (hbox1, checkbtn_quote,
+ _("Quote message when replying"));
+
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox2, TRUE, TRUE, 0);
PACK_CHECK_BUTTON (hbox_autosel, checkbtn_reedit_account_autosel,
_("when re-editing"));
- /* line-wrapping */
+ 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, checkbtn_autoextedit,
+ _("Automatically launch the external editor"));
+
+ PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2);
+
+ /* line-wrapping */
vbox_linewrap = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (vbox_linewrap);
gtk_box_pack_start (GTK_BOX (vbox1), vbox_linewrap, FALSE, FALSE, 0);
gtk_widget_show (label_linewrap);
gtk_box_pack_start (GTK_BOX (hbox3), label_linewrap, FALSE, FALSE, 0);
+ PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2);
+
hbox4 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox4);
gtk_box_pack_start (GTK_BOX (vbox_linewrap), hbox4, FALSE, FALSE, 0);
PACK_CHECK_BUTTON (vbox1, checkbtn_smart_wrapping,
_("Smart wrapping (EXPERIMENTAL)"));
+
+ PACK_CHECK_BUTTON (vbox1, checkbtn_block_cursor,
+ _("Block cursor"));
+#if USE_PSPELL
/* spell checker defaults */
PACK_FRAME(vbox1, frame_spell, _("Global spelling checker settings"));
vbox_spell = gtk_vbox_new(FALSE, VSPACING_NARROW);
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_ispell,
- _("Enable spell checker"));
+ PACK_CHECK_BUTTON(vbox_spell, checkbtn_enable_pspell,
+ _("Enable spell checker (EXPERIMENTAL)"));
- gtk_signal_connect(GTK_OBJECT(checkbtn_enable_ispell), "toggled",
- GTK_SIGNAL_FUNC(prefs_compose_checkbtn_enable_ispell_toggle_cb),
+ gtk_signal_connect(GTK_OBJECT(checkbtn_enable_pspell), "toggled",
+ GTK_SIGNAL_FUNC(prefs_compose_checkbtn_enable_pspell_toggle_cb),
NULL);
- hbox_ispell_path = gtk_hbox_new (FALSE, 8);
- gtk_widget_show(hbox_ispell_path);
- gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_ispell_path, TRUE, TRUE, 0);
+ hbox_pspell_path = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show(hbox_pspell_path);
+ gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_pspell_path, TRUE, TRUE, 0);
- label_ispell_path = gtk_label_new (_("Ispelll path"));
- gtk_widget_show(label_ispell_path);
- gtk_box_pack_start(GTK_BOX(hbox_ispell_path), label_ispell_path, FALSE, FALSE, 0);
+ label_pspell_path = gtk_label_new (_("Dictionaries path"));
+ gtk_widget_show(label_pspell_path);
+ gtk_box_pack_start(GTK_BOX(hbox_pspell_path), label_pspell_path, FALSE, FALSE, 0);
- entry_ispell_path = gtk_entry_new();
- gtk_widget_show(entry_ispell_path);
- gtk_box_pack_start(GTK_BOX(hbox_ispell_path), entry_ispell_path, FALSE, FALSE, 0);
- gtk_widget_set_usize(entry_ispell_path, 150, -1);
- gtk_widget_set_sensitive(entry_ispell_path, prefs_common.enable_ispell);
-
- btn_ispell_path = gtk_button_new_with_label(_("..."));
- gtk_widget_show(btn_ispell_path);
- gtk_box_pack_start(GTK_BOX(hbox_ispell_path), btn_ispell_path, FALSE, FALSE, 0);
- gtk_widget_set_sensitive(btn_ispell_path, prefs_common.enable_ispell);
-
- gtk_signal_connect(GTK_OBJECT(btn_ispell_path), "clicked",
- GTK_SIGNAL_FUNC(prefs_compose_btn_ispell_path_clicked_cb),
+ entry_pspell_path = gtk_entry_new();
+ gtk_widget_show(entry_pspell_path);
+ gtk_box_pack_start(GTK_BOX(hbox_pspell_path), entry_pspell_path, FALSE, FALSE, 0);
+ gtk_widget_set_usize(entry_pspell_path, 150, -1);
+ gtk_widget_set_sensitive(entry_pspell_path, prefs_common.enable_pspell);
+
+ 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);
+
+ gtk_signal_connect(GTK_OBJECT(btn_pspell_path), "clicked",
+ GTK_SIGNAL_FUNC(prefs_compose_btn_pspell_path_clicked_cb),
NULL);
- hbox_dictionary_path = gtk_hbox_new(FALSE, 8);
- gtk_widget_show(hbox_dictionary_path);
- gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_dictionary_path, TRUE, TRUE, 0);
+ hbox_dictionary = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(hbox_dictionary);
+ gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_dictionary, TRUE, TRUE, 0);
- label_dictionary_path = gtk_label_new(_("Dictionaries"));
- gtk_widget_show(label_dictionary_path);
- gtk_box_pack_start(GTK_BOX(hbox_dictionary_path), label_dictionary_path, FALSE, FALSE, 0);
+ label_dictionary = gtk_label_new(_("Dictionary"));
+ gtk_widget_show(label_dictionary);
+ gtk_box_pack_start(GTK_BOX(hbox_dictionary), label_dictionary, FALSE, FALSE, 0);
- optmenu_dictionary_path = gtk_option_menu_new();
- gtk_widget_show(optmenu_dictionary_path);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary_path),
- gtkspell_dictionary_option_menu_new(prefs_common.ispell_path));
- gtk_box_pack_start(GTK_BOX(hbox_dictionary_path), optmenu_dictionary_path, FALSE, FALSE, 0);
- gtk_widget_set_sensitive(optmenu_dictionary_path, prefs_common.enable_ispell);
+ 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));
+ gtk_box_pack_start(GTK_BOX(hbox_dictionary), optmenu_dictionary, FALSE, FALSE, 0);
+ gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_pspell);
+#endif
/*
compose.checkbtn_quote = checkbtn_quote;
compose.checkbtn_autosig = checkbtn_autosig;
compose.entry_sigsep = entry_sigsep;
+ compose.checkbtn_autoextedit = checkbtn_autoextedit;
compose.checkbtn_reply_account_autosel = checkbtn_reply_account_autosel;
compose.checkbtn_forward_account_autosel = checkbtn_forward_account_autosel;
compose.checkbtn_reedit_account_autosel = checkbtn_reedit_account_autosel;
checkbtn_forward_as_attachment;
compose.checkbtn_smart_wrapping =
checkbtn_smart_wrapping;
-
- compose.checkbtn_enable_ispell = checkbtn_enable_ispell;
- compose.entry_ispell_path = entry_ispell_path;
- compose.btn_ispell_path = btn_ispell_path;
- compose.optmenu_dictionary_path = optmenu_dictionary_path;
+ compose.checkbtn_block_cursor =
+ checkbtn_block_cursor;
+
+#if USE_PSPELL
+ compose.checkbtn_enable_pspell = checkbtn_enable_pspell;
+ compose.entry_pspell_path = entry_pspell_path;
+ compose.btn_pspell_path = btn_pspell_path;
+ compose.optmenu_dictionary = optmenu_dictionary;
+#endif
}
static void prefs_display_create(void)
GtkWidget *chkbtn_useaddrbook;
GtkWidget *chkbtn_expand_thread;
GtkWidget *chkbtn_bold_unread;
+ GtkWidget *vbox3;
GtkWidget *hbox1;
GtkWidget *label_datefmt;
GtkWidget *button_datefmt;
GtkWidget *entry_datefmt;
- GtkWidget *vbox3;
GtkWidget *button_dispitem;
GtkWidget *tmplabel, *tmpbutton, *tmpentry;
GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
display.entry_boldfont = tmpentry;
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, TRUE, 0);
PACK_FRAME(vbox1, frame_summary, _("Summary View"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_container_add (GTK_CONTAINER (frame_summary), vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
(vbox2, chkbtn_bold_unread,
_("Display unread messages with bold font"));
+ PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (button_datefmt), "clicked",
GTK_SIGNAL_FUNC (date_format_create), NULL);
- /* spacer */
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox3);
- gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, TRUE, 0);
+ PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
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_display_item_set),
+ GTK_SIGNAL_FUNC (prefs_summary_column_open),
NULL);
display.entry_textfont = entry_textfont;
{
GtkWidget *vbox1;
GtkWidget *vbox2;
+ GtkWidget *vbox3;
GtkWidget *hbox1;
GtkWidget *chkbtn_enablecol;
GtkWidget *button_edit_col;
SET_TOGGLE_SENSITIVITY(chkbtn_enablecol, button_edit_col);
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
+ PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
PACK_FRAME(vbox1, frame_scr, _("Scroll"));
- vbox_scr = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox_scr = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox_scr);
gtk_container_add (GTK_CONTAINER (frame_scr), vbox_scr);
gtk_container_set_border_width (GTK_CONTAINER (vbox_scr), 8);
GtkWidget *vbox2;
GtkWidget *hbox1;
GtkWidget *checkbtn_default_encrypt;
+ GtkWidget *checkbtn_ascii_armored;
GtkWidget *checkbtn_default_sign;
GtkWidget *checkbtn_auto_check_signatures;
GtkWidget *checkbtn_gpg_signature_popup;
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ 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, checkbtn_default_encrypt,
_("Encrypt message by default"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
+ _("Plain ASCII armored"));
+ gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
+ prefs_common_ascii_armored_warning, (gpointer)0);
+
PACK_CHECK_BUTTON (vbox2, checkbtn_default_sign,
_("Sign message by default"));
gtk_widget_set_sensitive(optmenu, FALSE);
privacy.checkbtn_default_encrypt = checkbtn_default_encrypt;
+ privacy.checkbtn_ascii_armored = checkbtn_ascii_armored;
privacy.checkbtn_default_sign = checkbtn_default_sign;
privacy.checkbtn_auto_check_signatures
= checkbtn_auto_check_signatures;
prefs_common_charset_set_data_from_optmenu(pparam);
#endif
}
+
+static void prefs_common_ascii_armored_warning(GtkWidget* widget,
+ gpointer unused)
+{
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))
+ && gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook))) {
+ alertpanel_message(_("Warning - Privacy/Plain ASCII armored"),
+ _("Its not recommend to use the old style plain ASCII\n"
+ "armored mode for encypted messages. It doesn't comply\n"
+ "with the RFC 3156 - MIME security with OpenPGP."));
+ }
+}
#endif /* USE_GPGME */
static void prefs_interface_create(void)
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
+ GtkWidget *hbox2;
+ GtkWidget *optmenu_nextunreadmsgdialog;
+ GtkWidget *optmenu_nextunreadmsgdialog_menu;
+ GtkWidget *nextunreadmsgdialog_menuitem;
+
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, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
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);
+
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
PACK_FRAME (vbox1, frame_addr, _("Address book"));
- vbox_addr = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox_addr = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox_addr);
gtk_container_add (GTK_CONTAINER (frame_addr), vbox_addr);
gtk_container_set_border_width (GTK_CONTAINER (vbox_addr), 8);
(vbox_addr, 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);
+
+ label = gtk_label_new (_("Show no-unread-message dialog"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+
+ 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);
/* On Exit */
PACK_FRAME (vbox1, frame_exit, _("On exit"));
- vbox_exit = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox_exit = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox_exit);
gtk_container_add (GTK_CONTAINER (frame_exit), vbox_exit);
gtk_container_set_border_width (GTK_CONTAINER (vbox_exit), 8);
_("Warn if there are queued messages"));
/* interface.checkbtn_emacs = checkbtn_emacs; */
- interface.checkbtn_openunread = checkbtn_openunread;
- interface.checkbtn_openinbox = checkbtn_openinbox;
- interface.checkbtn_immedexec = checkbtn_immedexec;
- interface.optmenu_recvdialog = optmenu_recvdialog;
- interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
- interface.checkbtn_confonexit = checkbtn_confonexit;
- interface.checkbtn_cleanonexit = checkbtn_cleanonexit;
- interface.checkbtn_askonclean = checkbtn_askonclean;
- interface.checkbtn_warnqueued = checkbtn_warnqueued;
+ interface.checkbtn_openunread = checkbtn_openunread;
+ interface.checkbtn_openinbox = checkbtn_openinbox;
+ interface.checkbtn_immedexec = checkbtn_immedexec;
+ interface.optmenu_recvdialog = optmenu_recvdialog;
+ interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
+ interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
+ interface.checkbtn_confonexit = checkbtn_confonexit;
+ interface.checkbtn_cleanonexit = checkbtn_cleanonexit;
+ interface.checkbtn_askonclean = checkbtn_askonclean;
+ interface.checkbtn_warnqueued = checkbtn_warnqueued;
}
static void prefs_other_create(void)
gtk_box_pack_start (GTK_BOX (hbox1), exteditor_combo, TRUE, TRUE, 0);
gtkut_combo_set_items (GTK_COMBO (exteditor_combo),
"gedit %s",
+ "kedit %s",
"mgedit --no-fork %s",
"emacs %s",
"xemacs %s",
gtk_widget_show_all(vbox);
}
-/* functions for setting items of SummaryView */
-
-static struct _SummaryDisplayItem
-{
- GtkWidget *window;
-
- GtkWidget *chkbtn[N_SUMMARY_COLS];
-
- GtkWidget *ok_btn;
- GtkWidget *cancel_btn;
-} summarydispitem;
-
-#define SET_ACTIVE(column, var) \
- gtk_toggle_button_set_active \
- (GTK_TOGGLE_BUTTON(summarydispitem.chkbtn[column]), \
- prefs_common.var)
-#define GET_ACTIVE(column, var) \
- prefs_common.var = gtk_toggle_button_get_active \
- (GTK_TOGGLE_BUTTON(summarydispitem.chkbtn[column]))
-
-void prefs_summary_display_item_set(void)
-{
- static gboolean cancelled;
-
- if (!summarydispitem.window)
- prefs_summary_display_item_dialog_create(&cancelled);
- gtk_widget_grab_focus(summarydispitem.ok_btn);
- gtk_widget_show(summarydispitem.window);
- manage_window_set_transient(GTK_WINDOW(summarydispitem.window));
-
- SET_ACTIVE(S_COL_MARK, show_mark);
- SET_ACTIVE(S_COL_UNREAD, show_unread);
- SET_ACTIVE(S_COL_MIME, show_mime);
- SET_ACTIVE(S_COL_NUMBER, show_number);
- SET_ACTIVE(S_COL_SCORE, show_score);
- SET_ACTIVE(S_COL_SIZE, show_size);
- SET_ACTIVE(S_COL_DATE, show_date);
- SET_ACTIVE(S_COL_FROM, show_from);
- SET_ACTIVE(S_COL_SUBJECT, show_subject);
-
- gtk_main();
- gtk_widget_hide(summarydispitem.window);
-
- if (cancelled != TRUE) {
- GET_ACTIVE(S_COL_MARK, show_mark);
- GET_ACTIVE(S_COL_UNREAD, show_unread);
- GET_ACTIVE(S_COL_MIME, show_mime);
- GET_ACTIVE(S_COL_NUMBER, show_number);
- GET_ACTIVE(S_COL_SCORE, show_score);
- GET_ACTIVE(S_COL_SIZE, show_size);
- GET_ACTIVE(S_COL_DATE, show_date);
- GET_ACTIVE(S_COL_FROM, show_from);
- GET_ACTIVE(S_COL_SUBJECT, show_subject);
-
- main_window_reflect_prefs_all();
- }
-}
-
-#define SET_CHECK_BUTTON(column, label) \
-{ \
- summarydispitem.chkbtn[column] = \
- gtk_check_button_new_with_label(label); \
- gtk_box_pack_start(GTK_BOX(chkbtn_vbox), \
- summarydispitem.chkbtn[column], \
- FALSE, FALSE, 0); \
-}
-
-static void prefs_summary_display_item_dialog_create(gboolean *cancelled)
-{
- GtkWidget *window;
- GtkWidget *vbox;
- GtkWidget *chkbtn_vbox;
- GtkWidget *hbbox;
- GtkWidget *ok_btn;
- GtkWidget *cancel_btn;
-
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_container_set_border_width(GTK_CONTAINER(window), 8);
- gtk_window_set_title(GTK_WINDOW(window), _("Set display item"));
- gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(display_item_delete_event),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(display_item_key_pressed),
- cancelled);
-
- vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add(GTK_CONTAINER(window), vbox);
-
- chkbtn_vbox = gtk_vbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), chkbtn_vbox, FALSE, FALSE, 0);
-
- SET_CHECK_BUTTON(S_COL_MARK, _("Mark"));
- SET_CHECK_BUTTON(S_COL_UNREAD, _("Unread"));
- SET_CHECK_BUTTON(S_COL_MIME, _("MIME"));
- SET_CHECK_BUTTON(S_COL_NUMBER, _("Number"));
- SET_CHECK_BUTTON(S_COL_SCORE, _("Score"));
- SET_CHECK_BUTTON(S_COL_SIZE, _("Size"));
- SET_CHECK_BUTTON(S_COL_DATE, _("Date"));
- SET_CHECK_BUTTON(S_COL_FROM, _("From"));
- SET_CHECK_BUTTON(S_COL_SUBJECT, _("Subject"));
-
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
- gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
- gtk_widget_grab_default(ok_btn);
-
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(display_item_ok), cancelled);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(display_item_cancel), cancelled);
-
- gtk_widget_show_all(vbox);
-
- summarydispitem.window = window;
- summarydispitem.ok_btn = ok_btn;
- summarydispitem.cancel_btn = cancel_btn;
-}
-
-static void display_item_ok(GtkWidget *widget, gboolean *cancelled)
-{
- *cancelled = FALSE;
- gtk_main_quit();
-}
-
-static void display_item_cancel(GtkWidget *widget, gboolean *cancelled)
-{
- *cancelled = TRUE;
- gtk_main_quit();
-}
-
-static gint display_item_delete_event(GtkWidget *widget, GdkEventAny *event,
- gboolean *cancelled)
-{
- *cancelled = TRUE;
- gtk_main_quit();
-
- return TRUE;
-}
-
-static void display_item_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gboolean *cancelled)
-{
- if (event && event->keyval == GDK_Escape) {
- *cancelled = TRUE;
- gtk_main_quit();
- }
-}
-
static void prefs_font_select(GtkButton *button, GtkEntry *entry)
{
gchar *font_name;
if (quote_desc_win && GTK_WIDGET_VISIBLE(quote_desc_win))
gtk_widget_hide(quote_desc_win);
- inc_autocheck_timer_set();
+ inc_unlock();
}
static void prefs_common_apply(void)
prefs_set_data_from_dialog(param);
main_window_reflect_prefs_all();
prefs_common_save_config();
+
+ inc_autocheck_timer_remove();
+ inc_autocheck_timer_set();
+}
+
+static void prefs_nextunreadmsgdialog_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));
+ *((NextUnreadMsgDialogShow *)pparam->data) = GPOINTER_TO_INT
+ (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam)
+{
+ NextUnreadMsgDialogShow dialog_show;
+ GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ dialog_show = *((NextUnreadMsgDialogShow *)pparam->data);
+
+ switch (dialog_show) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ gtk_option_menu_set_history(optmenu, 0);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_YES:
+ gtk_option_menu_set_history(optmenu, 1);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_NO:
+ gtk_option_menu_set_history(optmenu, 2);
+ break;
+ default:
+ }
+
+ menu = gtk_option_menu_get_menu(optmenu);
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
static void prefs_common_cancel(void)
{
gtk_widget_hide(dialog.window);
- inc_autocheck_timer_set();
+ inc_unlock();
}
projects / claws.git / blobdiff