SF.net SVN: fclient:[737] trunk/fclient/src/fclient/Ui_ViewConnection.py

[<jU...@us...>]

Revision: 737
          http://fclient.svn.sourceforge.net/fclient/?rev=737&view=rev
Author:   jUrner
Date:     2008-07-25 07:14:19 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
fproxy is set now on connection pane

Modified Paths:
--------------
    trunk/fclient/src/fclient/Ui_ViewConnection.py

Modified: trunk/fclient/src/fclient/Ui_ViewConnection.py
===================================================================
--- trunk/fclient/src/fclient/Ui_ViewConnection.py	2008-07-25 07:13:57 UTC (rev 736)
+++ trunk/fclient/src/fclient/Ui_ViewConnection.py	2008-07-25 07:14:19 UTC (rev 737)
@@ -59,11 +59,6 @@
 				('ConnectionTimerTimeout', 'UInt', 500, config.SettingScopeExpert),
 				('ConnectionTimerMaxDuration', 'UInt', 20, config.SettingScopeExpert),
 				('PollTimerTimeout', 'UInt', 200, config.SettingScopeExpert),
-				
-				('AutoConnect', 'Bool', False, config.SettingScopeUser),
-				('ConnectionName', 'String', '', config.SettingScopeUser),		#TODO: we need a python ansi string
-				('ConnectionHost', 'String', fcp2.Client.DefaultFcpHost, config.SettingScopeUser),
-				('ConnectionPort', 'UInt', fcp2.Client.DefaultFcpPort, config.SettingScopeUser),
 				)
 
 class ConnectionViewObject(config.ViewObject):
@@ -129,10 +124,13 @@
 class ViewConnectionWidget(QtGui.QWidget, Ui_ViewConnectionWidget):
 	
 	IdBtConnect = 'btConnect'
-	IdckAutoConnect = 'ckAutoConnect'
-	IdEdConnectionHost = 'edConnectionHost'		#TODO: combobox? validate input.
-	IdSpinConnectionPort = 'spinConnectionPort'
+	IdCkFcpAutoConnect = 'ckFcpAutoConnect'
+	IdEdFcpFcpConnectionHost = 'edFcpConnectionHost'
+	IdFcpSpinFcpConnectionPort = 'spinFcpConnectionPort'
+	IdEdFproxyConnectionHost = 'edFproxyConnectionHost'
+	IdFproxySpinConnectionPort = 'spinFproxyConnectionPort'
 		
+		
 	def __init__(self, parent, idGlobalFeedback=config.IdMainWindow):
 		QtGui.QWidget.__init__(self, parent)
 				
@@ -188,25 +186,36 @@
 			return
 		self._isCreated = True
 		
-		# setup host / port boxes
-		edHost = self.controlById(self.IdEdConnectionHost)
-		edHost.setText(self.fcSettings.value('ConnectionHost'))
+		# setup fcp host / port
+		edHost = self.controlById(self.IdEdFcpFcpConnectionHost)
+		edHost.setText(config.settings.value('FcpConnectionHost'))
+		self.connect(edHost, QtCore.SIGNAL('textChanged(const QString &)'), self.onEdFcpConnectionHostChanged)
 		
-		spinPort = self.controlById(self.IdSpinConnectionPort)
+		spinPort = self.controlById(self.IdFcpSpinFcpConnectionPort)
 		spinPort.setRange(0, 0xFFFF)		#TODO: no idea if port range (0, 0xFFFF) this is reasonable
-		spinPort.setValue(self.fcSettings.value('ConnectionPort'))
+		spinPort.setValue(config.settings.value('FcpConnectionPort'))
+		self.connect(spinPort, QtCore.SIGNAL('valueChanged(int)'), self.onSpinFcpConnectionPortChanged)
 				
-		# setup Connect button and AutoConnect checkbox
-		doAutoConnect = self.fcSettings.value('AutoConnect')
-		ck = self.controlById(self.IdckAutoConnect)
+		doAutoConnect = config.settings.value('FcpAutoConnect')
+		ck = self.controlById(self.IdCkFcpAutoConnect)
 		ck.setChecked(doAutoConnect)
-		self.connect(ck, QtCore.SIGNAL('stateChanged(int)'), self.onCkAutoConnectStateChanged)		
+		self.connect(ck, QtCore.SIGNAL('stateChanged(int)'), self.onCkFcpAutoConnectStateChanged)
+					
+		# setup fproxy host / port
+		edHost = self.controlById(self.IdEdFproxyConnectionHost)
+		edHost.setText(config.settings.value('FproxyConnectionHost'))
+		self.connect(edHost, QtCore.SIGNAL('textChanged(const QString &)'), self.onEdFproxyConnectionHostChanged)
 		
+		spinPort = self.controlById(self.IdFproxySpinConnectionPort)
+		spinPort.setRange(0, 0xFFFF)		#TODO: no idea if port range (0, 0xFFFF) this is reasonable
+		spinPort.setValue(config.settings.value('FproxyConnectionPort'))
+		self.connect(spinPort, QtCore.SIGNAL('valueChanged(int)'), self.onSpinFproxyConnectionPortChanged)
+		
 		bt = self.controlById(self.IdBtConnect)
 		self.connect(bt, QtCore.SIGNAL('clicked(bool)'), self.onBtConnectClicked)
 		if doAutoConnect:
 			self.controlById(self.IdBtConnect).click()
-				
+		
 	########################################
 	## overwritten methods
 	#########################################
@@ -233,9 +242,22 @@
 				config.fcpClient.close()
 				
 	
-	def onCkAutoConnectStateChanged(self, state):
-		self.fcSettings.setValues(AutoConnect=state == QtCore.Qt.Checked)
+	def onCkFcpAutoConnectStateChanged(self, state):
+		config.settings.setValues(FcpAutoConnect=state == QtCore.Qt.Checked)
 			
+	def onEdFcpConnectionHostChanged(self, text):
+		config.settings.setValues(FcpConnectionHost=text)
+	
+	def onSpinFcpConnectionPortChanged(self, value):
+		config.settings.setValues(FcpConnectionPort=value)
+	
+	def onEdFproxyConnectionHostChanged(self, text):
+		config.settings.setValues(FproxyConnectionHost=text)
+	
+	def onSpinFproxyConnectionPortChanged(self, value):
+		config.settings.setValues(FproxyConnectionPort=value)
+	
+	
 	#########################################
 	## fcp event onrs
 	#########################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.