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

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
HomeWorld
2010-10-31 15:26:29 +02:00
parent 951b62bec3 00fae270c1
commit eddcbb6c0c
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eos

Submodule eos updated: 592c9e046a...bbb44a9798

6
gui/builtinContextMenus/itemStats.py
View File

@@ -10,14 +10,16 @@ class ItemStats(ContextMenu):
def display(self, context, selection):
return context in ("item", "ship", "module", "ammo", "skill",
"itemSearch", "drone", "implant", "booster",
"projectedModule", "projectedDrone")
"projectedModule", "projectedDrone", "projectedAmmo")
def getText(self, context, selection):
return "%s stats" % (context.capitalize() if context not in self.REPLACES else self.REPLACES[context])
REPLACES = {"itemSearch": "Item",
"projectedModule": "Module",
"projectedDrone": "Drone"}
"projectedDrone": "Drone",
"projectedAmmo": "Ammo"}
def activate(self, context, selection, i):
if context == "ship":
fitID = self.mainFrame.getActiveFit()

12
gui/builtinContextMenus/marketJump.py
View File

@@ -8,16 +8,20 @@ class MarketJump(ContextMenu):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
def display(self, context, selection):
return context in ("module", "ammo", "itemSearch", "drone", "implant", "booster") \
return context in ("module", "ammo", "itemSearch", "drone", "implant", "booster", "projectedModule", "projectedDrone") \
and (not selection[0].isEmpty if context == "module" else True)
REPLACES = {"itemSearch": "Item",
"projectedModule": "Module",
"projectedDrone": "Drone"}
def getText(self, context, selection):
return "Jump to %s Market Group" % (context.capitalize() if context != "itemSearch" else "Item")
return "Jump to %s Market Group" % (context.capitalize() if context not in self.REPLACES else self.REPLACES[context])
def activate(self, context, selection, i):
if context in ("module", "drone", "implant", "booster"):
if context in ("module", "drone", "implant", "booster", "projectedModule", "projectedDrone"):
item = selection[0].item
elif context == "ammo":
elif context in ("ammo", "projectedAmmo"):
item = selection[0].charge
else:
item = selection[0]

2
gui/itemStats.py
View File

@@ -43,7 +43,7 @@ class ItemStatsDialog(wx.Dialog):
self.Destroy()
return
item = getattr(victim, "item", None) if context != "ammo" else getattr(victim, "charge", None)
item = getattr(victim, "item", None) if context.lower() not in ("projectedammo", "ammo") else getattr(victim, "charge", None)
if item is None:
sMarket = service.Market.getInstance()
item = sMarket.getItem(victim.ID)

11
gui/projectedView.py
View File

@@ -98,13 +98,16 @@ class ProjectedView(d.Display):
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
elif event.Button == 3:
if isinstance(item, eos.types.Drone):
context = "projectedDrone"
context = ("projectedDrone",)
elif isinstance(item, eos.types.Module):
context = "projectedModule"
if item.charge is not None:
context = ("projectedModule", "projectedAmmo")
else:
context = ("projectedModule",)
else:
context = "projectedFit"
context = ("projectedFit",)
menu = ContextMenu.getMenu((item,), context)
menu = ContextMenu.getMenu((item,), *context)
self.PopupMenu(menu)
def remove(self, event):