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

Merge branch 'master' into charImplants

Browse Source 
# Conflicts:
#	gui/characterEditor.py
This commit is contained in:
blitzmann
2016-03-12 23:20:26 -05:00
parent ca34d7cced 91980c9f2c
commit 48b45b5f51
1260 changed files with 3684 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gui/characterEditor.py
View File

@@ -32,15 +32,14 @@ import gui.globalEvents as GE
class CharacterEditor(wx.Frame):
def __init__(self, parent):
wx.Frame.__init__ (self, parent, id=wx.ID_ANY, title=u"pyfa: Character Editor", pos=wx.DefaultPosition,
size=wx.Size(641, 600), style=wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.TAB_TRAVERSAL)
size=wx.Size(640, 600), style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER)
i = wx.IconFromBitmap(BitmapLoader.getBitmap("character_small", "gui"))
self.SetIcon(i)
self.mainFrame = parent
#self.disableWin = wx.WindowDisabler(self)
self.disableWin= wx.WindowDisabler(self)
self.SetSizeHintsSz(wx.Size(640, 600), wx.DefaultSize)
self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )
mainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -170,7 +169,7 @@ class CharacterEditor(wx.Frame):
self.btnRestrict()
def editingFinished(self, event):
del self.disableWin
#del self.disableWin
wx.PostEvent(self.mainFrame, GE.CharListUpdated())
self.Destroy()
@@ -200,7 +199,7 @@ class CharacterEditor(wx.Frame):
wx.PostEvent(self, GE.CharListUpdated())
def closeEvent(self, event):
del self.disableWin
#del self.disableWin
wx.PostEvent(self.mainFrame, GE.CharListUpdated())
self.Destroy()
@@ -821,4 +820,4 @@ class SaveCharacterAs(wx.Dialog):
event.Skip()
self.Close()