From a19b3b651f449047227ac61eece0c6ef5ea9c223 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Wed, 17 Nov 2010 10:01:30 +0200 Subject: [PATCH] More stuff --- icons/ctabadd.png | Bin 0 -> 3367 bytes miniframe.py | 114 +++++++++------------------------------------- 2 files changed, 22 insertions(+), 92 deletions(-) create mode 100644 icons/ctabadd.png diff --git a/icons/ctabadd.png b/icons/ctabadd.png new file mode 100644 index 0000000000000000000000000000000000000000..4d01602835f64b756f4f4e6995aeb194c69fce0d GIT binary patch literal 3367 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 literal 0 HcmV?d00001 diff --git a/miniframe.py b/miniframe.py index 449bd91d6..cc3df58ee 100755 --- a/miniframe.py +++ b/miniframe.py @@ -304,53 +304,28 @@ class PFTabRenderer: class PFAddRenderer: def __init__(self, size = (24,12)): self.width, self.height = size - self.addBitmap = None + self.addImg = bitmapLoader.getImage("ctabadd", "icons") + self.width = self.addImg.GetWidth() + self.height = self.addImg.GetHeight() self.spline = [] self.inclination = 3 self.region = None + self.tbmp = wx.BitmapFromImage(self.addImg) + self.addBitmap = None + self.InitRenderer() def GetSize(self): return (self.width, self.height) def InitRenderer(self): - self.CreateSpline() + self.region = self.CreateRegion() self._Render() - def CreateSpline(self): - width = self.width - height = self.height - 1 - inc = self.inclination - self.spline = [wx.Point(0, 0), wx.Point(inc*3/2, height),wx.Point(inc*2 + inc*2/3, height), wx.Point(width, height), wx.Point(width, height), - wx.Point(width - inc, inc), wx.Point(width - inc*2, 0), wx.Point(0, 0), wx.Point(0, 0)] def CreateRegion(self): - width = self.width - height = self.height - inc = self.inclination - - mdc = wx.MemoryDC() - - mbmp = wx.EmptyBitmap(width,height) - mdc.SelectObject(mbmp) - - mdc.SetBackground( wx.Brush((255,255,255))) - mdc.Clear() - - mdc.SetPen( wx.Pen("#000000", width = 1 ) ) - mdc.DrawSpline(self.spline) - - mdc.SetBrush(wx.Brush((255,255,0))) - mdc.FloodFill(width/2,height/2, wx.Color(0,0,0), wx.FLOOD_BORDER) - - mdc.SelectObject(wx.NullBitmap) - - mbmp.SetMaskColour( (255, 255, 255) ) - - region = wx.RegionFromBitmap(mbmp) -# region.Offset(-1,0) - + region = wx.RegionFromBitmap(self.tbmp) return region def CalculateColor(self, color, delta): @@ -379,69 +354,24 @@ class PFAddRenderer: if self.addBitmap: del self.addBitmap - canvas = wx.EmptyBitmap(self.width, self.height) +# canvas = wx.EmptyBitmap(self.width, self.height) +# +# mdc = wx.MemoryDC() +# mdc.SelectObject(canvas) +# +# mdc.SetBackground(wx.Brush ((0x12,0x23,0x32))) +# mdc.Clear() +# mdc.SelectObject(wx.NullBitmap) +# canvas.SetMaskColour((255,255,255)) - mdc = wx.MemoryDC() - mdc.SelectObject(canvas) - - mdc.SetBackground(wx.Brush ((13,22,31))) - mdc.Clear() - - mdc.DestroyClippingRegion() - mdc.SetClippingRegionAsRegion(self.region) -# mdc.GradientFillLinear(rect, (0x30,0x30,0x30), (0x6f,0x6f,0x6f), wx.SOUTH) - mdc.FloodFill(self.width/2,self.height/2, wx.Color(13,22,31), wx.FLOOD_BORDER) - mdc.DestroyClippingRegion() - mdc.SetPen( wx.Pen( wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT), 1)) - mdc.DrawSpline(self.spline) - mdc.SelectObject(wx.NullBitmap) - - canvas.SetMaskColour((13,22,31)) - - img = canvas.ConvertToImage() - if not img.HasAlpha(): - img.InitAlpha() - img = img.AdjustChannels(1, 1, 1, 0.6) - img = img.Blur(1) - bbmp = wx.BitmapFromImage(img) - - del mdc - del canvas - canvas = wx.EmptyBitmap(self.width, self.height) - - mdc = wx.MemoryDC() - mdc.SelectObject(canvas) - - mdc.SetBackground(wx.Brush ((255,255,255 , 0))) - mdc.Clear() - - mdc.DrawBitmap(bbmp,0,0,True) - - cx = self.width / 2 - 1 - cy = self.height / 2 - - mdc.SetPen( wx.Pen( wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT), 1)) - mdc.DrawLine(cx - inc + 1, cy, cx + inc + 1, cy) - mdc.DrawLine(cx - inc + 1, cy-1, cx + inc + 1, cy-1) - mdc.DrawLine(cx, cy - inc, cx, cy + inc ) - mdc.DrawLine(cx+1, cy - inc, cx+1, cy + inc ) - - self.wColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) - color = self.CalculateColor(self.wColor, 0x99) - mdc.SetPen( wx.Pen( color, 1)) - - mdc.DrawSpline(self.spline) - - mdc.SelectObject(wx.NullBitmap) - canvas.SetMaskColour((255,255,255)) - - img = canvas.ConvertToImage() - if not img.HasAlpha(): - img.InitAlpha() - img = img.AdjustChannels(1, 1, 1, 0.3) +# img = canvas.ConvertToImage() +# if not img.HasAlpha(): +# img.InitAlpha() + img = self.addImg.AdjustChannels(1, 1, 1, 0.2) bbmp = wx.BitmapFromImage(img) self.addBitmap = bbmp +# self.addBitmap.SetMaskColour((0x12,0x23,0x32)) class PFTabsContainer(wx.Window):