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

Feature Added Remove <item> from Context Menu

Browse Source
This commit is contained in:
Master3See
2013-07-30 20:06:32 -06:00
parent 96bb1b197e
commit 0a162b30e6
22 changed files with 103 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gui/boosterView.py
View File

@@ -50,12 +50,9 @@ class BoosterView(d.Display):
def kbEvent(self,event):
keycode = event.GetKeyCode()
if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
row = self.GetFirstSelected()
if row != -1:
cFit.removeBooster(fitID, self.GetItemData(row))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.removeBooster(self.boosters[self.GetItemData(row)])
event.Skip()
@@ -71,7 +68,8 @@ class BoosterView(d.Display):
sFit = service.Fit.getInstance()
fit = sFit.getFit(event.fitID)
stuff = fit.boosters if fit is not None else None
self.origional = fit.boosters if fit is not None else None
self.boosters = stuff = fit.boosters[:] if fit is not None else None
if event.fitID != self.lastFitId:
self.lastFitId = event.fitID
@@ -102,10 +100,13 @@ class BoosterView(d.Display):
if row != -1:
col = self.getColumn(event.Position)
if col != self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeBooster(fitID, self.GetItemData(row))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.removeBooster(self.boosters[self.GetItemData(row)])
def removeBooster(self, booster):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeBooster(fitID, self.origional.index(booster))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def click(self, event):
event.Skip()
@@ -133,5 +134,5 @@ class BoosterView(d.Display):
srcContext = "boosterItem"
itemContext = "Booster"
menu = ContextMenu.getMenu((item,), (srcContext, itemContext))
menu = ContextMenu.getMenu(self, (item,), (srcContext, itemContext))
self.PopupMenu(menu)

2
gui/builtinContextMenus/__init__.py
View File

@@ -1,2 +1,2 @@
__all__ = ["moduleAmmoPicker", "itemStats", "damagePattern", "marketJump", "droneSplit",
__all__ = ["itemRemove", "moduleAmmoPicker", "itemStats", "damagePattern", "marketJump", "droneSplit",
"ammoPattern", "project", "factorReload", "whProjector"]

3
gui/builtinContextMenus/ammoPattern.py
View File

@@ -5,8 +5,9 @@ import wx
import gui.globalEvents as GE
class AmmoPattern(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):

3
gui/builtinContextMenus/damagePattern.py
View File

@@ -6,8 +6,9 @@ import wx
from gui import bitmapLoader
class DamagePattern(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
return srcContext in ("resistancesViewFull",) and self.mainFrame.getActiveFit() is not None

3
gui/builtinContextMenus/droneSplit.py
View File

@@ -6,8 +6,9 @@ import service
import wx
class DroneSplit(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
return srcContext in ("droneItem", "projectedDrone") and selection[0].amount > 1

3
gui/builtinContextMenus/factorReload.py
View File

@@ -6,8 +6,9 @@ import wx
from gui import bitmapLoader
class FactorReload(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
return srcContext in ("firepowerViewFull",) and self.mainFrame.getActiveFit() is not None

31
gui/builtinContextMenus/itemRemove.py Normal file
View File

@@ -0,0 +1,31 @@
from gui.contextMenu import ContextMenu
import gui.mainFrame
class ItemRemove(ContextMenu):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
return srcContext in ("fittingModule", "droneItem", "implantItem", "boosterItem")
def getText(self, itmContext, selection):
return "Remove {0}".format(itmContext if itmContext is not None else "Item")
def activate(self, fullContext, selection, i):
srcContext = fullContext[0]
if srcContext == "fittingModule":
for module in selection:
if module is not None: self.parent.removeModule(module)
elif srcContext == "droneItem":
for drone in selection:
if drone is not None: self.parent.removeDrone(drone)
elif srcContext == "implantItem":
for implant in selection:
if implant is not None: self.parent.removeImplant(implant)
elif srcContext == "boosterItem":
for booster in selection:
if booster is not None: self.parent.removeBooster(booster)
ItemRemove.register()

3
gui/builtinContextMenus/itemStats.py
View File

@@ -5,8 +5,9 @@ import service
import wx
class ItemStats(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
return srcContext in ("marketItemGroup", "marketItemMisc", "fittingModule", "fittingCharge", "fittingShip", "baseShip",

3
gui/builtinContextMenus/marketJump.py
View File

@@ -4,8 +4,9 @@ import gui.mainFrame
import service
class MarketJump(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
validContexts = ("marketItemMisc", "fittingModule", "fittingCharge", "droneItem", "implantItem",

3
gui/builtinContextMenus/moduleAmmoPicker.py
View File

@@ -7,8 +7,9 @@ from eos.types import Hardpoint
import gui.globalEvents as GE
class ModuleAmmoPicker(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule", "projectedModule"):

3
gui/builtinContextMenus/project.py
View File

@@ -5,8 +5,9 @@ import gui.globalEvents as GE
import wx
class Project(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None:

3
gui/builtinContextMenus/whProjector.py
View File

@@ -5,8 +5,9 @@ import service
import wx
class WhProjector(ContextMenu):
def __init__(self):
def __init__(self, parent):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.parent = parent
def display(self, srcContext, selection):
return srcContext in ("projectedDrone", "projectedModule", "projectedCharge", "projectedFit", "projectedNone")

28
gui/builtinViews/fittingView.py
View File

@@ -227,15 +227,10 @@ class FittingView(d.Display):
row = self.GetFirstSelected()
firstSel = row
while row != -1:
cFit = service.Fit.getInstance()
populate = cFit.removeModule(self.activeFitID, self.mods[self.GetItemData(row)].position)
self.removeModule(self.mods[row])
self.Select(row,0)
row = self.GetNextSelected(row)
if populate is not None:
self.Select(firstSel)
if populate: self.slotsChanged()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
event.Skip()
def fitRemoved(self, event):
@@ -305,16 +300,19 @@ class FittingView(d.Display):
if row != -1:
col = self.getColumn(event.Position)
if col != self.getColIndex(State):
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.activeFitID)
populate = cFit.removeModule(self.activeFitID, fit.modules.index(self.mods[self.GetItemData(row)]))
if populate is not None:
if populate: self.slotsChanged()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
self.removeModule(self.mods[row])
else:
if "wxMSW" in wx.PlatformInfo:
self.click(event)
def removeModule(self, module):
cFit = service.Fit.getInstance()
fit = cFit.getFit(self.activeFitID)
populate = cFit.removeModule(self.activeFitID, fit.modules.index(module))
if populate is not None:
if populate: self.slotsChanged()
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
def swapItems(self, x, y, itemID):
mstate = wx.GetMouseState()
@@ -419,7 +417,7 @@ class FittingView(d.Display):
contexts.append(("fittingShip", "Ship"))
menu = ContextMenu.getMenu(selection, *contexts)
menu = ContextMenu.getMenu(self, selection, *contexts)
self.PopupMenu(menu)
def click(self, event):

4
gui/characterEditor.py
View File

@@ -304,8 +304,8 @@ class SkillTreeView (wx.Panel):
srcContext = "skillItem"
itemContext = "Skill"
context = (srcContext, itemContext)
self.statsMenu = ContextMenu.getMenu(None, context)
self.levelChangeMenu = ContextMenu.getMenu(None, context) or wx.Menu()
self.statsMenu = ContextMenu.getMenu(self, None, context)
self.levelChangeMenu = ContextMenu.getMenu(self, None, context) or wx.Menu()
self.levelChangeMenu.AppendSeparator()
self.levelIds = {}

4
gui/contextMenu.py
View File

@@ -26,7 +26,7 @@ class ContextMenu(object):
ContextMenu.menus.append(cls)
@classmethod
def getMenu(cls, selection, *fullContexts):
def getMenu(cls, parent, selection, *fullContexts):
menu = wx.Menu()
menu.info = {}
menu.selection = selection
@@ -40,7 +40,7 @@ class ContextMenu(object):
except IndexError:
itmContext = None
for menuHandler in cls.menus:
m = menuHandler()
m = menuHandler(parent)
if m.display(srcContext, selection):
amount += 1
texts = m.getText(itmContext, selection)

4
gui/display.py
View File

@@ -78,7 +78,7 @@ class Display(wx.ListCtrl):
"""
Return a tuple indicating which (item, subItem) the given pt (client coordinates) is over.
This uses the buildin version on Windows, and poor mans replacement on other platforms.
This uses the built-in version on Windows, and poor mans replacement on other platforms.
"""
# The buildin version works on Windows
@@ -124,7 +124,7 @@ class Display(wx.ListCtrl):
bottomItem = topItem + self.GetCountPerPage()
if bottomItem >= self.GetItemCount():
bottomItem = self.GetItemCount() - 1
bottomItem = self.GetItemCount() - 1
topRect = self.GetItemRect(topItem, wx.LIST_RECT_LABEL)
bottomRect = self.GetItemRect(bottomItem, wx.LIST_RECT_BOUNDS)

18
gui/droneView.py
View File

@@ -107,11 +107,8 @@ class DroneView(d.Display):
row = self.GetFirstSelected()
firstSel = row
if row != -1:
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
drone = self.drones[self.GetItemData(row)]
cFit.removeDrone(fitID, self.original.index(drone))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.removeDrone(drone)
event.Skip()
@@ -197,11 +194,14 @@ class DroneView(d.Display):
if row != -1:
col = self.getColumn(event.Position)
if col != self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
drone = self.drones[self.GetItemData(row)]
cFit.removeDrone(fitID, self.original.index(drone))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.removeDrone(drone)
def removeDrone(self, drone):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeDrone(fitID, self.original.index(drone))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def click(self, event):
event.Skip()
@@ -228,5 +228,5 @@ class DroneView(d.Display):
sMkt = service.Market.getInstance()
sourceContext = "droneItem"
itemContext = sMkt.getCategoryByItem(drone.item).name
menu = ContextMenu.getMenu((drone,), (sourceContext, itemContext))
menu = ContextMenu.getMenu(self, (drone,), (sourceContext, itemContext))
self.PopupMenu(menu)

19
gui/implantView.py
View File

@@ -48,12 +48,9 @@ class ImplantView(d.Display):
def kbEvent(self,event):
keycode = event.GetKeyCode()
if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
row = self.GetFirstSelected()
if row != -1:
cFit.removeImplant(fitID, self.GetItemData(row))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.removeImplant(self.implants[self.GetItemData(row)])
event.Skip()
def fitChanged(self, event):
@@ -100,11 +97,13 @@ class ImplantView(d.Display):
if row != -1:
col = self.getColumn(event.Position)
if col != self.getColIndex(State):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
implant = self.implants[self.GetItemData(row)]
cFit.removeImplant(fitID, self.original.index(implant))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
self.removeImplant(self.implants[self.GetItemData(row)])
def removeImplant(self, implant):
fitID = self.mainFrame.getActiveFit()
cFit = service.Fit.getInstance()
cFit.removeImplant(fitID, self.original.index(implant))
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
def click(self, event):
event.Skip()
@@ -133,5 +132,5 @@ class ImplantView(d.Display):
sourceContext = "implantItem"
itemContext = sMkt.getCategoryByItem(implant.item).name
menu = ContextMenu.getMenu((implant,), (sourceContext, itemContext))
menu = ContextMenu.getMenu(self, (implant,), (sourceContext, itemContext))
self.PopupMenu(menu)

2
gui/marketBrowser.py
View File

@@ -397,7 +397,7 @@ class ItemView(d.Display):
sourceContext = "marketItemGroup" if self.marketBrowser.searchMode is False else "marketItemMisc"
itemContext = sMkt.getCategoryByItem(item).name
menu = ContextMenu.getMenu((item,), (sourceContext, itemContext))
menu = ContextMenu.getMenu(self, (item,), (sourceContext, itemContext))
self.PopupMenu(menu)
def populate(self, items):

4
gui/projectedView.py
View File

@@ -201,7 +201,7 @@ class ProjectedView(d.Display):
context = (modFullContext,)
else:
context = (("projectedFit",),)
menu = ContextMenu.getMenu((item,), *context)
menu = ContextMenu.getMenu(self, (item,), *context)
if menu is not None:
self.PopupMenu(menu)
elif row == -1 and event.Button == 3:
@@ -209,7 +209,7 @@ class ProjectedView(d.Display):
if fitID is None:
return
context = (("projectedNone",),)
menu = ContextMenu.getMenu([], *context)
menu = ContextMenu.getMenu(self, [], *context)
if menu is not None:
self.PopupMenu(menu)

2
gui/shipBrowser.py
View File

@@ -1085,7 +1085,7 @@ class ShipItem(SFItem.SFBrowserItem):
pos = self.ScreenToClient(pos)
contexts = []
contexts.append(("baseShip", "Ship Basic"))
menu = ContextMenu.getMenu(self.baseItem, *contexts)
menu = ContextMenu.getMenu(self, self.baseItem, *contexts)
self.PopupMenu(menu, pos)
def OnTimer(self, event):

2
gui/statsPane.py
View File

@@ -92,7 +92,7 @@ class StatsPane(wx.Panel):
def contextHandler(self, contentPanel):
viewName = contentPanel.viewName
def handler(event):
menu = ContextMenu.getMenu(None, (viewName,))
menu = ContextMenu.getMenu(self, None, (viewName,))
if menu is not None:
contentPanel.PopupMenu(menu)