diff --git a/gui/builtinPreferenceViews/pyfaStatViewPreferences.py b/gui/builtinPreferenceViews/pyfaStatViewPreferences.py index 993dd89e1..e285568e6 100644 --- a/gui/builtinPreferenceViews/pyfaStatViewPreferences.py +++ b/gui/builtinPreferenceViews/pyfaStatViewPreferences.py @@ -98,8 +98,6 @@ class PFStatViewPref(PreferenceView): self.rbPrice.Bind(wx.EVT_RADIOBOX, self.OnPriceChange) self.rbOutgoing = wx.RadioBox(panel, -1, "Remote Reps", wx.DefaultPosition, wx.DefaultSize, ['None', 'Minimal', 'Full'], 1, wx.RA_SPECIFY_COLS) - # Disable minimal as we don't have a view for this yet - self.rbOutgoing .EnableItem(1, False) self.rbOutgoing.SetSelection(self.settings.get('outgoing')) rbSizerRow3.Add(self.rbOutgoing, 1, wx.TOP | wx.RIGHT, 5) self.rbOutgoing.Bind(wx.EVT_RADIOBOX, self.OnOutgoingChange) diff --git a/gui/builtinStatsViews/__init__.py b/gui/builtinStatsViews/__init__.py index 27cc3e1a2..be310c2ac 100644 --- a/gui/builtinStatsViews/__init__.py +++ b/gui/builtinStatsViews/__init__.py @@ -5,6 +5,7 @@ __all__ = [ "firepowerViewFull", "capacitorViewFull", "outgoingViewFull", + "outgoingViewMinimal", "targetingMiscViewMinimal", "priceViewFull", ] diff --git a/gui/builtinStatsViews/outgoingViewMinimal.py b/gui/builtinStatsViews/outgoingViewMinimal.py index 5df6140e7..70f7994dd 100644 --- a/gui/builtinStatsViews/outgoingViewMinimal.py +++ b/gui/builtinStatsViews/outgoingViewMinimal.py @@ -24,7 +24,7 @@ from gui.bitmapLoader import BitmapLoader from gui.utils.numberFormatter import formatAmount -class OutgoingViewFull(StatsView): +class OutgoingViewMinimal(StatsView): name = "outgoingViewMinimal" def __init__(self, parent): @@ -60,7 +60,7 @@ class OutgoingViewFull(StatsView): for outgoingType, label, image, tooltip in rr_list: baseBox = wx.BoxSizer(wx.VERTICAL) - baseBox.Add(BitmapLoader.getStaticBitmap("%s_big" % image, parent, "gui"), 0, wx.ALIGN_CENTER) + baseBox.Add(wx.StaticText(contentPanel, wx.ID_ANY, label), 0, wx.ALIGN_CENTER) if "Capacitor" in outgoingType: lbl = wx.StaticText(parent, wx.ID_ANY, u"0 GJ/s") @@ -103,4 +103,4 @@ class OutgoingViewFull(StatsView): self.headerPanel.Layout() -OutgoingViewFull.register() +OutgoingViewMinimal.register() diff --git a/gui/statsView.py b/gui/statsView.py index e8b614427..464359695 100644 --- a/gui/statsView.py +++ b/gui/statsView.py @@ -53,4 +53,5 @@ from gui.builtinStatsViews import ( # noqa: E402, F401 targetingMiscViewMinimal, priceViewFull, outgoingViewFull, + outgoingViewMinimal, )