From e6290e12fb04b77278b1e066d73a079394f6654d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 31 Aug 2013 16:39:17 +0400 Subject: [PATCH] Swap refresh / skillrq button positions --- gui/characterSelection.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gui/characterSelection.py b/gui/characterSelection.py index eca69b102..b9d178e1c 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -39,16 +39,11 @@ class CharacterSelection(wx.Panel): 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() @@ -58,8 +53,13 @@ class CharacterSelection(wx.Panel): 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) @@ -110,7 +110,7 @@ class CharacterSelection(wx.Panel): # can we do a popup, notifying user of API error? pass self.refreshCharacterList() - + def charChanged(self, event): fitID = self.mainFrame.getActiveFit() charID = self.getActiveCharacter() @@ -163,12 +163,12 @@ class CharacterSelection(wx.Panel): 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):