From 473f232f4c5f97807a1cc280f7c2cc41dccb757a Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Thu, 21 Oct 2010 14:06:09 +0200 Subject: [PATCH] Rename Implant Checkbox to Activity Checkbox, seeing as it works for everything with an active attribute --- gui/boosterView.py | 6 +++--- gui/builtinViewColumns/__init__.py | 2 +- .../{implantCheckbox.py => activityCheckbox.py} | 6 +++--- gui/implantView.py | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename gui/builtinViewColumns/{implantCheckbox.py => activityCheckbox.py} (92%) diff --git a/gui/boosterView.py b/gui/boosterView.py index 0b2d4cfb5..4b61034cc 100644 --- a/gui/boosterView.py +++ b/gui/boosterView.py @@ -22,10 +22,10 @@ import service import gui.display as d import gui.fittingView as fv import gui.marketBrowser as mb -from gui.builtinViewColumns.implantCheckbox import ImplantCheckbox +from gui.builtinViewColumns.activityCheckbox import ActivityCheckbox class BoosterView(d.Display): - DEFAULT_COLS = ["Implant Checkbox", + DEFAULT_COLS = ["Activity Checkbox", "Name", "attr:boosterness"] @@ -67,7 +67,7 @@ class BoosterView(d.Display): row, _ = self.HitTest(event.Position) if row != -1: col = self.getColumn(event.Position) - if col == self.getColIndex(ImplantCheckbox): + if col == self.getColIndex(ActivityCheckbox): fitID = self.mainFrame.getActiveFit() cFit = service.Fit.getInstance() cFit.toggleBooster(fitID, row) diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py index 0ed5e8293..9aca80794 100644 --- a/gui/builtinViewColumns/__init__.py +++ b/gui/builtinViewColumns/__init__.py @@ -1,3 +1,3 @@ __all__ = ["moduleState", "moduleNameOrSlot", "attributeDisplay", "maxRange", "name", "droneDps", "droneNameAmount", "droneCheckbox", "moduleAmmo", - "capacitorUse", "implantCheckbox"] + "capacitorUse", "activityCheckbox"] diff --git a/gui/builtinViewColumns/implantCheckbox.py b/gui/builtinViewColumns/activityCheckbox.py similarity index 92% rename from gui/builtinViewColumns/implantCheckbox.py rename to gui/builtinViewColumns/activityCheckbox.py index 55848969f..62829086f 100644 --- a/gui/builtinViewColumns/implantCheckbox.py +++ b/gui/builtinViewColumns/activityCheckbox.py @@ -22,8 +22,8 @@ from gui.viewColumn import ViewColumn import gui.mainFrame import wx -class ImplantCheckbox(ViewColumn): - name = "Implant Checkbox" +class ActivityCheckbox(ViewColumn): + name = "Activity Checkbox" def __init__(self, fittingView, params): ViewColumn.__init__(self, fittingView) self.resizable = False @@ -44,4 +44,4 @@ class ImplantCheckbox(ViewColumn): def getImageId(self, implant): return self.checkedId if implant.active else self.uncheckedId -ImplantCheckbox.register() +ActivityCheckbox.register() diff --git a/gui/implantView.py b/gui/implantView.py index 6b061de21..fe98cef34 100644 --- a/gui/implantView.py +++ b/gui/implantView.py @@ -22,10 +22,10 @@ import service import gui.display as d import gui.fittingView as fv import gui.marketBrowser as mb -from gui.builtinViewColumns.implantCheckbox import ImplantCheckbox +from gui.builtinViewColumns.activityCheckbox import ActivityCheckbox class ImplantView(d.Display): - DEFAULT_COLS = ["Implant Checkbox", + DEFAULT_COLS = ["Activity Checkbox", "Name", "attr:implantness"] @@ -79,7 +79,7 @@ class ImplantView(d.Display): row, _ = self.HitTest(event.Position) if row != -1: col = self.getColumn(event.Position) - if col == self.getColIndex(ImplantCheckbox): + if col == self.getColIndex(ActivityCheckbox): fitID = self.mainFrame.getActiveFit() cFit = service.Fit.getInstance() cFit.toggleImplant(fitID, row)