2006-05-19 [wwp] 2.2.0cvs37

	* manual/advanced.xml
	* manual/fr/advanced.xml
	* src/gtk/logwindow.c
	* src/prefs_common.c
	* src/prefs_common.h
		added hidden prefs to allow customization of colors used in
		protocol log window (useful for dark gtk+ themes).

diff --git a/ChangeLog b/ChangeLog
index 7660a5d1d223f78238ac3ccc9367011afa6bbd89..0fd25643e9f3db545fe12961a93e60f6f3fa93f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-19 [wwp]       2.2.0cvs37
+
+       * manual/advanced.xml
+       * manual/fr/advanced.xml
+       * src/gtk/logwindow.c
+       * src/prefs_common.c
+       * src/prefs_common.h
+               added hidden prefs to allow customization of colors used in
+               protocol log window (useful for dark gtk+ themes).
+
 2006-05-19 [wwp]       2.2.0cvs36
 
        * ChangeLog

diff --git a/PATCHSETS b/PATCHSETS
index da408373a0a9dd09f613f79eca2b3a3a6cc761ea..10fa68ed8017ccbc6ad8f2500138e045d5d6abbb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1506,3 +1506,4 @@
 ( cvs diff -u -r 1.79.2.27 -r 1.79.2.28 src/mh.c;  ) > 2.2.0cvs34.patchset
 ( cvs diff -u -r 1.96.2.113 -r 1.96.2.114 src/textview.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/logwindow.c;  ) > 2.2.0cvs35.patchset
 ( cvs diff -u -r 1.396.2.583 -r 1.396.2.584 ChangeLog;  ) > 2.2.0cvs36.patchset
+( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 manual/advanced.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/fr/advanced.xml;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/logwindow.c;  cvs diff -u -r 1.204.2.85 -r 1.204.2.86 src/prefs_common.c;  cvs diff -u -r 1.103.2.48 -r 1.103.2.49 src/prefs_common.h;  ) > 2.2.0cvs37.patchset

diff --git a/configure.ac b/configure.ac
index 5f108658e7e679892c5f6121d4dbc6972c363dea..5c03b60902b14a3e110af5bf4b182e8a58576c40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index a271ca8a7a6b90d5a3ac31fc75ecb1c5612f1a00..36615b016a41a120978e3d31895ba1e539fecf74 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -203,6 +203,9 @@
            <varlistentry><term>hover_timeout</term>
                    <listitem><para>time in milliseconds that will cause a folder tree to expand during drag 'n' drop when the mouse cover is held over it</para></listitem>
            </varlistentry>
+           <varlistentry><term>log_error_color</term><term>log_in_color</term><term>log_msg_color</term><term>log_out_color</term><term>log_warn_color</term>
+                       <listitem><para>colors used in log window</para></listitem>
+           </varlistentry>
            <varlistentry><term>statusbar_update_step</term>
                    <listitem><para>update stepping in progress bars</para></listitem>
            </varlistentry>

diff --git a/manual/fr/advanced.xml b/manual/fr/advanced.xml
index 19707eb33c301ca6c38e0569113e227d6497f6e0..1bd7bc9d5ae1ea6a0c2d6925b1c4e050db3ca2ae 100644 (file)
--- a/manual/fr/advanced.xml
+++ b/manual/fr/advanced.xml
@@ -180,6 +180,9 @@
            <varlistentry><term>hover_timeout</term>
                    <listitem><para>Temps en millisecondes pendant lequel la souris doit rester sur l'arbre des dossiers afin qu'ils se déplient durant un glisser-déposer.</para></listitem>
            </varlistentry>
+           <varlistentry><term>log_error_color</term><term>log_in_color</term><term>log_msg_color</term><term>log_out_color</term><term>log_warn_color</term>
+                       <listitem><para>Couleurs utilisées dans la fenêtre de traces</para></listitem>
+           </varlistentry>
            <varlistentry><term>statusbar_update_step</term>
                    <listitem><para>Étapes de progression lors de la mise à jour dans les barres de progression.</para></listitem>
            </varlistentry>

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index 0d8129107bcdedc29218da8c2cd9cbd421d41d3d..38bf49562895ec9cd4697136cdb55c0762619314 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -138,17 +138,21 @@ void log_window_init(LogWindow *logwin)
 {
        GtkTextBuffer *buffer;
        GdkColormap *colormap;
-       GdkColor color[5] =
-               {{0, 0, 0xafff, 0}, {0, 0xefff, 0, 0}, {0, 0xefff, 0, 0},
-                 {0, 0, 0, 0}, {0, 0, 0, 0xefff}};
+       GdkColor color[5];
        gboolean success[5];
        gint i;
 
-       logwin->msg_color   = color[0];
-       logwin->warn_color  = color[1];
+       gtkut_convert_int_to_gdk_color(prefs_common.log_msg_color, &color[0]);
+       gtkut_convert_int_to_gdk_color(prefs_common.log_warn_color, &color[1]);
+       gtkut_convert_int_to_gdk_color(prefs_common.log_error_color, &color[2]);
+       gtkut_convert_int_to_gdk_color(prefs_common.log_in_color, &color[3]);
+       gtkut_convert_int_to_gdk_color(prefs_common.log_out_color, &color[4]);
+
+       logwin->msg_color = color[0];
+       logwin->warn_color = color[1];
        logwin->error_color = color[2];
-       logwin->in_color    = color[3];
-       logwin->out_color   = color[4];
+       logwin->in_color = color[3];
+       logwin->out_color = color[4];
 
        colormap = gdk_drawable_get_colormap(logwin->window->window);
        gdk_colormap_alloc_colors(colormap, color, 5, FALSE, TRUE, success);

diff --git a/src/prefs_common.c b/src/prefs_common.c
index df782f806830c3f6e0ad0d89fd560e0acd74227b..cd656145335d81acd91c21edc48223d858d43566 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -644,6 +644,16 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"log_length", "500", &prefs_common.loglength, P_INT,
         NULL, NULL, NULL},
+       {"log_msg_color", "#00af00", &prefs_common.log_msg_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_warn_color", "#af0000", &prefs_common.log_warn_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_error_color", "#af0000", &prefs_common.log_error_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_in_color", "#000000", &prefs_common.log_in_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_out_color", "#0000ef", &prefs_common.log_out_color, P_COLOR,
+        NULL, NULL, NULL},
 
        {"color_new", "179", &prefs_common.color_new, P_COLOR,
         NULL, NULL, NULL},

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 41884ea900c02105374fa3723e617827b3442fac..c6015d2c212984cdc536715e435079c30af15d45 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -308,10 +308,15 @@ struct _PrefsCommon
        gchar *print_cmd;
        gchar *ext_editor_cmd;
 
-        gboolean cliplog;
-        guint loglength;
-
-        gboolean confirm_on_exit;
+    gboolean cliplog;
+    guint loglength;
+       gulong log_msg_color;
+       gulong log_warn_color;
+       gulong log_error_color;
+       gulong log_in_color;
+       gulong log_out_color;
+
+    gboolean confirm_on_exit;
        gboolean clean_on_exit;
        gboolean ask_on_clean;
        gboolean warn_queued_on_exit;