2006-03-12 [paul] 2.0.0cvs136

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index ca19532fceae831495bca48cbea6ab74bba8cde5..15b4368fa5eb215bee22ff54bfb1dc6d9c87d356 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -58,6 +58,7 @@
 #include "folderview.h"
 #include "stock_pixmap.h"
 #include "prefswindow.h"
+#include "colorlabel.h"
 
 enum {
        DATEFMT_FMT,
@@ -284,6 +285,36 @@ static PrefParam param[] = {
        {"normal_font_gtk2",    "Sans 9",
          &SPECIFIC_PREFS.normalfont,           P_STRING, NULL, NULL, NULL},
 
+       /* custom colors */
+       {"custom_color1", "#ff9900", &prefs_common.custom_colorlabel[0].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel1", "Orange", &prefs_common.custom_colorlabel[0].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color2", "#ff0000", &prefs_common.custom_colorlabel[1].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel2", "Red", &prefs_common.custom_colorlabel[1].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color3", "#ff66ff", &prefs_common.custom_colorlabel[2].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel3", "Pink", &prefs_common.custom_colorlabel[2].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color4", "#00ccff", &prefs_common.custom_colorlabel[3].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel4", "Sky blue", &prefs_common.custom_colorlabel[3].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color5", "#0000ff", &prefs_common.custom_colorlabel[4].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel5", "Blue", &prefs_common.custom_colorlabel[4].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color6", "#009900", &prefs_common.custom_colorlabel[5].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel6", "Green", &prefs_common.custom_colorlabel[5].label, P_STRING,
+        NULL, NULL, NULL},
+       {"custom_color7", "#663366", &prefs_common.custom_colorlabel[6].color, P_COLOR,
+        NULL, NULL, NULL},
+       {"custom_colorlabel7", "Brown", &prefs_common.custom_colorlabel[6].label, P_STRING,
+        NULL, NULL, NULL},
+
        /* image viewer */
        {"display_image", "TRUE", &prefs_common.display_img, P_BOOL,
         NULL, NULL, NULL},
@@ -299,7 +330,7 @@ static PrefParam param[] = {
         &prefs_common.ng_abbrev_len, P_INT,
         NULL, NULL, NULL},
 
-       {"translate_header", "TRUE", &prefs_common.trans_hdr, P_BOOL,
+       {"translate_header", "FALSE", &prefs_common.trans_hdr, P_BOOL,
         NULL, NULL, NULL},
 
        /* Display: Summary View */
@@ -508,6 +539,8 @@ static PrefParam param[] = {
         P_BOOL, NULL, NULL, NULL},
        {"render_html", "TRUE", &prefs_common.render_html, P_BOOL,
         NULL, NULL, NULL},
+       {"invoke_plugin_on_html", "FALSE", &prefs_common.invoke_plugin_on_html, P_BOOL,
+        NULL, NULL, NULL},
        {"line_space", "2", &prefs_common.line_space, P_INT,
         NULL, NULL, NULL},
 
@@ -673,6 +706,16 @@ static PrefParam param[] = {
        {"logwin_height", "-1", &prefs_common.logwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"folderselwin_width", "300", &prefs_common.folderselwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"folderselwin_height", "-1", &prefs_common.folderselwin_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"addressaddwin_width", "300", &prefs_common.addressaddwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"addressaddwin_height", "-1", &prefs_common.addressaddwin_height, P_INT,
+        NULL, NULL, NULL},
+
        /* Hidden */
        {"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
         NULL, NULL, NULL},
@@ -762,6 +805,8 @@ void prefs_common_read_config(void)
                prefs_common_read_history(COMMAND_HISTORY);
        prefs_common.summary_quicksearch_history =
                prefs_common_read_history(QUICKSEARCH_HISTORY);
+
+       colorlabel_update_colortable_from_prefs();
 }
 
 /*