GtkWidget *checkbtn_queuemsg;
GtkWidget *optmenu_charset;
+
+ GtkWidget *checkbtn_returnreceipt;
} send;
static struct Compose {
GtkWidget *checkbtn_autosig;
GtkWidget *entry_sigsep;
+ GtkWidget *entry_fw_quotemark;
+ GtkWidget *text_fw_quotefmt;
+
GtkWidget *spinbtn_linewrap;
GtkObject *spinbtn_linewrap_adj;
GtkWidget *checkbtn_wrapquote;
GtkWidget *entry_textfont;
GtkWidget *button_textfont;
+ GtkWidget *entry_smallfont;
+ GtkWidget *entry_normalfont;
+ GtkWidget *entry_boldfont;
+
GtkWidget *chkbtn_folder_unread;
GtkWidget *chkbtn_transhdr;
GtkWidget *chkbtn_swapfrom;
GtkWidget *chkbtn_hscrollbar;
GtkWidget *chkbtn_useaddrbook;
+
+ GtkWidget *entry_datefmt;
} display;
static struct Message {
#if USE_GPGME
static struct Privacy {
- GtkWidget *checkbtn_gpgme_warning;
GtkWidget *checkbtn_default_encrypt;
GtkWidget *checkbtn_default_sign;
GtkWidget *checkbtn_auto_check_signatures;
+ GtkWidget *checkbtn_gpg_signature_popup;
GtkWidget *checkbtn_passphrase_grab;
- GtkWidget *checkbtn_signature_popup;
+ GtkWidget *checkbtn_gpg_warning;
GtkWidget *optmenu_default_signkey;
} privacy;
#endif
GtkWidget *checkbtn_cleanonexit;
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
- GtkWidget *checkbtn_returnreceipt;
GtkWidget *checkbtn_addaddrbyclick;
- GtkWidget *checkbtn_retrievedialog;
} interface;
static struct Other {
static GtkWidget *font_sel_win;
static GtkWidget *quote_color_win;
static GtkWidget *color_dialog;
-static GtkWidget *entry_datefmt;
-static GtkWidget *datefmt_sample;
static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam);
static void prefs_common_charset_set_optmenu (PrefParam *pparam);
prefs_set_data_from_toggle, prefs_set_toggle},
{"quote_mark", "> ", &prefs_common.quotemark, P_STRING,
&compose.entry_quotemark, prefs_set_data_from_entry, prefs_set_entry},
- {"quote_format", "On %d\\n%f wrote:\\n\\n",
+ {"quote_format", "On %d\\n%f wrote:\\n\\n%Q",
&prefs_common.quotefmt, P_STRING, &compose.text_quotefmt,
prefs_set_data_from_text, prefs_set_text},
+ {"fw_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
+ &compose.entry_fw_quotemark, prefs_set_data_from_entry, prefs_set_entry},
+ {"fw_quote_format", "---------- Forwarded message ----------\\n?d(Date: %d\\n)?f(From: %f\\n)?t(To: %t\\n)?c(Cc: %c\\n)?n(Newsgroups: %n\\n)?s(Subject: %s\\n)\\n%Q",
+ &prefs_common.fw_quotefmt, P_STRING, &compose.text_fw_quotefmt,
+ prefs_set_data_from_text, prefs_set_text},
{"auto_signature", "TRUE", &prefs_common.auto_sig, P_BOOL,
&compose.checkbtn_autosig,
&prefs_common.textfont, P_STRING,
&display.entry_textfont,
prefs_set_data_from_entry, prefs_set_entry},
+ {"small_font", "-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
+ &prefs_common.smallfont, P_STRING,
+ &display.entry_smallfont,
+ prefs_set_data_from_entry, prefs_set_entry},
+ {"bold_font", "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
+ &prefs_common.boldfont, P_STRING,
+ &display.entry_boldfont,
+ prefs_set_data_from_entry, prefs_set_entry},
+ {"normal_font", "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
+ &prefs_common.normalfont, P_STRING,
+ &display.entry_normalfont,
+ prefs_set_data_from_entry, prefs_set_entry},
{"display_folder_unread_num", "TRUE",
&prefs_common.display_folder_unread, P_BOOL,
&display.chkbtn_useaddrbook,
prefs_set_data_from_toggle, prefs_set_toggle},
{"date_format", "%y/%m/%d(%a) %H:%M", &prefs_common.date_format,
- P_STRING, &entry_datefmt,
+ P_STRING, &display.entry_datefmt,
prefs_set_data_from_entry, prefs_set_entry},
+ /*
{"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
NULL, NULL, NULL},
+ */
{"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
NULL, NULL, NULL},
{"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
#if USE_GPGME
/* Privacy */
- {"gpgme_warning", "TRUE", &prefs_common.gpgme_warning, P_BOOL,
- &privacy.checkbtn_gpgme_warning,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"default_encrypt", "FALSE", &prefs_common.default_encrypt, P_BOOL,
&privacy.checkbtn_default_encrypt,
prefs_set_data_from_toggle, prefs_set_toggle},
&prefs_common.auto_check_signatures, P_BOOL,
&privacy.checkbtn_auto_check_signatures,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"signature_popup", "FALSE",
- &prefs_common.signature_popup, P_BOOL,
- &privacy.checkbtn_signature_popup,
+ {"gpg_signature_popup", "FALSE",
+ &prefs_common.gpg_signature_popup, P_BOOL,
+ &privacy.checkbtn_gpg_signature_popup,
prefs_set_data_from_toggle, prefs_set_toggle},
#ifndef __MINGW32__
{"passphrase_grab", "FALSE", &prefs_common.passphrase_grab, P_BOOL,
&privacy.checkbtn_passphrase_grab,
prefs_set_data_from_toggle, prefs_set_toggle},
#endif /* __MINGW32__ */
+ {"gpg_warning", "TRUE", &prefs_common.gpg_warning, P_BOOL,
+ &privacy.checkbtn_gpg_warning,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"default_signkey", CS_AUTO, &prefs_common.default_signkey, P_STRING,
&privacy.optmenu_default_signkey,
prefs_common_default_signkey_set_data_from_optmenu,
{"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
P_BOOL, &interface.checkbtn_openunread,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"show_retrieve_dialog", "FALSE", &prefs_common.show_retrieve_dialog,
- P_BOOL, &interface.checkbtn_retrievedialog,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"open_inbox_on_inc", "TRUE", &prefs_common.open_inbox_on_inc,
P_BOOL, &interface.checkbtn_openinbox,
prefs_set_data_from_toggle, prefs_set_toggle},
&interface.checkbtn_confonexit,
prefs_set_data_from_toggle, prefs_set_toggle},
{"send_return_receipt", "TRUE", &prefs_common.return_receipt, P_BOOL,
- &interface.checkbtn_returnreceipt,
+ &send.checkbtn_returnreceipt,
prefs_set_data_from_toggle, prefs_set_toggle},
{"clean_trash_on_exit", "FALSE", &prefs_common.clean_on_exit, P_BOOL,
&interface.checkbtn_cleanonexit,
&prefs_common.ext_editor_cmd, P_STRING,
&other.exteditor_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"kill_score", "-9999", &prefs_common.kill_score, P_INT,
+ NULL, NULL, NULL},
+ {"important_score", "1", &prefs_common.important_score, P_INT,
+ NULL, NULL, NULL},
+
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
GdkEventKey *event,
gboolean *cancelled);
-static void prefs_font_select (GtkButton *button);
+static void prefs_font_select (GtkButton *button, GtkEntry *entry);
static void prefs_font_selection_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static void prefs_font_selection_ok (GtkButton *button);
+static void prefs_font_selection_ok (GtkButton *button, GtkEntry *entry);
static gint prefs_common_deleted (GtkWidget *widget,
GdkEventAny *event,
static void prefs_common_apply (void);
static void prefs_common_cancel (void);
+static void compose_prefs_fmt_open(void);
+static void compose_prefs_fmt_create(void);
+
void prefs_common_read_config(void)
{
prefs_read_config(param, "Common", COMMON_RC);
void prefs_common_open(void)
{
+ if (prefs_rc_is_readonly(COMMON_RC))
+ return;
+
inc_autocheck_timer_remove();
if (!dialog.window) {
prefs_other_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("Other"), page++);
+ compose_prefs_fmt_create();
+
gtk_widget_show_all(dialog.window);
}
GtkWidget *optmenu;
GtkWidget *optmenu_menu;
GtkWidget *menuitem;
+ GtkWidget *checkbtn_returnreceipt;
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 message to outbox"));
+ _("Save sent messages to outbox"));
PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg,
- _("Queue message that failed to send"));
+ _("Queue messages that fail to send"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_returnreceipt,
+ _("Send return receipt on request"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
send.checkbtn_savemsg = checkbtn_savemsg;
send.checkbtn_queuemsg = checkbtn_queuemsg;
+ send.checkbtn_returnreceipt = checkbtn_returnreceipt;
send.optmenu_charset = optmenu;
}
static void prefs_compose_create(void)
{
GtkWidget *vbox1;
+
+ /*
GtkWidget *frame_quote;
GtkWidget *vbox_quote;
GtkWidget *checkbtn_quote;
GtkWidget *btn_quotedesc;
GtkWidget *scrolledwin_quotefmt;
GtkWidget *text_quotefmt;
+*/
+
+ GtkWidget *hbox1;
+ GtkWidget *hbox2;
+ GtkWidget *btn_quotefmt;
GtkWidget *frame_sig;
GtkWidget *vbox_sig;
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+ /*
PACK_FRAME(vbox1, frame_quote, _("Quotation"));
vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX (hbox2), label_quotefmt, FALSE, FALSE, 0);
btn_quotedesc =
- gtk_button_new_with_label (_(" Description of symbols "));
+ gtk_button_new_with_label (_(" Quote format "));
gtk_widget_show (btn_quotedesc);
gtk_box_pack_end (GTK_BOX (hbox2), btn_quotedesc, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(btn_quotedesc), "clicked",
- GTK_SIGNAL_FUNC(prefs_quote_description), NULL);
+ GTK_SIGNAL_FUNC(compose_prefs_fmt_open), &cancelled);
scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwin_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);
+ */
+
+ hbox1 = gtk_hbox_new (FALSE, 32);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ btn_quotefmt = gtk_button_new_with_label (_(" Quote format "));
+ gtk_widget_show (btn_quotefmt);
+ gtk_box_pack_start (GTK_BOX (hbox1), btn_quotefmt, FALSE, FALSE, 0);
+ gtk_signal_connect(GTK_OBJECT(btn_quotefmt), "clicked",
+ GTK_SIGNAL_FUNC(compose_prefs_fmt_open), NULL);
PACK_FRAME(vbox1, frame_sig, _("Signature"));
PACK_CHECK_BUTTON
(hbox4, checkbtn_wrapatsend, _("Wrap before sending"));
+ /*
compose.checkbtn_quote = checkbtn_quote;
compose.entry_quotemark = entry_quotemark;
compose.text_quotefmt = text_quotefmt;
+ */
compose.checkbtn_autosig = checkbtn_autosig;
compose.entry_sigsep = entry_sigsep;
compose.checkbtn_wrapatsend = checkbtn_wrapatsend;
}
-
-/* alfons - nice ui for darko */
-
static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
{
- gchar *text;
+ gchar *text;
+ GtkWidget *datefmt_sample = NULL;
g_return_if_fail(widget != NULL);
g_return_if_fail(*widget != NULL);
- g_return_if_fail(entry_datefmt != NULL);
+ g_return_if_fail(display.entry_datefmt != NULL);
+
+ datefmt_sample = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(*widget), "datefmt_sample");
g_return_if_fail(datefmt_sample != NULL);
text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1);
g_free(prefs_common.date_format);
prefs_common.date_format = text;
- gtk_entry_set_text(GTK_ENTRY(entry_datefmt), text);
+ gtk_entry_set_text(GTK_ENTRY(display.entry_datefmt), text);
gtk_widget_destroy(*widget);
*widget = NULL;
static void date_format_select_row(GtkWidget *date_format_list, gint row,
gint column, GdkEventButton *event,
- gpointer data)
+ GtkWidget *date_format)
{
- gint curs_pos;
- gchar *format;
- gchar *old_format;
- gchar *new_format;
+ gint curs_pos;
+ gchar *format;
+ gchar *old_format;
+ gchar *new_format;
+ GtkWidget *datefmt_sample = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(date_format), "datefmt_sample");
g_return_if_fail(date_format_list != NULL);
+ g_return_if_fail(date_format != NULL);
+ g_return_if_fail(datefmt_sample != NULL);
/* only on double click */
if (event->type != GDK_2BUTTON_PRESS)
GtkWidget *confirm_area;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
+ GtkWidget *datefmt_sample = NULL;
const struct {
gchar *fmt;
gtk_container_add(GTK_CONTAINER(date_format), vbox1);
scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_show(scrolledwindow1);
gtk_box_pack_start(GTK_BOX(vbox1), scrolledwindow1, TRUE, TRUE, 0);
datefmt_sample = gtk_entry_new_with_max_length(300);
gtk_widget_show(datefmt_sample);
gtk_box_pack_start(GTK_BOX(hbox2), datefmt_sample, TRUE, TRUE, 40);
+
+ /* we need the "sample" entry box; add it as data so callbacks can
+ * get the entry box */
+ gtk_object_set_data(GTK_OBJECT(date_format), "datefmt_sample", datefmt_sample);
hbox1 = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox1);
gtk_box_pack_start(GTK_BOX(hbox1), label6, FALSE, TRUE, 0);
gtk_misc_set_padding(GTK_MISC(label6), 8, 0);
- label7 = gtk_label_new(_("label7"));
+ label7 = gtk_label_new("");
gtk_widget_show(label7);
gtk_box_pack_start(GTK_BOX(hbox1), label7, TRUE, TRUE, 60);
gtk_label_set_justify(GTK_LABEL(label7), GTK_JUSTIFY_LEFT);
gtk_signal_connect(GTK_OBJECT(date_format_list), "select_row",
GTK_SIGNAL_FUNC(date_format_select_row),
- &datefmt_sample);
+ date_format);
return date_format;
}
GtkWidget *hbox1;
GtkWidget *label_datefmt;
GtkWidget *label_datefmt_btn;
+ GtkWidget *tmplabel, *tmpentry, *tmpbutton;
+ GtkWidget *entry_datefmt;
+ GtkTooltips *tooltips_datefmt;
GtkWidget *button_dispitem;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
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), NULL);
+ GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont);
+
+ tmplabel = gtk_label_new (_("Small"));
+ gtk_widget_show (tmplabel);
+ gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 1, 2,
+ GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ tmpentry = gtk_entry_new ();
+ gtk_widget_show (tmpentry);
+ gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 1, 2,
+ (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+ tmpbutton = gtk_button_new_with_label ("... ");
+ 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);
+ display.entry_smallfont = tmpentry;
+
+ tmplabel = gtk_label_new (_("Normal"));
+ gtk_widget_show (tmplabel);
+ gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 2, 3,
+ GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ tmpentry = gtk_entry_new ();
+ gtk_widget_show (tmpentry);
+ gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 2, 3,
+ (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+ tmpbutton = gtk_button_new_with_label ("... ");
+ 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);
+ display.entry_normalfont = tmpentry;
+
+ tmplabel = gtk_label_new (_("Bold"));
+ gtk_widget_show (tmplabel);
+ gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 3, 4,
+ GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ tmpentry = gtk_entry_new ();
+ gtk_widget_show (tmpentry);
+ gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 3, 4,
+ (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+ tmpbutton = gtk_button_new_with_label ("... ");
+ 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);
+ display.entry_boldfont = tmpentry;
vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (vbox2);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
- label_datefmt = gtk_label_new(_("Date format"));
- gtk_widget_show(label_datefmt);
- gtk_box_pack_start(GTK_BOX (hbox1), label_datefmt, FALSE, FALSE, 0);
+ label_datefmt = gtk_label_new (_("Date format"));
+ gtk_widget_show (label_datefmt);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_datefmt, FALSE, FALSE, 0);
entry_datefmt = gtk_entry_new ();
gtk_widget_show (entry_datefmt);
display.chkbtn_swapfrom = chkbtn_swapfrom;
display.chkbtn_hscrollbar = chkbtn_hscrollbar;
display.chkbtn_useaddrbook = chkbtn_useaddrbook;
+ display.entry_datefmt = entry_datefmt;
}
static void prefs_message_create(void)
GtkWidget *chkbtn_mbalnum;
GtkWidget *chkbtn_disphdrpane;
GtkWidget *chkbtn_disphdr;
- GtkWidget *button_edit_disphdr;
+ GtkWidget *button_edit_disphdr;
GtkWidget *hbox_linespc;
GtkWidget *label_linespc;
GtkObject *spinbtn_linespc_adj;
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
PACK_CHECK_BUTTON(hbox1, chkbtn_disphdr,
- _("Display short headers on message view"));
+ _("Display short headers on message view"));
button_edit_disphdr = gtk_button_new_with_label (_(" Edit... "));
gtk_widget_show (button_edit_disphdr);
gtk_box_pack_end (GTK_BOX (hbox1), button_edit_disphdr,
- FALSE, TRUE, 0);
+ FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (button_edit_disphdr), "clicked",
- GTK_SIGNAL_FUNC (prefs_display_header_open),
- NULL);
+ GTK_SIGNAL_FUNC (prefs_display_header_open),
+ NULL);
SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
GtkWidget *vbox1;
GtkWidget *vbox2;
GtkWidget *hbox1;
- GtkWidget *checkbtn_gpgme_warning;
GtkWidget *checkbtn_default_encrypt;
GtkWidget *checkbtn_default_sign;
GtkWidget *checkbtn_auto_check_signatures;
- GtkWidget *checkbtn_signature_popup;
+ GtkWidget *checkbtn_gpg_signature_popup;
GtkWidget *checkbtn_passphrase_grab;
+ GtkWidget *checkbtn_gpg_warning;
GtkWidget *label;
GtkWidget *menuitem;
GtkWidget *optmenu;
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
- PACK_CHECK_BUTTON
- (vbox2, checkbtn_gpgme_warning,
- _("Display warning on startup if GnuPG does not work"));
-
PACK_CHECK_BUTTON (vbox2, checkbtn_default_encrypt,
_("Encrypt message by default"));
PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
_("Automatically check signatures"));
- PACK_CHECK_BUTTON (vbox2, checkbtn_signature_popup,
+ PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_signature_popup,
_("Show signature check result in a popup window"));
#ifndef __MINGW32__
_("Grab input while entering a passphrase"));
#endif
+ PACK_CHECK_BUTTON
+ (vbox2, checkbtn_gpg_warning,
+ _("Display warning on startup if GnuPG doesn't work"));
+
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
/* FIXME: disabled because not implemented */
gtk_widget_set_sensitive(optmenu, FALSE);
- privacy.checkbtn_gpgme_warning = checkbtn_gpgme_warning;
privacy.checkbtn_default_encrypt = checkbtn_default_encrypt;
privacy.checkbtn_default_sign = checkbtn_default_sign;
privacy.checkbtn_auto_check_signatures
= checkbtn_auto_check_signatures;
- privacy.checkbtn_signature_popup = checkbtn_signature_popup;
+ privacy.checkbtn_gpg_signature_popup
+ = checkbtn_gpg_signature_popup;
privacy.checkbtn_passphrase_grab = checkbtn_passphrase_grab;
+ privacy.checkbtn_gpg_warning = checkbtn_gpg_warning;
privacy.optmenu_default_signkey = optmenu;
}
GtkWidget *checkbtn_cleanonexit;
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
- GtkWidget *checkbtn_retrievedialog;
- GtkWidget *checkbtn_returnreceipt;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
(vbox2, checkbtn_openunread,
_("Open first unread message when entering a folder"));
- PACK_CHECK_BUTTON
- (vbox2, checkbtn_retrievedialog,
- _("Display dialog when retrieving mail"));
-
PACK_CHECK_BUTTON
(vbox2, checkbtn_openinbox,
_("Go to inbox after receiving new mail"));
PACK_CHECK_BUTTON (vbox_exit, checkbtn_warnqueued,
_("Warn if there are queued messages"));
- PACK_CHECK_BUTTON (vbox_exit, checkbtn_returnreceipt,
- _("Send return receipt on request"));
-
interface.checkbtn_emacs = checkbtn_emacs;
interface.checkbtn_openunread = checkbtn_openunread;
interface.checkbtn_openinbox = checkbtn_openinbox;
interface.checkbtn_cleanonexit = checkbtn_cleanonexit;
interface.checkbtn_askonclean = checkbtn_askonclean;
interface.checkbtn_warnqueued = checkbtn_warnqueued;
- interface.checkbtn_returnreceipt = checkbtn_returnreceipt;
- interface.checkbtn_retrievedialog = checkbtn_retrievedialog;
}
static void prefs_other_create(void)
gtk_box_pack_start (GTK_BOX (hbox1), uri_combo, TRUE, TRUE, 0);
gtkut_combo_set_items (GTK_COMBO (uri_combo),
"netscape -remote 'openURL(%s,raise)'",
+ "netscape '%s'",
"gnome-moz-remote --raise --newwin '%s'",
"kterm -e w3m '%s'",
"kterm -e lynx '%s'",
if (!quote_color_win)
prefs_quote_colors_dialog_create();
gtk_widget_show(quote_color_win);
- manage_window_set_transient(GTK_WINDOW(dialog.window));
+ manage_window_set_transient(GTK_WINDOW(quote_color_win));
gtk_main();
gtk_widget_hide(quote_color_win);
gtk_widget_set_usize (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_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
label = gtk_label_new
- ("%d:\n"
- "%f:\n"
- "%n:\n"
- "%N:\n"
- "%I:\n"
- "%s:\n"
- "%t:\n"
- "%i:\n"
- "%%:");
+ ("SYMBOL\n\n"
+ "%d\n" /* date */
+ "%f\n" /* from */
+ "%N\n" /* full name */
+ "%F\n" /* first name */
+ "%I\n" /* sender's initial */
+ "%s\n" /* subject line */
+ "%t\n" /* to */
+ "%c\n" /* cc */
+ "%n\n" /* newsgroups */
+ "%i\n" /* message id */
+ "%r\n" /* references */
+ "\n"
+ "%x\n"
+ "?x(expr)\n"
+ "\n"
+ "%M\n"
+ "%Q\n"
+ "%%");
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
label = gtk_label_new
- (_("Date\n"
+ (_("DESCRIPTION\n\n"
+ "Date\n"
"From\n"
"Full Name of Sender\n"
"First Name of Sender\n"
"Initial of Sender\n"
"Subject\n"
"To\n"
+ "Cc\n"
+ "Newsgroups\n"
"Message-ID\n"
+ "References\n"
+ "\n"
+ "Display the information\n"
+ "If the information x is set, displays expr\n"
+ "\n"
+ "Message body\n"
+ "Quoted message body\n"
"%"));
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
}
}
-static void prefs_font_select(GtkButton *button)
+static void prefs_font_select(GtkButton *button, GtkEntry *entry)
{
+ gchar *font_name;
+
+ g_return_if_fail(entry != NULL);
+
if (!font_sel_win) {
font_sel_win = gtk_font_selection_dialog_new
(_("Font selection"));
(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
"clicked",
GTK_SIGNAL_FUNC(prefs_font_selection_ok),
- NULL);
+ entry);
gtk_signal_connect_object
(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
"clicked",
GTK_OBJECT(font_sel_win));
}
+ font_name = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+ gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_sel_win), font_name);
+ g_free(font_name);
manage_window_set_transient(GTK_WINDOW(font_sel_win));
gtk_window_set_modal(GTK_WINDOW(font_sel_win), TRUE);
gtk_widget_grab_focus
gtk_widget_hide(font_sel_win);
}
-static void prefs_font_selection_ok(GtkButton *button)
+static void prefs_font_selection_ok(GtkButton *button, GtkEntry *entry)
{
gchar *fontname;
(GTK_FONT_SELECTION_DIALOG(font_sel_win));
if (fontname) {
- gtk_entry_set_text(GTK_ENTRY(display.entry_textfont), fontname);
+ gtk_entry_set_text(entry, fontname);
g_free(fontname);
}
gpointer data)
{
if (event && event->keyval == GDK_Escape)
- prefs_common_cancel();
+ prefs_common_cancel();
}
static void prefs_common_ok(void)
gtk_widget_hide(dialog.window);
inc_autocheck_timer_set();
}
+
+
+static struct _ComposePrefs
+{
+ GtkWidget *window;
+
+ GtkWidget *close_btn;
+} composeprefs;
+
+static void compose_prefs_key_pressed(GtkWidget *widget, GdkEventKey *event);
+static gint compose_prefs_delete_event(GtkWidget *widget, GdkEventAny *event);
+static void compose_prefs_close(GtkWidget *widget);
+static void compose_prefs_fmt_create(void);
+
+static void compose_prefs_fmt_open(void)
+{
+ if (composeprefs.window == NULL)
+ compose_prefs_fmt_create();
+ gtk_widget_show(composeprefs.window);
+}
+
+
+static void compose_prefs_fmt_create(void)
+{
+ GtkWidget *window;
+ GtkWidget *close_btn;
+
+ GtkWidget *frame_quote;
+ GtkWidget *vbox_quote;
+ GtkWidget *hbox1;
+ GtkWidget *checkbtn_quote;
+ GtkWidget *label_quotemark;
+ GtkWidget *entry_quotemark;
+ GtkWidget *scrolledwin_quotefmt;
+ GtkWidget *text_quotefmt;
+ GtkWidget *label_quotefmt;
+ GtkWidget *btn_quotedesc;
+
+ GtkWidget *label_fw_quotemark;
+ GtkWidget *entry_fw_quotemark;
+ GtkWidget *label_fw_quotefmt;
+ GtkWidget *text_fw_quotefmt;
+
+ window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_container_set_border_width(GTK_CONTAINER(window), 8);
+ gtk_window_set_title(GTK_WINDOW(window), _("Compose Preferences"));
+ 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(compose_prefs_delete_event),
+ NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+ GTK_SIGNAL_FUNC(compose_prefs_key_pressed),
+ NULL);
+
+ vbox_quote = gtk_vbox_new(FALSE, 8);
+ gtk_container_add(GTK_CONTAINER(window), vbox_quote);
+
+ PACK_CHECK_BUTTON (vbox_quote, checkbtn_quote,
+ _("Quote message when replying"));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 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);
+
+ entry_quotemark = gtk_entry_new ();
+ gtk_widget_show (entry_quotemark);
+ gtk_box_pack_start (GTK_BOX (hbox1), entry_quotemark, FALSE, FALSE, 0);
+ gtk_widget_set_usize (entry_quotemark, 64, -1);
+
+ hbox1 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+
+ label_quotefmt = gtk_label_new (_("Quotation format:"));
+ gtk_widget_show (label_quotefmt);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_quotefmt, FALSE, FALSE, 0);
+
+ scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwin_quotefmt);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy
+ (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
+ GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+
+ text_quotefmt = gtk_text_new (NULL, NULL);
+ 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, 400, 60);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+
+ label_fw_quotemark = gtk_label_new (_("Forward quotation mark"));
+ gtk_widget_show (label_fw_quotemark);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_fw_quotemark, FALSE, FALSE, 0);
+
+ entry_fw_quotemark = gtk_entry_new ();
+ gtk_widget_show (entry_fw_quotemark);
+ gtk_box_pack_start (GTK_BOX (hbox1), entry_fw_quotemark, FALSE, FALSE, 0);
+ gtk_widget_set_usize (entry_fw_quotemark, 64, -1);
+
+ hbox1 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0);
+
+ label_fw_quotefmt = gtk_label_new (_("Forward format:"));
+ gtk_widget_show (label_fw_quotefmt);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_fw_quotefmt, FALSE, FALSE, 0);
+
+ scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwin_quotefmt);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), scrolledwin_quotefmt, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy
+ (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt),
+ GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+
+ text_fw_quotefmt = gtk_text_new (NULL, NULL);
+ 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, 400, 60);
+
+ hbox1 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+ btn_quotedesc =
+ 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(prefs_quote_description), NULL);
+
+
+ gtkut_button_set_create(&hbox1, &close_btn, _("Close"),
+ NULL, NULL, NULL, NULL);
+ gtk_box_pack_end(GTK_BOX(vbox_quote), hbox1, FALSE, FALSE, 0);
+ gtk_widget_grab_default(close_btn);
+
+ gtk_signal_connect(GTK_OBJECT(close_btn), "clicked",
+ GTK_SIGNAL_FUNC(compose_prefs_close), NULL);
+
+ gtk_widget_show_all(vbox_quote);
+
+ composeprefs.window = window;
+ composeprefs.close_btn = close_btn;
+
+ compose.checkbtn_quote = checkbtn_quote;
+ compose.entry_quotemark = entry_quotemark;
+ compose.text_quotefmt = text_quotefmt;
+ compose.entry_fw_quotemark = entry_fw_quotemark;
+ compose.text_fw_quotefmt = text_fw_quotefmt;
+}
+
+static void compose_prefs_close(GtkWidget *widget)
+{
+ gtk_widget_hide(composeprefs.window);
+}
+
+static gint compose_prefs_delete_event(GtkWidget *widget, GdkEventAny *event)
+{
+ gtk_widget_hide(composeprefs.window);
+
+ return TRUE;
+}
+
+static void compose_prefs_key_pressed(GtkWidget *widget, GdkEventKey *event)
+{
+ if (event && event->keyval == GDK_Escape) {
+ gtk_widget_hide(composeprefs.window);
+ }
+}
projects / claws.git / blobdiff