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

Revert "Added icon to show boosting fits."

Browse Source 
This reverts commit f7fdcfcd4e.
This commit is contained in:
blitzmann
2014-02-24 03:00:06 -05:00
parent f7fdcfcd4e
commit e877cef3a9
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/sfBrowserItem.py
View File

@@ -14,7 +14,7 @@ BTN_DISABLED = 8
class PFBaseButton(object):
def __init__(self, normalBitmap = wx.NullBitmap,label = "", callback = None, hoverBitmap = None, disabledBitmap = None, show = True, iconOnly = False):
def __init__(self, normalBitmap = wx.NullBitmap,label = "", callback = None, hoverBitmap = None, disabledBitmap = None, show = True):
self.normalBmp = normalBitmap
self.dropShadowOpacity = 0.2
@@ -23,7 +23,6 @@ class PFBaseButton(object):
self.disabledBmp = disabledBitmap
self.label = label
self.show = show
self.iconOnly = iconOnly
self.callback = callback
@@ -95,8 +94,8 @@ class PFToolbar(object):
def SetPosition(self, pos):
self.toolbarX, self.toolbarY = pos
def AddButton(self, btnBitmap, label = "", clickCallback = None, hoverBitmap = None, disabledBitmap = None, show = True, iconOnly = False):
btn = PFBaseButton(btnBitmap, label, clickCallback, hoverBitmap, disabledBitmap, show, iconOnly)
def AddButton(self, btnBitmap, label = "", clickCallback = None, hoverBitmap = None, disabledBitmap = None, show = True):
btn = PFBaseButton(btnBitmap, label, clickCallback, hoverBitmap, disabledBitmap, show)
self.buttons.append(btn)
return btn
@@ -121,8 +120,7 @@ class PFToolbar(object):
if not state & BTN_HOVER:
button.SetState(state | BTN_HOVER)
self.hoverLabel = button.GetLabel()
if not button.iconOnly:
self.Parent.SetCursor(wx.StockCursor(wx.CURSOR_HAND))
self.Parent.SetCursor(wx.StockCursor(wx.CURSOR_HAND))
doRefresh = True
else:
if state & BTN_HOVER:
@@ -140,8 +138,6 @@ class PFToolbar(object):
mx,my = event.GetPosition()
bx = self.toolbarX
for button in self.buttons:
if button.iconOnly:
return
if not button.IsVisible():
continue

12
gui/shipBrowser.py
View File

@@ -1369,11 +1369,10 @@ class FitItem(SFItem.SFBrowserItem):
self.fitMenu.AppendMenu(wx.ID_ANY, 'Set Booster', boosterMenu)
self.mainFrame.additionsPane.gangPage.draggedFitID = self.fitID
self.boosterBmp = bitmapLoader.getBitmap("fleet_fc_small", "icons")
self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "icons")
self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "icons")
self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","icons")
self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "icons")
self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "icons")
self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "icons")
self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","icons")
self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "icons")
self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","icons")
@@ -1400,7 +1399,6 @@ class FitItem(SFItem.SFBrowserItem):
self.SetDraggable()
self.boosterBtn = self.toolbar.AddButton(self.boosterBmp,"Booster", show=self.fitBooster, iconOnly=True)
self.toolbar.AddButton(self.copyBmp,"Copy", self.copyBtnCB)
self.renameBtn = self.toolbar.AddButton(self.renameBmp,"Rename", self.renameBtnCB)
self.toolbar.AddButton(self.deleteBmp, "Delete", self.deleteBtnCB)
@@ -1451,7 +1449,7 @@ class FitItem(SFItem.SFBrowserItem):
sFit = service.Fit.getInstance()
sFit.toggleBoostFit(self.fitID)
self.fitBooster = not self.fitBooster
self.boosterBtn.Show(self.fitBooster)
self.fitMenu.Check(self.toggleItem.GetId(), self.fitBooster)
wx.PostEvent(self.mainFrame, BoosterListUpdated())
event.Skip()