fclient-commit

SF.net SVN: fclient: [612] trunk/fclient/src/fclient/lib/qt4ex/lib/settings .py

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

Revision: 612
          http://fclient.svn.sourceforge.net/fclient/?rev=612&view=rev
Author:   jUrner
Date:     2008-07-13 07:14:48 -0700 (Sun, 13 Jul 2008)

Log Message:
-----------
adapt to Qt4Ex changes

Modified Paths:
--------------
    trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py

Modified: trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py
===================================================================
--- trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py	2008-07-13 14:14:12 UTC (rev 611)
+++ trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py	2008-07-13 14:14:48 UTC (rev 612)
@@ -177,7 +177,7 @@
 						mthd = getattr(v, 'to' + typeSetting, None)
 						if mthd is None:
 							raise ValueError('%s: no conversion method found for type: %r' % (name, typeSetting))
-						obj, ok = qtools.castVariant(v, typeSetting)
+						obj, ok = tools.castVariant(v, typeSetting)
 					else:
 						obj, ok = getattr(self, 'to' + typeSetting)(settings, name, v)
 					self._settingsDict[name].value = obj if ok else self.default(name)


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

SF.net SVN: fclient: [631] trunk/fclient/src/fclient/lib/qt4ex/lib/settings .py

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

Revision: 631
          http://fclient.svn.sourceforge.net/fclient/?rev=631&view=rev
Author:   jUrner
Date:     2008-07-15 16:45:14 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
added PyString ++ bit of this and that

Modified Paths:
--------------
    trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py

Modified: trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py
===================================================================
--- trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py	2008-07-15 23:44:05 UTC (rev 630)
+++ trunk/fclient/src/fclient/lib/qt4ex/lib/settings.py	2008-07-15 23:45:14 UTC (rev 631)
@@ -144,6 +144,7 @@
 	def restore(self):
 		"""restores settings from disk
 		
+		@return: this object
 		@note: values are restored in settings order
 		@note: the method tries first to find a method to<DesiredType> . if present the method
 		will be called with three arguments (QSettings,settingName, variant). the method should
@@ -184,14 +185,18 @@
 		finally:
 			settings.endGroup()
 			self.finalizeSettingsObject(settings)
+		return self
 	
 	
 	def restoreDefaults(self, *names):
 		"""restores default values for settings
 		@param names: names to restore defaults for or no name to restore defaults of all settings
+		@return: (dict) name --> value of restored values
 		"""
 		names = names if names else self._settingsOrder
-		return self.setValues(**dict([(name, self.default(name)) for name in names]))
+		d = dict([(name, self.default(name)) for name in names])
+		self.setValues(**d)
+		return d
 		
 		
 	def setDefault(self, name, value):
@@ -364,5 +369,23 @@
 	
 	def toQPixmapXpm(self, settings, name, v): return self._toPixmap(settings, name, v)
 	def fromQPixmapXpm(self, settings, name, value): return self._fromPixmap(settings, name, value, 'XPM')
+		
+		
+	def fromPyString(self, settings, name, value):
+		if value is not None:
+			return QtCore.QVariant(value), True
+		return QtCore.QVariant(), False
+			
+	def toPyString(elf, settings, name, v):
+		if v.isValid():
+			string = v.toString()
+			try:
+				string = str(string)
+			except UnicodeEncodeError:
+				pass
+			else:
+				return string, True
+		return None, False
+		
 
 	
\ No newline at end of file


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