From 90e592beb7eb94b66f14f539ee87f8c3df8ebc75 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Thu, 21 Oct 2010 15:23:37 +0200 Subject: [PATCH] Implement context menus in booster, drone & implant views --- gui/boosterView.py | 19 +++++++++++++++++++ gui/builtinContextMenus/itemStats.py | 2 +- gui/droneView.py | 20 ++++++++++++++++++++ gui/implantView.py | 20 ++++++++++++++++++++ 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/gui/boosterView.py b/gui/boosterView.py index e40ff0f1c..41fdcf720 100644 --- a/gui/boosterView.py +++ b/gui/boosterView.py @@ -23,6 +23,7 @@ import gui.display as d import gui.fittingView as fv import gui.marketBrowser as mb from gui.builtinViewColumns.activityCheckbox import ActivityCheckbox +from gui.contextMenu import ContextMenu class BoosterView(d.Display): DEFAULT_COLS = ["Activity Checkbox", @@ -35,6 +36,10 @@ class BoosterView(d.Display): self.mainFrame.Bind(mb.ITEM_SELECTED, self.addItem) self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem) self.Bind(wx.EVT_LEFT_DOWN, self.click) + if "__WXGTK__" in wx.PlatformInfo: + self.Bind(wx.EVT_RIGHT_UP, self.scheduleMenu) + else: + self.Bind(wx.EVT_RIGHT_DOWN, self.scheduleMenu) def fitChanged(self, event): cFit = service.Fit.getInstance() @@ -74,3 +79,17 @@ class BoosterView(d.Display): cFit.toggleBooster(fitID, row) wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + + def scheduleMenu(self, event): + event.Skip() + if self.getColumn(event.Position) != self.getColIndex(ActivityCheckbox): + wx.CallAfter(self.spawnMenu) + + def spawnMenu(self): + sel = self.GetFirstSelected() + if sel != -1: + cFit = service.Fit.getInstance() + fit = cFit.getFit(self.mainFrame.getActiveFit()) + + menu = ContextMenu.getMenu((fit.boosters[sel],), "booster") + self.PopupMenu(menu) diff --git a/gui/builtinContextMenus/itemStats.py b/gui/builtinContextMenus/itemStats.py index c4a140dda..4b8c84de1 100644 --- a/gui/builtinContextMenus/itemStats.py +++ b/gui/builtinContextMenus/itemStats.py @@ -8,7 +8,7 @@ class ItemStats(ContextMenu): self.mainFrame = gui.mainFrame.MainFrame.getInstance() def display(self, context, selection): - return context in ("item", "ship", "module", "ammo", "skill", "itemSearch") + return context in ("item", "ship", "module", "ammo", "skill", "itemSearch", "drone", "implant", "booster") def getText(self, context, selection): return "%s stats" % (context.capitalize() if context != "itemSearch" else "Item") diff --git a/gui/droneView.py b/gui/droneView.py index 47f3893ae..8e9517356 100644 --- a/gui/droneView.py +++ b/gui/droneView.py @@ -24,6 +24,7 @@ import gui.fittingView as fv import gui.marketBrowser as mb import gui.display as d from gui.builtinViewColumns.droneCheckbox import DroneCheckbox +from gui.contextMenu import ContextMenu class DroneView(d.Display): DEFAULT_COLS = ["Drone Checkbox", @@ -39,6 +40,10 @@ class DroneView(d.Display): self.mainFrame.Bind(mb.ITEM_SELECTED, self.addItem) self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem) self.Bind(wx.EVT_LEFT_DOWN, self.click) + if "__WXGTK__" in wx.PlatformInfo: + self.Bind(wx.EVT_RIGHT_UP, self.scheduleMenu) + else: + self.Bind(wx.EVT_RIGHT_DOWN, self.scheduleMenu) def fitChanged(self, event): cFit = service.Fit.getInstance() @@ -70,6 +75,7 @@ class DroneView(d.Display): wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) def click(self, event): + event.Skip() row, _ = self.HitTest(event.Position) if row != -1: col = self.getColumn(event.Position) @@ -78,3 +84,17 @@ class DroneView(d.Display): cFit = service.Fit.getInstance() cFit.toggleDrone(fitID, row) wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + + def scheduleMenu(self, event): + event.Skip() + if self.getColumn(event.Position) != self.getColIndex(DroneCheckbox): + wx.CallAfter(self.spawnMenu) + + def spawnMenu(self): + sel = self.GetFirstSelected() + if sel != -1: + cFit = service.Fit.getInstance() + fit = cFit.getFit(self.mainFrame.getActiveFit()) + + menu = ContextMenu.getMenu((fit.drones[sel],), "drone") + self.PopupMenu(menu) diff --git a/gui/implantView.py b/gui/implantView.py index aeb244789..b207f2ca5 100644 --- a/gui/implantView.py +++ b/gui/implantView.py @@ -23,6 +23,7 @@ import gui.display as d import gui.fittingView as fv import gui.marketBrowser as mb from gui.builtinViewColumns.activityCheckbox import ActivityCheckbox +from gui.contextMenu import ContextMenu class ImplantView(d.Display): DEFAULT_COLS = ["Activity Checkbox", @@ -36,6 +37,10 @@ class ImplantView(d.Display): self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem) self.Bind(wx.EVT_KEY_UP, self.kbEvent) self.Bind(wx.EVT_LEFT_DOWN, self.click) + if "__WXGTK__" in wx.PlatformInfo: + self.Bind(wx.EVT_RIGHT_UP, self.scheduleMenu) + else: + self.Bind(wx.EVT_RIGHT_DOWN, self.scheduleMenu) def kbEvent(self,event): keycode = event.GetKeyCode() @@ -85,3 +90,18 @@ class ImplantView(d.Display): cFit = service.Fit.getInstance() cFit.toggleImplant(fitID, row) wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + + def scheduleMenu(self, event): + event.Skip() + if self.getColumn(event.Position) != self.getColIndex(ActivityCheckbox): + wx.CallAfter(self.spawnMenu) + + def spawnMenu(self): + sel = self.GetFirstSelected() + if sel != -1: + cFit = service.Fit.getInstance() + fit = cFit.getFit(self.mainFrame.getActiveFit()) + + menu = ContextMenu.getMenu((fit.implants[sel],), "implant") + self.PopupMenu(menu) +