dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
cncfanatics
2010-11-15 00:16:30 +01:00
parent f0559469fe 18d142e2a1
commit 0b608a4293
4 changed files with 88 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/characterEditor.py
View File

@@ -513,6 +513,7 @@ class APIView (wx.Panel):
fgSizerInput.Add(self.m_staticIDText, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
self.inputID = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
self.inputID.Bind(wx.EVT_TEXT, self.removeStyle)
fgSizerInput.Add(self.inputID, 1, wx.ALL | wx.EXPAND, 5)
self.m_staticKeyText = wx.StaticText(self, wx.ID_ANY, u"API key:", wx.DefaultPosition, wx.DefaultSize, 0)
@@ -520,6 +521,7 @@ class APIView (wx.Panel):
fgSizerInput.Add(self.m_staticKeyText, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
self.inputKey = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
self.inputKey.Bind(wx.EVT_TEXT, self.removeStyle)
fgSizerInput.Add(self.inputKey, 0, wx.ALL | wx.EXPAND, 5)
pmainSizer.Add(fgSizerInput, 0, wx.EXPAND, 5)
@@ -555,6 +557,14 @@ class APIView (wx.Panel):
self.Layout()
self.charChanged(None)
def removeStyle(self, event):
object = event.GetEventObject()
value = object.GetLineText(0)
object.Clear()
object.ChangeValue(value)
object.SetModified(True)
event.Skip()
def charChanged(self, event):
cChar = service.Character.getInstance()
ID, key = cChar.getApiDetails(self.Parent.Parent.getActiveCharacter())

34
gui/patternEditor.py
View File

@@ -68,7 +68,7 @@ class DmgPatternEditorDlg (wx.Dialog):
bitmap = wx.ArtProvider.GetBitmap(art, wx.ART_BUTTON) if name != "rename" else art
btn = wx.BitmapButton(self, wx.ID_ANY, bitmap)
if size is None:
size = btn.GetSize()
size = btn.GetSize()
btn.SetMinSize(size)
btn.SetMaxSize(size)
@@ -152,6 +152,24 @@ class DmgPatternEditorDlg (wx.Dialog):
self.SetSizer(mainSizer)
# <Import&Export>
importExport = (("Import", wx.ART_FILE_OPEN),
("Export", wx.ART_FILE_SAVE_AS))
for name, art in importExport:
bitmap = wx.ArtProvider.GetBitmap(art, wx.ART_BUTTON)
btn = wx.BitmapButton(self, wx.ID_ANY, bitmap)
btn.SetMinSize( btn.GetSize() )
btn.SetMaxSize( btn.GetSize() )
btn.Layout()
setattr(self, name, btn)
btn.Enable(True)
btn.SetToolTipString("%s patterns" % name.capitalize())
footerSizer.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL)
# </Import&Export>
self.Layout()
bsize = self.GetBestSize()
@@ -178,6 +196,8 @@ class DmgPatternEditorDlg (wx.Dialog):
self.rename.Bind(wx.EVT_BUTTON, self.renamePattern)
self.copy.Bind(wx.EVT_BUTTON, self.copyPattern)
self.delete.Bind(wx.EVT_BUTTON, self.deletePattern)
self.Import.Bind(wx.EVT_BUTTON, self.importPatterns)
self.Export.Bind(wx.EVT_BUTTON, self.exportPatterns)
self.editEm.Bind(wx.EVT_TEXT, self.ValuesUpdated)
self.editThermal.Bind(wx.EVT_TEXT, self.ValuesUpdated)
@@ -202,9 +222,9 @@ class DmgPatternEditorDlg (wx.Dialog):
else:
ltext = format %(0, 0, 0, 0)
ttext = "Total: % 6d" % (total)
#ttext = "Total: % 6d" % (total)
self.stPercentages.SetLabel(ltext)
self.stTotal.SetLabel(ttext)
#self.stTotal.SetLabel(ttext)
self.totSizer.Layout()
if event is not None:
@@ -330,4 +350,10 @@ class DmgPatternEditorDlg (wx.Dialog):
self.patternChanged()
def __del__( self ):
pass
pass
def importPatterns(self, event):
print "IMPORT!"
def exportPatterns(self, event):
print "EXPORT!"

17
gui/shipBrowser.py
View File

@@ -1267,12 +1267,12 @@ class ShipItem(wx.Window):
class PFBitmapFrame(wx.Frame):
def __init__ (self,parent, pos, bitmap):
wx.Frame.__init__(self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = pos, size = wx.DefaultSize, style = wx.FRAME_SHAPED
| wx.NO_BORDER
wx.Frame.__init__(self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = pos, size = wx.DefaultSize, style =
wx.NO_BORDER
| wx.FRAME_NO_TASKBAR
| wx.STAY_ON_TOP)
img = bitmap.ConvertToImage()
img.RotateHue(-0.625)
img = img.ConvertToGreyscale()
bitmap = wx.BitmapFromImage(img)
self.bitmap = bitmap
self.SetSize((bitmap.GetWidth(), bitmap.GetHeight()))
@@ -1283,11 +1283,9 @@ class PFBitmapFrame(wx.Frame):
self.timer = wx.Timer(self,wx.ID_ANY)
self.direction = 1
self.transp = 0
self.SetMinSize((bitmap.GetWidth(),bitmap.GetHeight()))
if 'wxMSW' in wx.PlatformInfo:
self.SetRoundShape()
else:
self.SetTransparent(0)
self.SetSize((bitmap.GetWidth(),bitmap.GetHeight()))
self.SetTransparent(0)
self.Refresh()
def OnTimer(self, event):
@@ -1312,6 +1310,7 @@ class PFBitmapFrame(wx.Frame):
else:
self.direction = -1
self.timer.Start(5)
def SetRoundShape(self, event=None):
w, h = self.GetSizeTuple()
self.SetShape(GetRoundShape( w,h, 5 ) )
@@ -1329,7 +1328,7 @@ class PFBitmapFrame(wx.Frame):
mdc.DrawBitmap(self.bitmap, 0, 0)
mdc.SetPen( wx.Pen("#000000", width = 1 ) )
mdc.SetBrush( wx.TRANSPARENT_BRUSH )
mdc.DrawRoundedRectangle( 0,0,rect.width,rect.height,5 )
mdc.DrawRectangle( 0,0,rect.width,rect.height)
def GetRoundBitmap( w, h, r ):

71
miniframe.py
View File

@@ -75,10 +75,13 @@ class PFTabRenderer:
return self.CopyRegion(self.closeBtnRegion)
def GetMinSize(self):
ebmp = wx.EmptyBitmap(1,1)
mdc = wx.MemoryDC()
mdc.SelectObject(ebmp)
mdc.SetFont(self.font)
textSizeX, textSizeY = mdc.GetTextExtent(self.text)
totalSize = self.lrZoneWidth * 2 + textSizeX + self.cbSize*2 if self.closeButton else 0
mdc.SelectObject(wx.NullBitmap)
return (totalSize, self.tabHeight)
@@ -89,6 +92,7 @@ class PFTabRenderer:
newRegion.IntersectRegion(region)
return newRegion
def InitTab(self, skipLRzones = False):
self.tabWidth, self.tabHeight = self.tabSize
@@ -167,23 +171,26 @@ class PFTabRenderer:
mdc = wx.MemoryDC()
mbmp = wx.EmptyBitmap(width,height)
mbmp = wx.EmptyBitmap(width,height,24)
mdc.SelectObject(mbmp)
mdc.SetBackground( wx.Brush((255,255,255)))
mdc.SetBackground( wx.Brush((123,123,123)))
mdc.Clear()
mdc.SetPen( wx.Pen("#000000", width = 1 ) )
mdc.DrawSpline(self.leftZoneSpline)
mdc.SetBrush(wx.Brush((255,255,0)))
mdc.FloodFill(inc*2,height-2, wx.Color(0,0,0), wx.FLOOD_BORDER)
mdc.SetBrush(wx.Brush(wx.Colour(255,255,0), wx.SOLID))
ret = mdc.FloodFill(inc*2,height-inc, wx.Color(123,123,123), wx.FLOOD_SURFACE)
if not ret:
print "FloodFill failed"
mdc.SelectObject(wx.NullBitmap)
mbmp.SetMaskColour( (255, 255, 255) )
# mbmp.SetMaskColour( (123, 123, 123) )
region = wx.RegionFromBitmap(mbmp)
region = wx.Region()
region.UnionBitmapColour(mbmp, wx.Colour(123,123,123))
region.Offset(-1,0)
return region
@@ -196,23 +203,23 @@ class PFTabRenderer:
mdc = wx.MemoryDC()
mbmp = wx.EmptyBitmap(width,height)
mbmp = wx.EmptyBitmap(width,height,24)
mdc.SelectObject(mbmp)
mdc.SetBackground( wx.Brush((255,255,255)))
mdc.SetBackground( wx.Brush((123,123,123), wx.SOLID))
mdc.Clear()
mdc.SetPen( wx.Pen("#000000", width = 1 ) )
mdc.DrawSpline(self.rightZoneSpline)
mdc.SetBrush(wx.Brush((255,255,0)))
mdc.FloodFill(inc,height-inc, wx.Color(0,0,0), wx.FLOOD_BORDER)
mdc.SetBrush(wx.Brush(wx.Colour(255,255,0)))
ret = mdc.FloodFill(inc,height-inc, wx.Color(123,123,123), wx.FLOOD_SURFACE)
if not ret:
print "FloodFill failed"
mdc.SelectObject(wx.NullBitmap)
mbmp.SetMaskColour( (255, 255, 255) )
region = wx.RegionFromBitmap(mbmp)
region = wx.Region()
region.UnionBitmapColour(mbmp, wx.Colour(123,123,123))
return region
@@ -313,10 +320,10 @@ class PFTabRenderer:
mdc.SelectObject(wx.NullBitmap)
canvas.SetMaskColour((13,22,31))
if not self.selected:
img = canvas.ConvertToImage()
img = img.AdjustChannels(1, 1, 1, 0.8)
canvas = wx.BitmapFromImage(img)
# if not self.selected:
# img = canvas.ConvertToImage()
# img = img.AdjustChannels(1, 1, 1, 0.8)
# canvas = wx.BitmapFromImage(img)
self.tabBitmap = canvas
class PFAddRenderer:
@@ -417,7 +424,8 @@ class PFAddRenderer:
canvas.SetMaskColour((13,22,31))
img = canvas.ConvertToImage()
img.InitAlpha()
if not img.HasAlpha():
img.InitAlpha()
img = img.AdjustChannels(1, 1, 1, 0.6)
img = img.Blur(1)
bbmp = wx.BitmapFromImage(img)
@@ -453,8 +461,8 @@ class PFAddRenderer:
canvas.SetMaskColour((255,255,255))
img = canvas.ConvertToImage()
img.InitAlpha()
if not img.HasAlpha():
img.InitAlpha()
img = img.AdjustChannels(1, 1, 1, 0.3)
bbmp = wx.BitmapFromImage(img)
@@ -711,7 +719,7 @@ class PFTabsContainer(wx.Window):
def OnPaint(self, event):
rect = self.GetRect()
canvas = wx.EmptyBitmap(rect.width, rect.height)
canvas = wx.EmptyBitmap(rect.width, rect.height,24)
mdc = wx.BufferedPaintDC(self)
mdc.SelectObject(canvas)
@@ -741,7 +749,7 @@ class PFTabsContainer(wx.Window):
width = tab.tabWidth - self.inclination*2
posx, posy = tab.GetPosition()
if not tab.IsSelected():
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True )
# mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True )
# img = tab.Render().ConvertToImage()
# img = img.AdjustChannels(1, 1, 1, 0.8)
# bmp = wx.BitmapFromImage(img)
@@ -750,12 +758,12 @@ class PFTabsContainer(wx.Window):
selected = tab
if selected:
posx, posy = selected.GetPosition()
mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True)
# mdc.DrawBitmap(self.efxBmp, posx, posy - 1, True)
bmp = selected.Render()
if self.dragging:
img = bmp.ConvertToImage()
img = img.AdjustChannels(1.2, 1.2, 1.2, 0.7)
bmp = wx.BitmapFromImage(img)
# if self.dragging:
# img = bmp.ConvertToImage()
# img = img.AdjustChannels(1.2, 1.2, 1.2, 0.7)
# bmp = wx.BitmapFromImage(img)
mdc.DrawBitmap(bmp, posx, posy, True)
selpos = posx
@@ -780,9 +788,10 @@ class PFTabsContainer(wx.Window):
fxBmp = self.tabShadow.Render()
simg = fxBmp.ConvertToImage()
# simg.InitAlpha()
simg = simg.Blur(2)
simg = simg.AdjustChannels(0.2,0.2,0.2,0.3)
# if not simg.HasAlpha():
# simg.InitAlpha()
# simg = simg.Blur(2)
# simg = simg.AdjustChannels(0.2,0.2,0.2,0.3)
self.efxBmp = wx.BitmapFromImage(simg)