Skip to content

Commit

Permalink
Swap refresh / skillrq button positions
Browse files Browse the repository at this point in the history
  • Loading branch information
DarkFenX committed Aug 31, 2013
1 parent a92c646 commit e6290e1
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions gui/characterSelection.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,11 @@ def __init__(self, parent):

self.refreshCharacterList()

self.skillReqsStaticBitmap = wx.StaticBitmap(self)
mainSizer.Add(self.skillReqsStaticBitmap, 0, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.RIGHT | wx.LEFT, 3)

self.cleanSkills = bitmapLoader.getBitmap("skill_big", "icons")
self.redSkills = bitmapLoader.getBitmap("skillRed_big", "icons")
self.greenSkills = bitmapLoader.getBitmap("skillGreen_big", "icons")
self.refresh = bitmapLoader.getBitmap("refresh", "icons")

self.skillReqsStaticBitmap.SetBitmap(self.cleanSkills)

self.btnRefresh = wx.BitmapButton(self, wx.ID_ANY, self.refresh)
size = self.btnRefresh.GetSize()

Expand All @@ -58,8 +53,13 @@ def __init__(self, parent):

self.btnRefresh.Bind(wx.EVT_BUTTON, self.refreshApi)
self.btnRefresh.Enable(False)

mainSizer.Add(self.btnRefresh, 0, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.RIGHT | wx.LEFT, 2)


self.skillReqsStaticBitmap = wx.StaticBitmap(self)
self.skillReqsStaticBitmap.SetBitmap(self.cleanSkills)
mainSizer.Add(self.skillReqsStaticBitmap, 0, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.RIGHT | wx.LEFT, 3)

self.Bind(wx.EVT_CHOICE, self.charChanged)
self.mainFrame.Bind(GE.CHAR_LIST_UPDATED, self.refreshCharacterList)
self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
Expand Down Expand Up @@ -110,7 +110,7 @@ def refreshApi(self, event):
# can we do a popup, notifying user of API error?
pass
self.refreshCharacterList()

def charChanged(self, event):
fitID = self.mainFrame.getActiveFit()
charID = self.getActiveCharacter()
Expand Down Expand Up @@ -163,12 +163,12 @@ def fitChanged(self, event):
if newCharID == None:
cChar = service.Character.getInstance()
self.selectChar(cChar.all5ID())

elif currCharID != newCharID:
self.selectChar(newCharID)
self.charChanged(None)


event.Skip()

def _buildSkillsTooltip(self, reqs, currItem = "", tabulationLevel = 0):
Expand Down

0 comments on commit e6290e1

Please sign in to comment.