From: Colin Leroy Date: Thu, 14 Sep 2006 06:16:02 +0000 (+0000) Subject: 2006-09-14 [colin] 2.4.0cvs186 X-Git-Tag: rel_2_5_0~30 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c7768f5b82cfc3f80084d67ad05e174696bb46b5 2006-09-14 [colin] 2.4.0cvs186 * src/prefs_common.c * src/prefs_common.h * src/gtk/gtksctree.c * manual/advanced.xml New hidden pref, stripes_color_offset, to change the value added/substracted to normal bgcolor to create the stripes in summaries --- diff --git a/ChangeLog b/ChangeLog index e39d2dd17..c4445bb42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-09-14 [colin] 2.4.0cvs186 + + * src/prefs_common.c + * src/prefs_common.h + * src/gtk/gtksctree.c + * manual/advanced.xml + New hidden pref, stripes_color_offset, to change + the value added/substracted to normal bgcolor to + create the stripes in summaries + 2006-09-13 [colin] 2.4.0cvs185 * src/gedit-print.c diff --git a/PATCHSETS b/PATCHSETS index 6b3b40c0a..a21f83c58 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1877,3 +1877,4 @@ ( cvs diff -u -r 1.61.2.51 -r 1.61.2.52 src/account.c; cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/gtk/pluginwindow.c; ) > 2.4.0cvs183.patchset ( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/common/ssl_certificate.c; ) > 2.4.0cvs184.patchset ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gedit-print.c; cvs diff -u -r 1.94.2.105 -r 1.94.2.106 src/messageview.c; cvs diff -u -r 1.19.2.9 -r 1.19.2.10 src/messageview.h; cvs diff -u -r 1.395.2.248 -r 1.395.2.249 src/summaryview.c; cvs diff -u -r 1.96.2.147 -r 1.96.2.148 src/textview.c; ) > 2.4.0cvs185.patchset +( cvs diff -u -r 1.204.2.101 -r 1.204.2.102 src/prefs_common.c; cvs diff -u -r 1.103.2.60 -r 1.103.2.61 src/prefs_common.h; cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/gtk/gtksctree.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 manual/advanced.xml; ) > 2.4.0cvs186.patchset diff --git a/configure.ac b/configure.ac index 66642c341..59da77f34 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=185 +EXTRA_VERSION=186 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/manual/advanced.xml b/manual/advanced.xml index 02cc59fa1..c421ff990 100644 --- a/manual/advanced.xml +++ b/manual/advanced.xml @@ -578,6 +578,15 @@ + + stripes_color_offset + + + Specify the value to use to create alternate colors in summaries. The + more little it is, the less the difference will be visible. + + + enable_swap_from diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c index 889a55903..1125dcd0b 100644 --- a/src/gtk/gtksctree.c +++ b/src/gtk/gtksctree.c @@ -848,14 +848,14 @@ gtk_sctree_draw_row (GtkCList *clist, } if (normalbg.red > 0x8888 && normalbg.green > 0x8888 && normalbg.blue > 0x8888) { greybg.pixel = normalbg.pixel; - greybg.red = normalbg.red - 0x1111; - greybg.green = normalbg.green - 0x1111; - greybg.blue = normalbg.blue - 0x1111; + greybg.red = normalbg.red - prefs_common.stripes_color_offset; + greybg.green = normalbg.green - prefs_common.stripes_color_offset; + greybg.blue = normalbg.blue - prefs_common.stripes_color_offset; } else if (normalbg.red < 0x8888 && normalbg.green < 0x8888 && normalbg.blue < 0x8888) { greybg.pixel = normalbg.pixel; - greybg.red = normalbg.red + 0x1111; - greybg.green = normalbg.green + 0x1111; - greybg.blue = normalbg.blue + 0x1111; + greybg.red = normalbg.red + prefs_common.stripes_color_offset; + greybg.green = normalbg.green + prefs_common.stripes_color_offset; + greybg.blue = normalbg.blue + prefs_common.stripes_color_offset; } else { color_change = FALSE; } diff --git a/src/prefs_common.c b/src/prefs_common.c index ad91aa172..20c0c3287 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -95,8 +95,13 @@ static PrefParam param_os_specific[] = { &prefs_common.widgetfont, P_STRING, NULL, NULL, NULL}, {"message_font_gtk2", "Monospace 9", &prefs_common.textfont, P_STRING, NULL, NULL, NULL}, +<<<<<<< prefs_common.c + {"print_font_gtk2", "Monospace 9", + &prefs_common.printfont, P_STRING, NULL, NULL, NULL}, +======= {"print_font_gtk2", "Monospace 9", &prefs_common.printfont, P_STRING, NULL, NULL, NULL}, +>>>>>>> 1.204.2.101 {"small_font_gtk2", "Sans 9", &prefs_common.smallfont, P_STRING, NULL, NULL, NULL}, {"normal_font_gtk2", "Sans 9", @@ -763,6 +768,8 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"use_stripes_in_summaries", "TRUE", &prefs_common.use_stripes_in_summaries, P_BOOL, NULL, NULL, NULL}, + {"stripes_color_offset", "4000", &prefs_common.stripes_color_offset, P_INT, + NULL, NULL, NULL}, {"enable_dotted_lines", "FALSE", &prefs_common.enable_dotted_lines, P_BOOL, NULL, NULL, NULL}, {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL, diff --git a/src/prefs_common.h b/src/prefs_common.h index fcc30351f..2acac0c58 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -181,6 +181,7 @@ struct _PrefsCommon gboolean use_stripes_everywhere; gboolean use_stripes_in_summaries; /* overrides if use_stripes_everywhere is set to TRUE */ + gint stripes_color_offset; gboolean enable_dotted_lines; gboolean enable_hscrollbar; gboolean bold_unread;