Merge lp:~tzeentch-gm/bzr-explorer/536954-dark-color-status-fix into lp:bzr-explorer

[Michael Gliwinski]

This changes good and warning status messages produced by bzrlib.plugins.explorer.kinds.html_status_message to use default color, instead of explicitly black. Since background color isn't explicitly set, this allows QTextBrowser to use colors appropriate for current system color scheme in use.

In effect, the text color is white on dark schemes and black on light schemes.

[Alexander Belchenko (bialix)]

review: Approve

[Michael Gliwinski (tzeentch-gm)]

BTW, I checked this on KDE 4.4 and 4.3 on both dark and light color schemes. Haven't checked other platforms though.

=== modified file 'lib/kinds.py'
--- lib/kinds.py	2010-02-26 08:13:31 +0000
+++ lib/kinds.py	2010-03-11 21:51:27 +0000
@@ -455,14 +455,15 @@
 
 
 def html_status_message(status_kind, text):
-    colour = {
-        ERROR_STATUS: "red",
-        WARNING_STATUS: "black",
-        GOOD_STATUS: "black",
+    icon_fmt = '<img src="%s">'
+    text_fmt = {
+        ERROR_STATUS: '<font color="red">%s</font>',
+        WARNING_STATUS: '%s',
+        GOOD_STATUS: '%s',
         }[status_kind]
-    return '<img src="%s">&nbsp;&nbsp;<font color=%s>%s</font>' % (
+    message_fmt = '%s&nbsp;&nbsp;%s' % (icon_fmt, text_fmt)
+    return message_fmt % (
         path_for_icon(status_kind),
-        colour,
         escape(text))