Implemented preference panel for global options (default character disabled for now)

This commit is contained in:
HomeWorld
2011-12-01 01:12:12 +02:00
parent 163207e2c9
commit 962ce2194d
4 changed files with 6 additions and 9 deletions

View File

@@ -1 +1 @@
__all__ = ["pyfaGaugePreferences"]
__all__ = ["pyfaGlobalPreferences"]

View File

@@ -84,9 +84,9 @@ class MainMenuBar(wx.MenuBar):
#=======================================================================
# DISABLED FOR RC2 Release
#
# preferencesItem = wx.MenuItem(windowMenu, self.preferencesId, "Preferences\tCTRL+P")
# preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "icons"))
# windowMenu.AppendItem(preferencesItem)
preferencesItem = wx.MenuItem(windowMenu, self.preferencesId, "Preferences\tCTRL+P")
preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "icons"))
windowMenu.AppendItem(preferencesItem)
#=======================================================================
# Help menu

BIN
icons/pyfa64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -85,9 +85,6 @@ class Fit(object):
self.serviceFittingOptions = SettingsProvider.getInstance().getSettings("pyfaServiceFittingOptions", serviceFittingDefaultOptions)
self.useGlobalCharacter = self.serviceFittingOptions["useGlobalCharacter"]
self.useGlobalDamagePattern = self.serviceFittingOptions["useGlobalDamagePattern"]
def getAllFits(self):
fits = eos.db.getFitList()
@@ -172,11 +169,11 @@ class Fit(object):
fit = eos.db.getFit(fitID)
if self.useGlobalCharacter:
if self.serviceFittingOptions["useGlobalCharacter"]:
if fit.character != self.character:
fit.character = self.character
if self.useGlobalDamagePattern:
if self.serviceFittingOptions["useGlobalDamagePattern"]:
if fit.damagePattern != self.pattern:
fit.damagePattern = self.pattern