SF.net SVN: fclient:[720] trunk/fclient/src/fclient/lib/qt4ex/lib/resources .py

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

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

Log Message:
-----------
unicode unicode unicode

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

Modified: trunk/fclient/src/fclient/lib/qt4ex/lib/resources.py
===================================================================
--- trunk/fclient/src/fclient/lib/qt4ex/lib/resources.py	2008-07-25 07:03:16 UTC (rev 719)
+++ trunk/fclient/src/fclient/lib/qt4ex/lib/resources.py	2008-07-25 07:06:32 UTC (rev 720)
@@ -23,11 +23,11 @@
 """ 
 
 import os
-from PyQt4 import QtGui
+from PyQt4 import QtCore, QtGui
 #***************************************************************************************
 #
 #***************************************************************************************
-ResDir = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'res')
+ResDir = QtCore.QString(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'res'))
 
 #***************************************************************************************
 #
@@ -42,7 +42,7 @@
 		self.iconCache = {}
 		self.cursorCache = {}
 		
-		self._resourceDirs = list(resourceDirs)
+		self._resourceDirs = [unicode(i) for i in resourceDirs]
 		self._resourceDirs.append(ResDir)
 		
 		
@@ -68,9 +68,9 @@
 		size = '%sx%s' % (size, size)
 		iconDir = 'icons'
 		if iconTheme is not None:
-			iconDir = os.path.join(iconDir, iconTheme)
+			iconDir = os.path.join(unicode(iconDir), unicode(iconTheme))
 		for resourceDir in self._resourceDirs:
-			fpath = os.path.join(resourceDir, iconDir, size, name + '.png')
+			fpath = os.path.join(unicode(resourceDir), unicode(iconDir), size, unicode(name) + '.png')
 			if os.path.isfile(fpath):
 				return fpath
 		return None


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