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

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

Revision: 574
          http://fclient.svn.sourceforge.net/fclient/?rev=574&view=rev
Author:   jUrner
Date:     2008-07-11 09:33:29 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
too many changes to list

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-11 16:33:24 UTC (rev 573)
+++ trunk/fclient/src/fclient/Ui_ViewConnection.py	2008-07-11 16:33:29 UTC (rev 574)
@@ -10,20 +10,18 @@
 from . import Ui_View
 
 from .lib import fcp2
-from .lib.qt4ex import settingsbase
-
 from .tpls.Ui_ViewConnectionWidgetTpl import Ui_ViewConnectionWidget
 #**********************************************************************************
 #
 #**********************************************************************************
-class UserSettings(settingsbase.SettingsBase):
-	
-		KEY_SETTINGS = 'UserSettingsConnection'
-		SETTINGS = [
-				('AutoConnect', ['toBool', False]),
-				('ConnectionHost', ['toString', fcp2.Client.DefaultFcpHost]),
-				('ConnectionPort', ['toUInt', fcp2.Client.DefaultFcpPort]),
-				]
+class Settings(config.SettingsBase):
+		_key_ = config.IdViewConnectionWidget
+		_settings_  = (
+				('AutoConnect', 'Bool', False),
+				('ConnectionHost', 'String', fcp2.Client.DefaultFcpHost),
+				('ConnectionName', 'String', ''),		#TODO: we need a python ansi string
+				('ConnectionPort', 'UInt', fcp2.Client.DefaultFcpPort),
+				)
 
 #***********************************************************************
 #
@@ -39,16 +37,27 @@
 		QtGui.QWidget.__init__(self, parent)
 				
 		self._isCreated = False
+		self.settings = Settings()
 		
-		
-		self.cfg = config.Config(self) if cfg is None else cfg
-		self.userSettings = UserSettings()
-
-		
 		self.setupUi(self)
+				
+		self.settings.restore()
 		config.ObjectRegistry.register(self)
 		
 	
+	def controlById(self, idControl):
+		return getattr(self, idControl)
+		
+	
+	def retranslateUi(self, w):
+		Ui_ViewConnectionWidget.retranslateUi(self, w)
+		bt = self.controlById(self.IdBtConnect)
+		if bt.isChecked():
+			bt.setText()
+	
+	#########################################
+	## events
+	#########################################
 	def showEvent(self, event):
 		QtGui.QWidget.showEvent(self, event)
 		if self._isCreated:
@@ -63,39 +72,24 @@
 				
 		# setup host / port boxes
 		edHost = self.controlById(self.IdEdConnectionHost)
-		edHost.setText(self.userSettings['ConnectionHost'])
+		edHost.setText(self.settings.value('ConnectionHost'))
 		
 		spinPort = self.controlById(self.IdSpinConnectionPort)
 		#TODO: no idea if port range (0, 0xFFFF) this is reasonable
 		spinPort.setRange(0, 0xFFFF)
-		spinPort.setValue(self.userSettings['ConnectionPort'])
+		spinPort.setValue(self.settings.value('ConnectionPort'))
 				
 		
 		# autoconnect if desired
-		self.cfg.settings.readSettings(self, self.userSettings)
-		if self.userSettings['AutoConnect']:
+		self.settings.restore()
+		if self.settings.value('AutoConnect'):
 			self.controlById(self.IdBtConnect).setChecked(True)
 			self.onBtConnectClicked(True)
+		#XXX
+		self.settings.setValues(ConnectionName='abc')
 		
 		
-	def controlById(self, idControl):
-		return getattr(self, idControl)
-		
-	
-	def retranslateUi(self, w):
-		Ui_ViewConnectionWidget.retranslateUi(self, w)
-		bt = self.controlById(self.IdBtConnect)
-		if bt.isChecked():
-			bt.setText()
-	
 	#########################################
-	## events
-	#########################################
-	def closeEvent(self, event):
-		self.cfg.settings.dumpSettings(self, self.userSettings)
-		
-		
-	#########################################
 	##
 	#########################################
 	def onBtConnectClicked(self, checked):
@@ -113,7 +107,7 @@
 	
 	def __init__(self):
 		self._widget = None
-
+		
 	def displayName(self):
 		return QtGui.QApplication.translate("ViewConnectionWidget", "Connection", None, QtGui.QApplication.UnicodeUTF8)
 		
@@ -129,17 +123,18 @@
 			self._widget = ViewConnectionWidget(parent)
 		return self._widget
 		
-
+	def close(self):
+		pass
+		
 #**********************************************************************************
 #
 #**********************************************************************************
 if __name__ == '__main__':
 	import sys
-	app = QtGui.QApplication(sys.argv)
-	
-	
 	from . import Ui_ViewLogger
 	
+	app = QtGui.QApplication(sys.argv)
+		
 	w = Ui_View.ViewWidget(None)
 	w.addViews(True, ViewConnection())
 	w.addViews(False, Ui_ViewLogger.ViewLogger())


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