make Omega icons disabled by default

Author: Skybladev2

gui/builtinMarketBrowser/itemView.py

@@ -6,6 +6,7 @@
 from config import slotColourMap, slotColourMapDark
 from eos.saveddata.module import Module
 from gui.builtinMarketBrowser.events import ItemSelected, RECENTLY_USED_MODULES, CHARGES_FOR_FIT
+from gui.builtinViewColumns.omega import Omega as OmegaCol
 from gui.contextMenu import ContextMenu
 from gui.display import Display
 from gui.utils.staticHelpers import DragDropHelper
@@ -59,6 +60,15 @@ def __init__(self, parent, marketBrowser):
         self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
 
         self.active = []
+        self.updateOmegaColumn()
+
+    def updateOmegaColumn(self):
+        show = Fit.getInstance().serviceFittingOptions["showOmegaIcons"]
+        omega_idx = self.getColIndex(OmegaCol)
+        if show and omega_idx is None:
+            self.insertColumnBySpec(0, "Omega")
+        elif not show and omega_idx is not None:
+            self.removeColumn(self.activeColumns[omega_idx])
 
     def delaySearch(self, evt):
         sFit = Fit.getInstance()

gui/builtinPreferenceViews/pyfaGeneralPreferences.py

@@ -141,6 +141,14 @@ def langDisplay(langInfo):
                                                     wx.DefaultPosition, wx.DefaultSize, 0)
         mainSizer.Add(self.cbShowShipBrowserTooltip, 0, wx.ALL | wx.EXPAND, 5)
 
+        self.cbShowOmegaIcons = wx.CheckBox(panel, wx.ID_ANY, _t("Show Omega icons for hulls and modules"),
+                                            wx.DefaultPosition, wx.DefaultSize, 0)
+        if "wxGTK" not in wx.PlatformInfo:
+            self.cbShowOmegaIcons.SetCursor(helpCursor)
+        self.cbShowOmegaIcons.SetToolTip(wx.ToolTip(
+                _t('Shows icons for items that require Omega clone access.')))
+        mainSizer.Add(self.cbShowOmegaIcons, 0, wx.ALL | wx.EXPAND, 5)
+
         self.cbReloadAll = wx.CheckBox(panel, wx.ID_ANY, _t("Change charge in all modules of the same type"),
                                        wx.DefaultPosition, wx.DefaultSize, 0)
         if "wxGTK" not in wx.PlatformInfo:
@@ -176,6 +184,7 @@ def langDisplay(langInfo):
         self.cbGaugeAnimation.SetValue(self.sFit.serviceFittingOptions["enableGaugeAnimation"])
         self.cbOpenFitInNew.SetValue(self.sFit.serviceFittingOptions["openFitInNew"])
         self.cbShowShipBrowserTooltip.SetValue(self.sFit.serviceFittingOptions["showShipBrowserTooltip"])
+        self.cbShowOmegaIcons.SetValue(self.sFit.serviceFittingOptions["showOmegaIcons"])
         self.cbReloadAll.SetValue(self.sFit.serviceFittingOptions["ammoChangeAll"])
         self.cbExpMutants.SetValue(self.sFit.serviceFittingOptions["expandedMutantNames"])
         self.rbAddLabels.SetSelection(self.sFit.serviceFittingOptions["additionsLabels"])
@@ -192,6 +201,7 @@ def langDisplay(langInfo):
         self.cbGaugeAnimation.Bind(wx.EVT_CHECKBOX, self.onCBGaugeAnimation)
         self.cbOpenFitInNew.Bind(wx.EVT_CHECKBOX, self.onCBOpenFitInNew)
         self.cbShowShipBrowserTooltip.Bind(wx.EVT_CHECKBOX, self.onCBShowShipBrowserTooltip)
+        self.cbShowOmegaIcons.Bind(wx.EVT_CHECKBOX, self.onCBShowOmegaIcons)
         self.cbReloadAll.Bind(wx.EVT_CHECKBOX, self.onCBReloadAll)
         self.cbExpMutants.Bind(wx.EVT_CHECKBOX, self.onCBExpMutants)
 
@@ -273,6 +283,25 @@ def onCBOpenFitInNew(self, event):
     def onCBShowShipBrowserTooltip(self, event):
         self.sFit.serviceFittingOptions["showShipBrowserTooltip"] = self.cbShowShipBrowserTooltip.GetValue()
 
+    def onCBShowOmegaIcons(self, event):
+        self.sFit.serviceFittingOptions["showOmegaIcons"] = self.cbShowOmegaIcons.GetValue()
+
+        from gui.builtinViews.fittingView import FittingView
+        for page in self.mainFrame.fitMultiSwitch._pages:
+            if isinstance(page, FittingView):
+                page.updateOmegaColumn()
+
+        iView = self.mainFrame.marketBrowser.itemView
+        iView.updateOmegaColumn()
+        if iView.active:
+            iView.update(iView.active)
+
+        fitID = self.mainFrame.getActiveFit()
+        if fitID is not None:
+            wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
+
+        event.Skip()
+
     def onCBReloadAll(self, event):
         self.sFit.serviceFittingOptions["ammoChangeAll"] = self.cbReloadAll.GetValue()
 

gui/builtinShipBrowser/shipItem.py

@@ -94,8 +94,6 @@ def __init__(self, parent, shipID=None, shipFittingInfo=("Test", "TestTrait", 2)
         self.baseItem = self.marketInstance.getItem(self.shipID)
 
         self.omegaBmp = None
-        if self.baseItem.getAttribute("cloneGradeRestriction", 0) > 0:
-            self.omegaBmp = BitmapLoader.getBitmap("25874", "icons")
 
         # =====================================================================
         # DISABLED - it will be added as an option in PREFERENCES
@@ -215,9 +213,13 @@ def UpdateElementsPos(self, mdc):
         self.raceBmpx = self.shipEffx + self.shipEffBk.GetWidth() + self.padding
         self.raceBmpy = (rect.height - self.raceBmp.GetHeight()) / 2
 
-        self.omegaBmpx = self.raceBmpx + self.raceBmp.GetWidth() + self.padding
+        sFit = Fit.getInstance()
+        self.omegaBmp = None
+        if sFit.serviceFittingOptions["showOmegaIcons"] and self.baseItem.getAttribute("cloneGradeRestriction", 0) > 0:
+            self.omegaBmp = BitmapLoader.getBitmap("25874", "icons")
         omegaWidth = self.omegaBmp.GetWidth() if self.omegaBmp else 0
         omegaHeight = self.omegaBmp.GetHeight() if self.omegaBmp else 0
+        self.omegaBmpx = self.raceBmpx + self.raceBmp.GetWidth() + self.padding
         self.omegaBmpy = (rect.height - omegaHeight) / 2
 
         self.textStartx = self.omegaBmpx + omegaWidth + self.padding

gui/builtinViews/fittingView.py

@@ -35,6 +35,7 @@
 from gui.bitmap_loader import BitmapLoader
 from gui.builtinMarketBrowser.events import ITEM_SELECTED
 from gui.builtinShipBrowser.events import EVT_FIT_SELECTED, FitSelected
+from gui.builtinViewColumns.omega import Omega as OmegaCol
 from gui.builtinViewColumns.state import State
 from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED
 from gui.contextMenu import ContextMenu
@@ -154,6 +155,7 @@ class FittingView(d.Display):
 
     def __init__(self, parent):
         d.Display.__init__(self, parent, size=(0, 0), style=wx.BORDER_NONE)
+        self.updateOmegaColumn()
         self.Show(False)
         self.parent = parent
         self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
@@ -185,6 +187,14 @@ def __init__(self, parent):
         pyfalog.debug("------------------ new fitting view -------------------")
         pyfalog.debug(self)
 
+    def updateOmegaColumn(self):
+        show = Fit.getInstance().serviceFittingOptions["showOmegaIcons"]
+        omega_idx = self.getColIndex(OmegaCol)
+        if show and omega_idx is None:
+            self.insertColumnBySpec(1, "Omega")
+        elif not show and omega_idx is not None:
+            self.removeColumn(self.activeColumns[omega_idx])
+
     def OnLeaveWindow(self, event):
         self.SetToolTip(None)
         self.hoveredRow = None

gui/display.py

@@ -88,7 +88,7 @@ def HitTestSubItem(self, pt):
 
     # noinspection PyPropertyAccess
     def addColumn(self, i, col):
-        self.activeColumns.append(col)
+        self.activeColumns.insert(i, col)
         info = wx.ListItem()
         info.SetMask(col.mask | wx.LIST_MASK_FORMAT)
         if col.imageId not in (None, -1):
@@ -124,7 +124,7 @@ def insertColumnBySpec(self, i, colSpec):
             col = ViewColumn.getColumn(colSpec)(self, None)
 
         self.addColumn(i, col)
-        self.columnsMinWidth.append(self.GetColumnWidth(i))
+        self.columnsMinWidth.insert(i, self.GetColumnWidth(i))
 
     def removeColumn(self, col):
         i = self.getColIndex(type(col))

service/fit.py

@@ -94,6 +94,7 @@ def __init__(self):
             "ammoChangeAll": False,
             "additionsLabels": 1,
             "expandedMutantNames": False,
+            "showOmegaIcons": False,
         }
 
         self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(