From 9b8b7aba072cefaf144d060673d7753d57e1cb56 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 12 Jan 2015 23:37:40 -0500 Subject: [PATCH] Add module state information to state tooltip --- gui/builtinViewColumns/state.py | 4 ++++ gui/builtinViews/fittingView.py | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py index 01e93e4f6..d26c46443 100644 --- a/gui/builtinViewColumns/state.py +++ b/gui/builtinViewColumns/state.py @@ -44,6 +44,10 @@ class State(ViewColumn): def getText(self, mod): return "" + def getToolTip(self, mod): + if isinstance(mod, Module) and not mod.isEmpty: + return State_.getName(mod.state).title() + def getImageId(self, stuff): if isinstance(stuff, Drone): return self.checkedId if stuff.amountActive > 0 else self.uncheckedId diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 8e3db0836..76c291cdd 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -523,13 +523,18 @@ class FittingView(d.Display): ctrl = wx.GetMouseState().CmdDown() or wx.GetMouseState().MiddleDown() click = "ctrl" if ctrl is True else "right" if event.Button == 3 else "left" sFit.toggleModulesState(fitID, self.mods[self.GetItemData(row)], mods, click) + + # update state tooltip + tooltip = self.activeColumns[col].getToolTip(self.mods[self.GetItemData(row)]) + self.SetToolTipString(tooltip) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) else: event.Skip() - slotColourMap = {1: wx.Colour(250, 235, 204), # yellow = low slots - 2: wx.Colour(188,215,241), # blue = mid slots - 3: wx.Colour(235,204,209), # red = high slots + slotColourMap = {1: wx.Colour(250, 235, 204), # yellow = low slots + 2: wx.Colour(188, 215, 241), # blue = mid slots + 3: wx.Colour(235, 204, 209), # red = high slots 4: '', 5: ''}