- Unified code for survey

git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@316 014f5005-505e-4b48-8d0a-63407b615a7c

relational_gui/compatibility.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Relational
+# Copyright (C) 2011  Salvo "LtWorf" Tomaselli
+# 
+# Relational is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+# author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
+#
+# Module to unify the use of both pyqt and pyside
+
+
+try:
+    from PyQt4 import QtCore, QtGui
+    pyqt=True
+except:
+    from PySide import QtCore, QtGui
+    pyqt=False
+
+
+def get_py_str(a):
+    '''Returns a python string out of a QString'''
+    if pyqt:
+        return str(a.toUtf8())
+    return a #Already a python string in PySide

relational_gui/surveyForm.py

@@ -16,8 +16,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
-from PyQt4 import QtCore, QtGui
+try:
+    from PyQt4 import QtCore, QtGui
+except:
+    from PySide import QtCore, QtGui
 
+import compatibility
 from relational import maintenance
 import platform
 import locale
@@ -56,13 +60,13 @@ class surveyForm (QtGui.QWidget):
         post={}
         post['software']="Relational algebra"
         post["version"]= version
-        post["system"]= str(self.ui.txtSystem.text().toUtf8())
-        post["country"]= str(self.ui.txtCountry.text().toUtf8())
-        post["school"]= str(self.ui.txtSchool.text().toUtf8())
-        post["age"] = str(self.ui.txtAge.text().toUtf8())
-        post["find"] = str(self.ui.txtFind.text().toUtf8())
-        post["email"] =str(self.ui.txtEmail.text().toUtf8())
-        post["comments"] = str(self.ui.txtComments.toPlainText().toUtf8())
+        post["system"]= compatibility.get_py_str(self.ui.txtSystem.text())
+        post["country"]= compatibility.get_py_str(self.ui.txtCountry.text())
+        post["school"]= compatibility.get_py_str(self.ui.txtSchool.text())
+        post["age"] = compatibility.get_py_str(self.ui.txtAge.text())
+        post["find"] = compatibility.get_py_str(self.ui.txtFind.text())
+        post["email"] = compatibility.get_py_str(self.ui.txtEmail.text())
+        post["comments"] = compatibility.get_py_str(self.ui.txtComments.toPlainText())
     
         #Clears the form
         self.ui.txtSystem.clear()