dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Merge pull request #1018 from Ebag333/Merge_New_Pane

Browse Source 
Changes required to implement the remote reps pane
This commit is contained in:
Ryan Holmes
2017-02-26 23:48:27 -05:00
committed by GitHub
parent dbffdedc92 370b58d500
commit c97a388fc4
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/builtinPreferenceViews/pyfaStatViewPreferences.py
View File

@@ -97,6 +97,10 @@ class PFStatViewPref(PreferenceView):
rbSizerRow3.Add(self.rbPrice, 1, wx.TOP | wx.RIGHT, 5) rbSizerRow3.Add(self.rbPrice, 1, wx.TOP | wx.RIGHT, 5)
self.rbPrice.Bind(wx.EVT_RADIOBOX, self.OnPriceChange) 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)
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)
# We don't have views for these.....yet # We don't have views for these.....yet
''' '''
self.rbMining = wx.RadioBox(panel, -1, "Mining", wx.DefaultPosition, wx.DefaultSize, self.rbMining = wx.RadioBox(panel, -1, "Mining", wx.DefaultPosition, wx.DefaultSize,
@@ -138,6 +142,9 @@ class PFStatViewPref(PreferenceView):
def OnPriceChange(self, event): def OnPriceChange(self, event):
self.settings.set('price', event.GetInt()) self.settings.set('price', event.GetInt())
def OnOutgoingChange(self, event):
self.settings.set('outgoing', event.GetInt())
def OnMiningYieldChange(self, event): def OnMiningYieldChange(self, event):
self.settings.set('miningyield', event.GetInt()) self.settings.set('miningyield', event.GetInt())

2
gui/builtinStatsViews/outgoingViewMinimal.py
View File

@@ -25,7 +25,7 @@ from gui.utils.numberFormatter import formatAmount
class OutgoingViewFull(StatsView): class OutgoingViewFull(StatsView):
name = "outgoingViewFull" name = "outgoingViewMinimal"
def __init__(self, parent): def __init__(self, parent):
StatsView.__init__(self) StatsView.__init__(self)

2
gui/statsPane.py
View File

@@ -40,7 +40,7 @@ class StatsPane(wx.Panel):
"resistances", "resistances",
"recharge", "recharge",
"firepower", "firepower",
"outgoingView", "outgoing",
"capacitor", "capacitor",
"targetingMisc", "targetingMisc",
"price", "price",

3
service/settings.py
View File

@@ -370,7 +370,8 @@ class StatViewSettings(object):
"targetingMisc": 1, "targetingMisc": 1,
"price" : 2, "price" : 2,
"miningyield" : 2, "miningyield" : 2,
"drones" : 2 "drones" : 2,
"outgoing" : 2,
} }
# We don't have these....yet # We don't have these....yet