Split general and proxy settings. Added some help text (not currently displayed). Dialog sizing needs to be addressed
This commit is contained in:
blitzmann
@@ -1 +1 @@
|
||||
__all__ = ["pyfaGlobalPreferences","pyfaHTMLExportPreferences"]
|
||||
__all__ = ["pyfaGlobalPreferences","pyfaProxyPreferences","pyfaHTMLExportPreferences"]
|
||||
|
||||
@@ -11,20 +11,17 @@ import gui.globalEvents as GE
|
||||
|
||||
|
||||
class PFGlobalPref ( PreferenceView):
|
||||
title = "Global Options"
|
||||
title = "General Options"
|
||||
|
||||
def populatePanel( self, panel ):
|
||||
charHelpText = '''Each fit has a character assigned to it, with different fits having different
|
||||
character. Choose this option if you do not want to switch characters in between fits.'''
|
||||
dmgHelpText = '''Each fit has a damage profile character assigned to it, with different fits having different
|
||||
profiles. Choose this option if you do not want to switch profiles in between fits.'''
|
||||
|
||||
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
|
||||
self.proxySettings = service.settings.ProxySettings.getInstance()
|
||||
self.dirtySettings = False
|
||||
|
||||
self.nMode = self.proxySettings.getMode()
|
||||
self.nAddr = self.proxySettings.getAddress()
|
||||
self.nPort = self.proxySettings.getPort()
|
||||
self.nType = self.proxySettings.getType()
|
||||
|
||||
|
||||
mainSizer = wx.BoxSizer( wx.VERTICAL )
|
||||
|
||||
self.stTitle = wx.StaticText( panel, wx.ID_ANY, self.title, wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
@@ -33,8 +30,8 @@ class PFGlobalPref ( PreferenceView):
|
||||
|
||||
mainSizer.Add( self.stTitle, 0, wx.ALL, 5 )
|
||||
|
||||
# self.m_staticline1 = wx.StaticLine( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
|
||||
# mainSizer.Add( self.m_staticline1, 0, wx.EXPAND, 5 )
|
||||
#self.m_staticline1 = wx.StaticLine( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
|
||||
#mainSizer.Add( self.m_staticline1, 0, wx.EXPAND, 5 )
|
||||
|
||||
self.cbGlobalChar = wx.CheckBox( panel, wx.ID_ANY, u"Use global character", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
mainSizer.Add( self.cbGlobalChar, 0, wx.ALL|wx.EXPAND, 5 )
|
||||
@@ -48,103 +45,12 @@ class PFGlobalPref ( PreferenceView):
|
||||
self.cbFitColorSlots = wx.CheckBox( panel, wx.ID_ANY, u"Color fitting view by slot", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
mainSizer.Add( self.cbFitColorSlots, 0, wx.ALL|wx.EXPAND, 5 )
|
||||
|
||||
# Needs to be implemented - save active fittings and reapply when starting pyfa
|
||||
#self.cbReopenFits = wx.CheckBox( panel, wx.ID_ANY, u"Reopen Fits", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
#mainSizer.Add( self.cbReopenFits, 0, wx.ALL|wx.EXPAND, 5 )
|
||||
|
||||
defCharSizer = wx.BoxSizer( wx.HORIZONTAL )
|
||||
|
||||
self.stDefChar = wx.StaticText( panel, wx.ID_ANY, u"Default character:", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stDefChar.Wrap( -1 )
|
||||
defCharSizer.Add( self.stDefChar, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
chDefaultCharChoices = []
|
||||
self.chDefaultChar = wx.Choice( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, chDefaultCharChoices, 0 )
|
||||
self.chDefaultChar.SetSelection( 0 )
|
||||
defCharSizer.Add( self.chDefaultChar, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
mainSizer.Add( defCharSizer, 0, wx.EXPAND, 5 )
|
||||
|
||||
|
||||
self.m_staticline2 = wx.StaticLine( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
|
||||
mainSizer.Add( self.m_staticline2, 0, wx.EXPAND, 5 )
|
||||
|
||||
self.stPTitle = wx.StaticText( panel, wx.ID_ANY, "Proxy settings", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPTitle.Wrap( -1 )
|
||||
self.stPTitle.SetFont( wx.Font( 12, 70, 90, 90, False, wx.EmptyString ) )
|
||||
|
||||
mainSizer.Add( self.stPTitle, 0, wx.ALL, 5 )
|
||||
|
||||
|
||||
ptypeSizer = wx.BoxSizer( wx.HORIZONTAL )
|
||||
|
||||
self.stPType = wx.StaticText( panel, wx.ID_ANY, u"Mode:", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPType.Wrap( -1 )
|
||||
ptypeSizer.Add( self.stPType, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
self.chProxyTypeChoices = [ u"No proxy", u"Auto-detected proxy settings", u"Manual proxy settings" ]
|
||||
self.chProxyType = wx.Choice( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, self.chProxyTypeChoices, 0 )
|
||||
|
||||
|
||||
self.chProxyType.SetSelection( self.nMode )
|
||||
|
||||
ptypeSizer.Add( self.chProxyType, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
mainSizer.Add( ptypeSizer, 0, wx.EXPAND, 5 )
|
||||
|
||||
fgAddrSizer = wx.FlexGridSizer( 2, 2, 0, 0 )
|
||||
fgAddrSizer.AddGrowableCol( 1 )
|
||||
fgAddrSizer.SetFlexibleDirection( wx.BOTH )
|
||||
fgAddrSizer.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
|
||||
|
||||
|
||||
self.stPSetAddr = wx.StaticText( panel, wx.ID_ANY, u"Addr:", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPSetAddr.Wrap( -1 )
|
||||
fgAddrSizer.Add( self.stPSetAddr, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
self.editProxySettingsAddr = wx.TextCtrl( panel, wx.ID_ANY, self.nAddr, wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
|
||||
fgAddrSizer.Add( self.editProxySettingsAddr, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5 )
|
||||
|
||||
self.stPSetPort = wx.StaticText( panel, wx.ID_ANY, u"Port:", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPSetPort.Wrap( -1 )
|
||||
|
||||
fgAddrSizer.Add( self.stPSetPort, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
self.editProxySettingsPort = wx.TextCtrl( panel, wx.ID_ANY, self.nPort, wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
|
||||
fgAddrSizer.Add( self.editProxySettingsPort, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5 )
|
||||
|
||||
mainSizer.Add( fgAddrSizer, 0, wx.EXPAND, 5)
|
||||
|
||||
self.stPSAutoDetected = wx.StaticText( panel, wx.ID_ANY, u"Auto-detected: ", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPSAutoDetected.Wrap( -1 )
|
||||
mainSizer.Add( self.stPSAutoDetected, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
btnSizer = wx.BoxSizer( wx.HORIZONTAL )
|
||||
btnSizer.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )
|
||||
|
||||
self.btnApply = wx.Button( panel, wx.ID_ANY, u"Apply", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
|
||||
btnSizer.Add( self.btnApply, 0, wx.ALL, 5 )
|
||||
|
||||
mainSizer.Add(btnSizer, 0, wx.EXPAND,5)
|
||||
|
||||
proxy = self.proxySettings.autodetect()
|
||||
|
||||
if proxy is not None:
|
||||
addr,port = proxy
|
||||
txt = addr + ":" + str(port)
|
||||
else:
|
||||
txt = "None"
|
||||
|
||||
self.stPSAutoDetected.SetLabel("Auto-detected: " + txt)
|
||||
self.stPSAutoDetected.Disable()
|
||||
|
||||
cChar = service.Character.getInstance()
|
||||
charList = cChar.getCharacterList()
|
||||
|
||||
for id, name, active in charList:
|
||||
self.chDefaultChar.Append(name, id)
|
||||
|
||||
self.chDefaultChar.SetSelection(0)
|
||||
|
||||
self.sFit = service.Fit.getInstance()
|
||||
useGlobalChar = self.sFit.serviceFittingOptions["useGlobalCharacter"]
|
||||
useGlobalDmgPattern = self.sFit.serviceFittingOptions["useGlobalDamagePattern"]
|
||||
@@ -160,83 +66,9 @@ class PFGlobalPref ( PreferenceView):
|
||||
self.cbGlobalForceReload.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalForceReloadStateChange)
|
||||
self.cbFitColorSlots.Bind(wx.EVT_CHECKBOX, self.onCBGlobalColorBySlot)
|
||||
|
||||
self.chDefaultChar.Disable()
|
||||
self.chDefaultChar.Show(False)
|
||||
self.stDefChar.Show(False)
|
||||
|
||||
self.chProxyType.Bind(wx.EVT_CHOICE, self.OnCHProxyTypeSelect)
|
||||
self.editProxySettingsAddr.Bind(wx.EVT_TEXT, self.OnEditPSAddrText)
|
||||
self.editProxySettingsPort.Bind(wx.EVT_TEXT, self.OnEditPSPortText)
|
||||
|
||||
|
||||
self.btnApply.Bind(wx.EVT_BUTTON, self.OnBtnApply)
|
||||
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
if self.nMode is not 2:
|
||||
self.ToggleProxySettings(False)
|
||||
else:
|
||||
self.ToggleProxySettings(True)
|
||||
|
||||
panel.SetSizer( mainSizer )
|
||||
panel.Layout()
|
||||
|
||||
def OnEditPSAddrText(self, event):
|
||||
self.nAddr = self.editProxySettingsAddr.GetValue()
|
||||
self.dirtySettings = True
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
def OnEditPSPortText(self, event):
|
||||
self.nPort = self.editProxySettingsPort.GetValue()
|
||||
self.dirtySettings = True
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
def OnBtnApply(self, event):
|
||||
self.dirtySettings = False
|
||||
self.UpdateApplyButtonState()
|
||||
self.SaveSettings()
|
||||
|
||||
def SaveSettings(self):
|
||||
self.proxySettings.setMode(self.nMode)
|
||||
self.proxySettings.setAddress(self.nAddr)
|
||||
self.proxySettings.setPort(self.nPort)
|
||||
self.proxySettings.setType(self.nType)
|
||||
|
||||
def UpdateApplyButtonState(self):
|
||||
if self.dirtySettings:
|
||||
self.btnApply.Enable()
|
||||
else:
|
||||
self.btnApply.Disable()
|
||||
|
||||
def OnCHProxyTypeSelect(self, event):
|
||||
choice = self.chProxyType.GetSelection()
|
||||
|
||||
self.nMode = choice
|
||||
self.dirtySettings = True
|
||||
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
if choice is not 2:
|
||||
self.ToggleProxySettings(False)
|
||||
else:
|
||||
self.ToggleProxySettings(True)
|
||||
|
||||
def ToggleProxySettings(self, mode):
|
||||
if mode:
|
||||
self.stPSetAddr.Enable()
|
||||
self.editProxySettingsAddr.Enable()
|
||||
self.stPSetPort.Enable()
|
||||
self.editProxySettingsPort.Enable()
|
||||
else:
|
||||
self.stPSetAddr.Disable()
|
||||
self.editProxySettingsAddr.Disable()
|
||||
self.stPSetPort.Disable()
|
||||
self.editProxySettingsPort.Disable()
|
||||
|
||||
def OnCBProxySettingsStateChange(self, event):
|
||||
self.ToggleProxySettings(self.cbProxySettings.GetValue())
|
||||
event.Skip()
|
||||
|
||||
def onCBGlobalColorBySlot(self, event):
|
||||
self.sFit.serviceFittingOptions["colorFitBySlot"] = self.cbFitColorSlots.GetValue()
|
||||
fitID = self.mainFrame.getActiveFit()
|
||||
|
||||
172
gui/builtinPreferenceViews/pyfaProxyPreferences.py
Normal file
172
gui/builtinPreferenceViews/pyfaProxyPreferences.py
Normal file
@@ -0,0 +1,172 @@
|
||||
import wx
|
||||
import service
|
||||
import urllib2
|
||||
|
||||
from gui.preferenceView import PreferenceView
|
||||
from gui import bitmapLoader
|
||||
|
||||
import gui.mainFrame
|
||||
import service
|
||||
import gui.globalEvents as GE
|
||||
|
||||
|
||||
class PFProxyPref ( PreferenceView):
|
||||
title = "Proxy"
|
||||
|
||||
def populatePanel( self, panel ):
|
||||
|
||||
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
|
||||
self.proxySettings = service.settings.ProxySettings.getInstance()
|
||||
self.dirtySettings = False
|
||||
|
||||
self.nMode = self.proxySettings.getMode()
|
||||
self.nAddr = self.proxySettings.getAddress()
|
||||
self.nPort = self.proxySettings.getPort()
|
||||
self.nType = self.proxySettings.getType()
|
||||
|
||||
mainSizer = wx.BoxSizer( wx.VERTICAL )
|
||||
|
||||
self.stTitle = wx.StaticText( panel, wx.ID_ANY, self.title, wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stTitle.Wrap( -1 )
|
||||
self.stTitle.SetFont( wx.Font( 12, 70, 90, 90, False, wx.EmptyString ) )
|
||||
|
||||
mainSizer.Add( self.stTitle, 0, wx.ALL, 5 )
|
||||
|
||||
ptypeSizer = wx.BoxSizer( wx.HORIZONTAL )
|
||||
|
||||
self.stPType = wx.StaticText( panel, wx.ID_ANY, u"Mode:", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPType.Wrap( -1 )
|
||||
ptypeSizer.Add( self.stPType, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
self.chProxyTypeChoices = [ u"No proxy", u"Auto-detected proxy settings", u"Manual proxy settings" ]
|
||||
self.chProxyType = wx.Choice( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, self.chProxyTypeChoices, 0 )
|
||||
|
||||
|
||||
self.chProxyType.SetSelection( self.nMode )
|
||||
|
||||
ptypeSizer.Add( self.chProxyType, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
mainSizer.Add( ptypeSizer, 0, wx.EXPAND, 5 )
|
||||
|
||||
fgAddrSizer = wx.FlexGridSizer( 2, 2, 0, 0 )
|
||||
fgAddrSizer.AddGrowableCol( 1 )
|
||||
fgAddrSizer.SetFlexibleDirection( wx.BOTH )
|
||||
fgAddrSizer.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
|
||||
|
||||
|
||||
self.stPSetAddr = wx.StaticText( panel, wx.ID_ANY, u"Addr:", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPSetAddr.Wrap( -1 )
|
||||
fgAddrSizer.Add( self.stPSetAddr, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
self.editProxySettingsAddr = wx.TextCtrl( panel, wx.ID_ANY, self.nAddr, wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
|
||||
fgAddrSizer.Add( self.editProxySettingsAddr, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5 )
|
||||
|
||||
self.stPSetPort = wx.StaticText( panel, wx.ID_ANY, u"Port:", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPSetPort.Wrap( -1 )
|
||||
|
||||
fgAddrSizer.Add( self.stPSetPort, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
self.editProxySettingsPort = wx.TextCtrl( panel, wx.ID_ANY, self.nPort, wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
|
||||
fgAddrSizer.Add( self.editProxySettingsPort, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5 )
|
||||
|
||||
mainSizer.Add( fgAddrSizer, 0, wx.EXPAND, 5)
|
||||
|
||||
self.stPSAutoDetected = wx.StaticText( panel, wx.ID_ANY, u"Auto-detected: ", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
self.stPSAutoDetected.Wrap( -1 )
|
||||
mainSizer.Add( self.stPSAutoDetected, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
|
||||
|
||||
btnSizer = wx.BoxSizer( wx.HORIZONTAL )
|
||||
btnSizer.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )
|
||||
|
||||
self.btnApply = wx.Button( panel, wx.ID_ANY, u"Apply", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||
|
||||
btnSizer.Add( self.btnApply, 0, wx.ALL, 5 )
|
||||
|
||||
mainSizer.Add(btnSizer, 0, wx.EXPAND,5)
|
||||
|
||||
proxy = self.proxySettings.autodetect()
|
||||
|
||||
if proxy is not None:
|
||||
addr,port = proxy
|
||||
txt = addr + ":" + str(port)
|
||||
else:
|
||||
txt = "None"
|
||||
|
||||
self.stPSAutoDetected.SetLabel("Auto-detected: " + txt)
|
||||
self.stPSAutoDetected.Disable()
|
||||
|
||||
self.chProxyType.Bind(wx.EVT_CHOICE, self.OnCHProxyTypeSelect)
|
||||
self.editProxySettingsAddr.Bind(wx.EVT_TEXT, self.OnEditPSAddrText)
|
||||
self.editProxySettingsPort.Bind(wx.EVT_TEXT, self.OnEditPSPortText)
|
||||
|
||||
|
||||
self.btnApply.Bind(wx.EVT_BUTTON, self.OnBtnApply)
|
||||
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
if self.nMode is not 2:
|
||||
self.ToggleProxySettings(False)
|
||||
else:
|
||||
self.ToggleProxySettings(True)
|
||||
|
||||
panel.SetSizer( mainSizer )
|
||||
panel.Layout()
|
||||
|
||||
def OnEditPSAddrText(self, event):
|
||||
self.nAddr = self.editProxySettingsAddr.GetValue()
|
||||
self.dirtySettings = True
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
def OnEditPSPortText(self, event):
|
||||
self.nPort = self.editProxySettingsPort.GetValue()
|
||||
self.dirtySettings = True
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
def OnBtnApply(self, event):
|
||||
self.dirtySettings = False
|
||||
self.UpdateApplyButtonState()
|
||||
self.SaveSettings()
|
||||
|
||||
def SaveSettings(self):
|
||||
self.proxySettings.setMode(self.nMode)
|
||||
self.proxySettings.setAddress(self.nAddr)
|
||||
self.proxySettings.setPort(self.nPort)
|
||||
self.proxySettings.setType(self.nType)
|
||||
|
||||
def UpdateApplyButtonState(self):
|
||||
if self.dirtySettings:
|
||||
self.btnApply.Enable()
|
||||
else:
|
||||
self.btnApply.Disable()
|
||||
|
||||
def OnCHProxyTypeSelect(self, event):
|
||||
choice = self.chProxyType.GetSelection()
|
||||
|
||||
self.nMode = choice
|
||||
self.dirtySettings = True
|
||||
|
||||
self.UpdateApplyButtonState()
|
||||
|
||||
if choice is not 2:
|
||||
self.ToggleProxySettings(False)
|
||||
else:
|
||||
self.ToggleProxySettings(True)
|
||||
|
||||
def ToggleProxySettings(self, mode):
|
||||
if mode:
|
||||
self.stPSetAddr.Enable()
|
||||
self.editProxySettingsAddr.Enable()
|
||||
self.stPSetPort.Enable()
|
||||
self.editProxySettingsPort.Enable()
|
||||
else:
|
||||
self.stPSetAddr.Disable()
|
||||
self.editProxySettingsAddr.Disable()
|
||||
self.stPSetPort.Disable()
|
||||
self.editProxySettingsPort.Disable()
|
||||
|
||||
def getImage(self):
|
||||
return bitmapLoader.getBitmap("prefs_settings", "icons")
|
||||
|
||||
PFProxyPref.register()
|
||||
Reference in New Issue
Block a user