CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- migrating to unicode

Browse Source 
git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@329 014f5005-505e-4b48-8d0a-63407b615a7c
This commit is contained in:
LtWorf
2011-10-15 21:45:33 +00:00
parent 24021ddeb0
commit 17452f1e0b
7 changed files with 112 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
relational_gui/about.py
View File

@@ -136,10 +136,7 @@ class Ui_Dialog(object):
self.label_3.setText(QtGui.QApplication.translate("Dialog", "Version "+version, None, QtGui.QApplication.UnicodeUTF8))
self.label_3.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.groupBox_3.setTitle(QtGui.QApplication.translate("Dialog", "Author", None, QtGui.QApplication.UnicodeUTF8))
if os.name=='nt': #Differentiates acknowledgements depending on the system
self.label_2.setText(QtGui.QApplication.translate("Dialog", "Salvo \"LtWorf\" Tomaselli &lt;<a href=\"mailto:tiposchi@tiscali.it\">tiposchi@tiscali.it</a>&gt;<br>Emilio Di Prima &lt;emiliodiprima [at] msn [dot] com&gt; (For the windows version)", None, QtGui.QApplication.UnicodeUTF8))
else:
self.label_2.setText(QtGui.QApplication.translate("Dialog", "Salvo \"LtWorf\" Tomaselli &lt;<a href=\"mailto:tiposchi@tiscali.it\">tiposchi@tiscali.it</a>&gt;", None, QtGui.QApplication.UnicodeUTF8))
self.label_2.setText(QtGui.QApplication.translate("Dialog", "Salvo \"LtWorf\" Tomaselli &lt;<a href=\"mailto:tiposchi@tiscali.it\">tiposchi@tiscali.it</a>&gt;<br>Emilio Di Prima &lt;emiliodiprima[at]msn[dot]com&gt; (For the windows version)", None, QtGui.QApplication.UnicodeUTF8))
self.label_2.setOpenExternalLinks (True)
self.label_2.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.groupBox_2.setTitle(QtGui.QApplication.translate("Dialog", "Links", None, QtGui.QApplication.UnicodeUTF8))

4
relational_gui/compatibility.py
View File

@@ -31,8 +31,8 @@ except:
def get_py_str(a):
'''Returns a python string out of a QString'''
if pyqt:
return str(a.toUtf8())
return str(a.encode("utf-8")) #Already a python string in PySide
return unicode(a.toUtf8(),'utf-8')
return unicode(a.encode("utf-8")) #Already a python string in PySide
def set_utf8_text(component,text):
if not pyqt:

5
relational_gui/guihandler.py
View File

@@ -81,13 +81,14 @@ class relForm(QtGui.QMainWindow):
'''Executes the query'''
query=compatibility.get_py_str(self.ui.txtQuery.text())
print query.__class__
res_rel=compatibility.get_py_str(self.ui.txtResult.text())#result relation's name
if not rtypes.is_valid_relation_name(res_rel):
QtGui.QMessageBox.information(self,QtGui.QApplication.translate("Form", "Error"),QtGui.QApplication.translate("Form", "Wrong name for destination relation."))
return
expr=parser.parse(query)#Converting expression to python code
try:
#Converting string to utf8 and then from qstring to normal string
expr=parser.parse(query)#Converting expression to python code
@@ -105,7 +106,7 @@ class relForm(QtGui.QMainWindow):
#Adds to history
item='%s = %s' % (compatibility.get_py_str(self.ui.txtResult.text()),compatibility.get_py_str(self.ui.txtQuery.text()))
item=unicode(item.decode('utf-8'))
#item=item.decode('utf-8'))
compatibility.add_list_item(self.ui.lstHistory,item)
self.qcounter+=1