/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2005-2007 Colin Leroy <colin@colino.net> & The Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
GtkWidget *window;
- GtkWidget *chkbtn_mbalnum;
GtkWidget *chkbtn_disphdrpane;
GtkWidget *chkbtn_disphdr;
+ GtkWidget *chkbtn_dispxface;
+
GtkWidget *chkbtn_html;
- GtkWidget *chkbtn_cursor;
+ GtkWidget *chkbtn_html_plugin;
GtkWidget *spinbtn_linespc;
GtkWidget *chkbtn_smoothscroll;
GtkWidget *chkbtn_attach_desc;
} MessagePage;
+static void disphdr_pane_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
+{
+ gboolean is_active;
+
+ is_active = gtk_toggle_button_get_active(toggle_btn);
+
+ gtk_widget_set_sensitive(widget, !is_active);
+}
+
void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
GtkWidget *vbox1;
GtkWidget *vbox2;
- GtkWidget *vbox3;
GtkWidget *hbox1;
- GtkWidget *chkbtn_mbalnum;
GtkWidget *chkbtn_disphdrpane;
GtkWidget *chkbtn_disphdr;
+ GtkWidget *chkbtn_dispxface;
+
GtkWidget *button_edit_disphdr;
GtkWidget *chkbtn_html;
- GtkWidget *chkbtn_cursor;
+ GtkWidget *chkbtn_html_plugin;
GtkWidget *hbox_linespc;
GtkWidget *label_linespc;
GtkObject *spinbtn_linespc_adj;
GtkWidget *spinbtn_linespc;
- GtkWidget *frame_scr;
+ GtkWidget *frame;
GtkWidget *vbox_scr;
GtkWidget *chkbtn_smoothscroll;
GtkWidget *hbox_scr;
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
- PACK_CHECK_BUTTON
- (vbox2, chkbtn_mbalnum,
- _("Display multi-byte alphanumeric as\n"
- "ASCII character (Japanese only)"));
- gtk_label_set_justify (GTK_LABEL (GTK_BIN(chkbtn_mbalnum)->child),
- GTK_JUSTIFY_LEFT);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Headers"));
PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
_("Display header pane above message view"));
+#if HAVE_LIBCOMPFACE
+ PACK_CHECK_BUTTON(vbox2, chkbtn_dispxface,
+ _("Display (X-)Face in message view"));
+#else
+ PACK_CHECK_BUTTON(vbox2, chkbtn_dispxface,
+ _("Display Face in message view"));
+#endif
+
+ gtk_widget_set_sensitive(chkbtn_dispxface,
+ !prefs_common.display_header_pane);
+
+ g_signal_connect(G_OBJECT(chkbtn_disphdrpane), "toggled",
+ G_CALLBACK(disphdr_pane_toggled), chkbtn_dispxface);
+
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
PACK_CHECK_BUTTON(hbox1, chkbtn_disphdr,
- _("Display short headers on message view"));
+ _("Display headers in message view"));
- button_edit_disphdr = gtk_button_new_with_label (_(" Edit... "));
+ button_edit_disphdr = gtk_button_new_from_stock(GTK_STOCK_EDIT);
gtk_widget_show (button_edit_disphdr);
- gtk_box_pack_end (GTK_BOX (hbox1), button_edit_disphdr,
+ gtk_box_pack_start (GTK_BOX (hbox1), button_edit_disphdr,
FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button_edit_disphdr), "clicked",
G_CALLBACK (prefs_display_header_open),
SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("HTML messages"));
+
PACK_CHECK_BUTTON(vbox2, chkbtn_html,
_("Render HTML messages as text"));
- PACK_CHECK_BUTTON(vbox2, chkbtn_cursor,
- _("Display cursor in message view"));
-
- PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+ PACK_CHECK_BUTTON(vbox2, chkbtn_html_plugin,
+ _("Render HTML-only messages with plugin if possible"));
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
FALSE, FALSE, 0);
- PACK_FRAME(vbox1, frame_scr, _("Scroll"));
-
- 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);
+ vbox_scr = gtkut_get_options_frame(vbox1, &frame, _("Scroll"));
PACK_CHECK_BUTTON(vbox_scr, chkbtn_halfpage, _("Half page"));
SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox3);
- gtk_box_pack_start (GTK_BOX (vbox1), vbox3, FALSE, FALSE, 0);
-
- PACK_CHECK_BUTTON(vbox3, chkbtn_attach_desc,
+ PACK_CHECK_BUTTON(vbox1, chkbtn_attach_desc,
_("Show attachment descriptions (rather than names)"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_mbalnum),
- prefs_common.conv_mb_alnum);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdrpane),
prefs_common.display_header_pane);
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_dispxface),
+ prefs_common.display_xface);
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdr),
prefs_common.display_header);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_html),
prefs_common.render_html);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_cursor),
- prefs_common.textview_cursor_visible);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_html_plugin),
+ prefs_common.invoke_plugin_on_html);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_smoothscroll),
prefs_common.enable_smooth_scroll);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_halfpage),
prefs_common.scroll_step);
prefs_message->window = GTK_WIDGET(window);
- prefs_message->chkbtn_mbalnum = chkbtn_mbalnum;
prefs_message->chkbtn_disphdrpane = chkbtn_disphdrpane;
+ prefs_message->chkbtn_dispxface = chkbtn_dispxface;
prefs_message->chkbtn_disphdr = chkbtn_disphdr;
prefs_message->chkbtn_html = chkbtn_html;
- prefs_message->chkbtn_cursor = chkbtn_cursor;
+ prefs_message->chkbtn_html_plugin = chkbtn_html_plugin;
prefs_message->spinbtn_linespc = spinbtn_linespc;
prefs_message->chkbtn_smoothscroll = chkbtn_smoothscroll;
prefs_message->spinbtn_scrollstep = spinbtn_scrollstep;
{
MessagePage *page = (MessagePage *) _page;
- prefs_common.conv_mb_alnum = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->chkbtn_mbalnum));
prefs_common.display_header_pane = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->chkbtn_disphdrpane));
+ prefs_common.display_xface = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->chkbtn_dispxface));
prefs_common.display_header = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->chkbtn_disphdr));
prefs_common.render_html = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->chkbtn_html));
- prefs_common.textview_cursor_visible = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->chkbtn_cursor));
+ prefs_common.invoke_plugin_on_html = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->chkbtn_html_plugin));
prefs_common.enable_smooth_scroll = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->chkbtn_smoothscroll));
prefs_common.scroll_halfpage = gtk_toggle_button_get_active(
GTK_SPIN_BUTTON(page->spinbtn_linespc));
prefs_common.scroll_step = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_scrollstep));
+
+ main_window_reflect_prefs_all_real(FALSE);
}
static void prefs_message_destroy_widget(PrefsPage *_page)
static gchar *path[3];
path[0] = _("Message View");
- path[1] = _("Text options");
+ path[1] = _("Text Options");
path[2] = NULL;
page = g_new0(MessagePage, 1);
projects / claws.git / blobdiff