[Python-apps-commits] r935 - in packages/phatch/trunk/debian (4 files)

[pochu-guest at users.alioth.debian.org]

    Date: Wednesday, April 9, 2008 @ 12:01:05
  Author: pochu-guest
Revision: 935

* debian/patches/from_upstream_fix_themes.patch:
  - Fix Phatch not working properly with some themes.
    Thanks to Stani for the patch.

Added:
  packages/phatch/trunk/debian/patches/
  packages/phatch/trunk/debian/patches/from_upstream_fix_themes.patch
Modified:
  packages/phatch/trunk/debian/changelog
  packages/phatch/trunk/debian/rules

Modified: packages/phatch/trunk/debian/changelog
===================================================================
--- packages/phatch/trunk/debian/changelog	2008-04-08 21:25:49 UTC (rev 934)
+++ packages/phatch/trunk/debian/changelog	2008-04-09 12:01:05 UTC (rev 935)
@@ -1,3 +1,11 @@
+phatch (0.1.3-2) unstable; urgency=low
+
+  * debian/patches/from_upstream_fix_themes.patch:
+    - Fix Phatch not working properly with some themes.
+      Thanks to Stani for the patch.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Wed, 09 Apr 2008 14:00:05 +0200
+
 phatch (0.1.3-1) unstable; urgency=low
 
   * New upstream release

Added: packages/phatch/trunk/debian/patches/from_upstream_fix_themes.patch
===================================================================
--- packages/phatch/trunk/debian/patches/from_upstream_fix_themes.patch	                        (rev 0)
+++ packages/phatch/trunk/debian/patches/from_upstream_fix_themes.patch	2008-04-09 12:01:05 UTC (rev 935)
@@ -0,0 +1,35 @@
+=== modified file 'phatch/pyWx/lib/vlist.py'
+--- phatch/pyWx/lib/vlist.py	2008-04-05 22:41:58 +0000
++++ phatch/pyWx/lib/vlist.py	2008-04-09 11:35:25 +0000
+@@ -38,7 +38,10 @@
+     def GradientColour(self,colour):
+         rgb     = r, g, b = colour.Red(), colour.Green(), colour.Blue()#wx2.6
+         m       = max(rgb)
+-        n       = max([x for x in rgb if x!=m])
++        rgb_without_max   = [x for x in rgb if x!=m]
++        if not rgb_without_max:
++            return wx.Colour(128,128,128)
++        n       = max(rgb_without_max)
+         keyw    = {}
+         for c in ('Red','Green','Blue'):
+             x   = getattr(colour,c)()
+@@ -51,10 +54,6 @@
+         return wx.Colour(**keyw)
+                 
+     def SetTheme(self,theme='default'):
+-        hilight     = wx.SystemSettings_GetColour(wx.SYS_COLOUR_MENUHILIGHT)
+-        if hilight in [wx.BLACK,
+-                wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND)]:
+-            theme = 'light_blue'
+         self._theme = theme
+         if theme == 'light_blue': 
+             #mozilla like
+@@ -62,6 +61,7 @@
+             self._color_to      = wx.Colour(217,226,234)
+         else:
+             #theme based
++            hilight = wx.SystemSettings_GetColour(wx.SYS_COLOUR_MENUHILIGHT)
+             self._color_from    = self.GradientColour(hilight)
+             self._color_to      = hilight
+         
+

Modified: packages/phatch/trunk/debian/rules
===================================================================
--- packages/phatch/trunk/debian/rules	2008-04-08 21:25:49 UTC (rev 934)
+++ packages/phatch/trunk/debian/rules	2008-04-09 12:01:05 UTC (rev 935)
@@ -2,6 +2,7 @@
 
 DEB_PYTHON_SYSTEM := pysupport
 
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk