sync with 0.8.6cvs5

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index a7e4281490394ed1c61a7875ff0a1fd3a7bb001f..74f0dc9c8528b8d771d4b9e58bd9fb65dd348c4e 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -165,7 +165,6 @@ static struct Display {
        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;
@@ -194,6 +193,9 @@ static struct Message {
        GtkWidget *spinbtn_scrollstep;
        GtkObject *spinbtn_scrollstep_adj;
        GtkWidget *chkbtn_halfpage;
+
+       GtkWidget *chkbtn_display_img;
+       GtkWidget *chkbtn_resize_image;
 } message;
 
 #if USE_GPGME
@@ -486,10 +488,6 @@ static PrefParam param[] = {
         &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,
@@ -686,6 +684,13 @@ static PrefParam param[] = {
         &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},
 
@@ -903,7 +908,6 @@ static void prefs_common_apply              (void);
 static void prefs_common_cancel                (void);
 
 void prefs_common_init() {
-       prefs_common.fltlist = NULL;
        prefs_common.disphdr_list = NULL;
 }
 
@@ -2096,7 +2100,6 @@ static void prefs_display_create(void)
        GtkWidget *label_textfont;
        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
-       GtkWidget *chkbtn_display_img;
        GtkWidget *chkbtn_transhdr;
        GtkWidget *chkbtn_folder_unread;
        GtkWidget *hbox1;
@@ -2219,9 +2222,6 @@ static void prefs_display_create(void)
        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);
@@ -2309,7 +2309,6 @@ static void prefs_display_create(void)
        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;
@@ -2350,6 +2349,9 @@ static void prefs_message_create(void)
        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);
@@ -2470,6 +2472,16 @@ static void prefs_message_create(void)
 
        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;
@@ -2482,6 +2494,9 @@ static void prefs_message_create(void)
        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
@@ -2958,6 +2973,9 @@ static void prefs_other_create(void)
        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 */