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

Fixed a crash situation (init of chareditor dialog - usage of CB_READONLY for skilltreechoice caused an assertion) ; Fixed some layout problems when having big skill descriptions ; Planet management doesn't have a description in EOS, that caused an error while setting label with None :) - fixed

Browse Source
This commit is contained in:
HomeWorld
2010-09-08 08:22:17 +03:00
parent c0ed413af5
commit e2bf63a18d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gui/characterEditor.py
View File

@@ -25,9 +25,9 @@ import controller
class CharacterEditor (wx.Dialog):
def __init__(self, parent):
wx.Dialog.__init__ (self, parent, id=wx.ID_ANY, title=u"pyfa: Character Editor", pos=wx.DefaultPosition,
size=wx.Size(641, 450), style=wx.CAPTION | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
size=wx.Size(641, 600), style=wx.CAPTION | wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
self.SetSizeHintsSz(wx.Size(640, 450), wx.DefaultSize)
self.SetSizeHintsSz(wx.Size(640, 600), wx.DefaultSize)
mainSizer = wx.BoxSizer(wx.VERTICAL)
self.navSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -43,7 +43,7 @@ class CharacterEditor (wx.Dialog):
self.characterRename.Hide()
self.characterRename.Bind(wx.EVT_TEXT_ENTER, self.processRename)
self.skillTreeChoice = wx.Choice(self, wx.ID_ANY, style=wx.CB_READONLY)
self.skillTreeChoice = wx.Choice(self, wx.ID_ANY, style=0)
for i, info in enumerate(charList):
id, name = info
@@ -95,7 +95,7 @@ class CharacterEditor (wx.Dialog):
self.descriptionBox = wx.StaticBox(self, wx.ID_ANY, u"Description")
sbSizerDescription = wx.StaticBoxSizer(self.descriptionBox, wx.HORIZONTAL | wx.RESERVE_SPACE_EVEN_IF_HIDDEN)
self.description = wx.StaticText(self, wx.ID_ANY, u"\n\n\n")
self.description = wx.StaticText(self, wx.ID_ANY, u"\n")
self.description.Wrap(-1)
sbSizerDescription.Add(self.description, 0, wx.ALL | wx.RESERVE_SPACE_EVEN_IF_HIDDEN, 2)
@@ -114,7 +114,7 @@ class CharacterEditor (wx.Dialog):
self.SetSizer(mainSizer)
self.Layout()
self.description.Hide()
self.Centre(wx.BOTH)
@@ -154,10 +154,14 @@ class CharacterEditor (wx.Dialog):
description = cChar.getSkillDescription(data)
else:
description = cChar.getGroupDescription(data)
if description == None:
self.description.SetLabel("Something is missing in EOS check %s" % data)
else:
self.description.SetLabel(description)
self.description.SetLabel(description)
self.description.Wrap(620)
self.description.Wrap(600)
self.description.Show()
self.Layout()
def getActiveCharacter(self):
selection = self.skillTreeChoice.GetCurrentSelection()