2006-10-12 [colin] 2.5.5cvs4

[claws.git] / src / prefs_message.c

diff --git a/src/prefs_message.c b/src/prefs_message.c
index f6ef5cccd38899829e14327291f0a0564fe406ae..904a579089dfeb8d1b752b2001e9c56d7627741e 100644 (file)
--- a/src/prefs_message.c
+++ b/src/prefs_message.c
@@ -59,6 +59,7 @@ typedef struct _MessagePage
        GtkWidget *chkbtn_halfpage;
 
        GtkWidget *chkbtn_attach_desc;
+       GtkWidget *chkbtn_respect_flowed_format;
 } MessagePage;
 
 static void disphdr_pane_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
@@ -90,7 +91,7 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkObject *spinbtn_linespc_adj;
        GtkWidget *spinbtn_linespc;
 
-       GtkWidget *frame_scr;
+       GtkWidget *frame;
        GtkWidget *vbox_scr;
        GtkWidget *chkbtn_smoothscroll;
        GtkWidget *hbox_scr;
@@ -100,14 +101,18 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *chkbtn_halfpage;
 
        GtkWidget *chkbtn_attach_desc;
+       GtkWidget *chkbtn_respect_flowed_format;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
+       PACK_FRAME(vbox1, frame, _("Headers"));
+       
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(frame), vbox2);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
 
        PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
                          _("Display header pane above message view"));
@@ -131,9 +136,9 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        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_start (GTK_BOX (hbox1), button_edit_disphdr,
                          FALSE, TRUE, 0);
@@ -143,15 +148,19 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
 
        SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
 
+       PACK_FRAME(vbox1, frame, _("HTML messages"));
+       
+       vbox2 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox2);
+       gtk_container_add(GTK_CONTAINER(frame), vbox2);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+
        PACK_CHECK_BUTTON(vbox2, chkbtn_html,
                          _("Render HTML messages as text"));
 
        PACK_CHECK_BUTTON(vbox2, chkbtn_html_plugin,
                          _("Render HTML-only messages with plugin if possible"));
 
-       PACK_CHECK_BUTTON(vbox2, chkbtn_attach_desc,
-                         _("Show attachment descriptions (rather than names)"));
-
        hbox1 = gtk_hbox_new (FALSE, 32);
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
@@ -179,11 +188,11 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
                            FALSE, FALSE, 0);
 
-       PACK_FRAME(vbox1, frame_scr, _("Scroll"));
+       PACK_FRAME(vbox1, frame, _("Scroll"));
 
        vbox_scr = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox_scr);
-       gtk_container_add (GTK_CONTAINER (frame_scr), vbox_scr);
+       gtk_container_add (GTK_CONTAINER (frame), vbox_scr);
        gtk_container_set_border_width (GTK_CONTAINER (vbox_scr), 8);
 
        PACK_CHECK_BUTTON(vbox_scr, chkbtn_halfpage, _("Half page"));
@@ -218,6 +227,15 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
 
        SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
 
+       vbox2 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox2);
+       PACK_CHECK_BUTTON(vbox2, chkbtn_attach_desc,
+                         _("Show attachment descriptions (rather than names)"));
+       PACK_CHECK_BUTTON(vbox2, chkbtn_respect_flowed_format,
+                         _("Respect flowed format"));
+       gtk_box_pack_start (GTK_BOX (vbox1), vbox2,
+                         FALSE, TRUE, 0);
+
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdrpane),
                prefs_common.display_header_pane);
 
@@ -236,6 +254,8 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.scroll_halfpage);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_attach_desc),
                prefs_common.attach_desc);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_respect_flowed_format),
+               prefs_common.respect_flowed_format);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_linespc),
                prefs_common.line_space);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_scrollstep),
@@ -252,7 +272,8 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_message->spinbtn_scrollstep = spinbtn_scrollstep;
        prefs_message->chkbtn_halfpage = chkbtn_halfpage;
        prefs_message->chkbtn_attach_desc = chkbtn_attach_desc;
-       
+       prefs_message->chkbtn_respect_flowed_format = chkbtn_respect_flowed_format;
+
        prefs_message->page.widget = vbox1;
 }
 
@@ -276,6 +297,8 @@ void prefs_message_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->chkbtn_halfpage));
        prefs_common.attach_desc = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->chkbtn_attach_desc));
+       prefs_common.respect_flowed_format = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->chkbtn_respect_flowed_format));
        prefs_common.line_space = gtk_spin_button_get_value_as_int(
                GTK_SPIN_BUTTON(page->spinbtn_linespc));
        prefs_common.scroll_step = gtk_spin_button_get_value_as_int(