gimp r25962 - in branches/gimp-2-4: . plug-ins/pygimp

[akkana svn gnome org]

Author: akkana
Date: Tue Jun 17 04:31:35 2008
New Revision: 25962
URL: http://svn.gnome.org/viewvc/gimp?rev=25962&view=rev

Log:
2008-06-16  Akkana Peck  <akkana svn gnome org>

	Merged from trunk:

	* plug-ins/pygimp/gimpui.py: allow passing in color names
	as strings (backporting discussed with joao).



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/plug-ins/pygimp/gimpui.py

Modified: branches/gimp-2-4/plug-ins/pygimp/gimpui.py
==============================================================================
--- branches/gimp-2-4/plug-ins/pygimp/gimpui.py	(original)
+++ branches/gimp-2-4/plug-ins/pygimp/gimpui.py	Tue Jun 17 04:31:35 2008
@@ -172,6 +172,8 @@
             color = default
         elif isinstance(default, tuple):
             color = apply(gimpcolor.RGB, default)
+        elif isinstance(default, str):
+            color = gimpcolor.rgb_parse_css(default)
         ColorButton.__init__(self, _("Python-Fu Color Selection"), 100, 20,
                              color, COLOR_AREA_FLAT)
     def get_value(self):