projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
do not use description as attachment name
[claws.git] / src / prefs_common.c
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 33701f1f72a0d954d97749d8f989324776708bbb..c9da35ed5149c57330adfdef8f39fad2c87775ea 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -85,9 +85,6 @@ static struct Receive {
        GtkWidget *checkbtn_newmail_manu;
        GtkWidget *entry_newmail_notify_cmd;
        GtkWidget *hbox_newmail_notify;
-
-       GtkWidget *spinbtn_maxarticle;
-       GtkObject *spinbtn_maxarticle_adj;
 } receive;
 
 static struct Send {
@@ -192,6 +189,8 @@ static struct Message {
 
        GtkWidget *chkbtn_display_img;
        GtkWidget *chkbtn_resize_image;
+
+       GtkWidget *chkbtn_attach_desc;
 } message;
 
 #if USE_GPGME
@@ -333,10 +332,6 @@ static PrefParam param[] = {
         &receive.entry_newmail_notify_cmd,
         prefs_set_data_from_entry, prefs_set_entry},
  
-       {"max_news_articles", "300", &prefs_common.max_articles, P_INT,
-        &receive.spinbtn_maxarticle,
-        prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-
        /* Send */
        {"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
         &p_send.checkbtn_extsend,
@@ -419,7 +414,7 @@ static PrefParam param[] = {
        {"check_while_typing", "TRUE", &prefs_common.check_while_typing,
         P_BOOL, &spelling.checkbtn_check_while_typing,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_INT,
+       {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_COLOR,
         NULL, NULL, NULL},
 #endif
        {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
@@ -647,17 +642,17 @@ static PrefParam param[] = {
         &message.chkbtn_enablecol,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_INT,
+       {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_INT,
+       {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_INT,
+       {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_COLOR,
         NULL, NULL, NULL},
-       {"uri_color", "32512", &prefs_common.uri_col, P_INT,
+       {"uri_color", "32512", &prefs_common.uri_col, P_COLOR,
         NULL, NULL, NULL},
-       {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_INT,
+       {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR,
         NULL, NULL, NULL},
-       {"signature_color", "7960953", &prefs_common.signature_col, P_INT,
+       {"signature_color", "7960953", &prefs_common.signature_col, P_COLOR,
         NULL, NULL, NULL},
        {"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
         P_BOOL, NULL, NULL, NULL},
@@ -699,6 +694,10 @@ static PrefParam param[] = {
        {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
         NULL, NULL, NULL},
 
+       {"attach_desc", "TRUE", &prefs_common.attach_desc, P_BOOL,
+        &message.chkbtn_attach_desc,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        /* MIME viewer */
        {"mime_image_viewer", "display '%s'",
         &prefs_common.mime_image_viewer, P_STRING, NULL, NULL, NULL},
@@ -836,6 +835,9 @@ static PrefParam param[] = {
        {"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
         NULL, NULL, NULL},
 
+       {"color_new", "179", &prefs_common.color_new, P_COLOR,
+        NULL, NULL, NULL},
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -1086,11 +1088,6 @@ static void prefs_receive_create(void)
        GtkWidget *entry_newmail_notify_cmd;
        GtkWidget *label_newmail_notify_cmd;
 
-       GtkWidget *frame_news;
-       GtkWidget *label_maxarticle;
-       GtkWidget *spinbtn_maxarticle;
-       GtkObject *spinbtn_maxarticle_adj;
-
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
@@ -1237,31 +1234,6 @@ static void prefs_receive_create(void)
                                 prefs_common.newmail_notify_auto || 
                                 prefs_common.newmail_notify_manu);
 
-       PACK_FRAME(vbox1, frame_news, _("News"));
-
-       hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox);
-       gtk_container_add (GTK_CONTAINER (frame_news), hbox);
-       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-
-       label_maxarticle = gtk_label_new
-               (_("Maximum number of articles to download\n"
-                  "(unlimited if 0 is specified)"));
-       gtk_widget_show (label_maxarticle);
-       gtk_box_pack_start (GTK_BOX (hbox), label_maxarticle, FALSE, FALSE, 0);
-       gtk_label_set_justify (GTK_LABEL (label_maxarticle), GTK_JUSTIFY_LEFT);
-
-       spinbtn_maxarticle_adj =
-               gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
-       spinbtn_maxarticle = gtk_spin_button_new
-               (GTK_ADJUSTMENT (spinbtn_maxarticle_adj), 10, 0);
-       gtk_widget_show (spinbtn_maxarticle);
-       gtk_box_pack_start (GTK_BOX (hbox), spinbtn_maxarticle,
-                           FALSE, FALSE, 0);
-       gtk_widget_set_usize (spinbtn_maxarticle, 64, -1);
-       gtk_spin_button_set_numeric
-               (GTK_SPIN_BUTTON (spinbtn_maxarticle), TRUE);
-
        receive.checkbtn_incext = checkbtn_incext;
        receive.entry_incext    = entry_incext;
        /* receive.button_incext   = button_incext; */
@@ -1282,9 +1254,6 @@ static void prefs_receive_create(void)
        receive.checkbtn_newmail_manu  = checkbtn_newmail_manu;
        receive.hbox_newmail_notify    = hbox_newmail_notify;
        receive.entry_newmail_notify_cmd = entry_newmail_notify_cmd;
-
-       receive.spinbtn_maxarticle     = spinbtn_maxarticle;
-       receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj;
 }
 
 static void prefs_send_create(void)
@@ -2371,6 +2340,8 @@ static void prefs_message_create(void)
        GtkWidget *chkbtn_display_img;
        GtkWidget *chkbtn_resize_image;
 
+       GtkWidget *chkbtn_attach_desc;
+
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
@@ -2505,6 +2476,10 @@ static void prefs_message_create(void)
        PACK_CHECK_BUTTON(vbox3, chkbtn_resize_image,
                          _("Resize attached images"));
 
+       PACK_CHECK_BUTTON(vbox3, chkbtn_attach_desc,
+                         _("Show attachment descriptions (rather than names)"));
+
+
        message.chkbtn_enablecol   = chkbtn_enablecol;
        message.button_edit_col    = button_edit_col;
        message.chkbtn_mbalnum     = chkbtn_mbalnum;
@@ -2520,6 +2495,8 @@ static void prefs_message_create(void)
 
        message.chkbtn_display_img  = chkbtn_display_img;
        message.chkbtn_resize_image = chkbtn_resize_image;
+
+       message.chkbtn_attach_desc  = chkbtn_attach_desc;
 }
 
 #if USE_GPGME
Claws Mail