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

Merge branch 'development' into MorePreferences

Browse Source
This commit is contained in:
blitzman
2017-03-26 13:52:59 -04:00
parent 9a284bc740 225011f2c1
commit b18bb200a9
58 changed files with 1032 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinPreferenceViews/pyfaContextMenuPreferences.py
View File

@@ -108,7 +108,7 @@ class PFContextMenuPref(PreferenceView):
self.settings.set('project', event.GetInt())
def getImage(self):
return BitmapLoader.getBitmap("pref-gauges_big", "gui")
return BitmapLoader.getBitmap("settings_menu", "gui")
PFContextMenuPref.register()

2
gui/builtinPreferenceViews/pyfaDatabasePreferences.py
View File

@@ -85,7 +85,7 @@ class PFGeneralPref(PreferenceView):
'''
def getImage(self):
return BitmapLoader.getBitmap("prefs_settings", "gui")
return BitmapLoader.getBitmap("settings_database", "gui")
def OnWindowLeave(self, event):
# We don't want to do anything when they leave,

2
gui/builtinPreferenceViews/pyfaEnginePreferences.py
View File

@@ -82,7 +82,7 @@ class PFFittingEnginePref(PreferenceView):
self.sFit.serviceFittingOptions["useStaticAdaptiveArmorHardener"] = self.cbUniversalAdaptiveArmorHardener.GetValue()
def getImage(self):
return BitmapLoader.getBitmap("prefs_settings", "gui")
return BitmapLoader.getBitmap("settings_fitting", "gui")
def OnWindowLeave(self, event):
# We don't want to do anything when they leave,

2
gui/builtinPreferenceViews/pyfaLoggingPreferences.py
View File

@@ -76,7 +76,7 @@ class PFGeneralPref(PreferenceView):
'''
def getImage(self):
return BitmapLoader.getBitmap("prefs_settings", "gui")
return BitmapLoader.getBitmap("settings_log", "gui")
PFGeneralPref.register()

13
gui/builtinPreferenceViews/pyfaStatViewPreferences.py
View File

@@ -81,7 +81,7 @@ class PFStatViewPref(PreferenceView):
self.rbMisc = wx.RadioBox(panel, -1, "Misc", wx.DefaultPosition, wx.DefaultSize, ['None', 'Minimal', 'Full'], 1, wx.RA_SPECIFY_COLS)
# Disable full as we don't have a view for this yet
self.rbMisc.EnableItem(2, False)
self.rbMisc.SetSelection(self.settings.get('targetingmisc'))
self.rbMisc.SetSelection(self.settings.get('targetingMisc'))
rbSizerRow2.Add(self.rbMisc, 1, wx.ALL, 5)
self.rbMisc.Bind(wx.EVT_RADIOBOX, self.OnTargetingMiscChange)
@@ -97,6 +97,10 @@ class PFStatViewPref(PreferenceView):
rbSizerRow3.Add(self.rbPrice, 1, wx.TOP | wx.RIGHT, 5)
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
'''
self.rbMining = wx.RadioBox(panel, -1, "Mining", wx.DefaultPosition, wx.DefaultSize,
@@ -133,11 +137,14 @@ class PFStatViewPref(PreferenceView):
self.settings.set('capacitor', event.GetInt())
def OnTargetingMiscChange(self, event):
self.settings.set('targetingmisc', event.GetInt())
self.settings.set('targetingMisc', event.GetInt())
def OnPriceChange(self, event):
self.settings.set('price', event.GetInt())
def OnOutgoingChange(self, event):
self.settings.set('outgoing', event.GetInt())
def OnMiningYieldChange(self, event):
self.settings.set('miningyield', event.GetInt())
@@ -145,7 +152,7 @@ class PFStatViewPref(PreferenceView):
self.settings.set('drones', event.GetInt())
def getImage(self):
return BitmapLoader.getBitmap("pref-gauges_big", "gui")
return BitmapLoader.getBitmap("settings_stats", "gui")
PFStatViewPref.register()