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

Initial Qt5/Python3 switch

Browse Source 
This converts the GUI code to use Qt5 and Python3

The GUI is still somewhat buggy, and it can't open files yet,
but seems to be mostly working, extensive testing will
be needed before this can be released.
This commit is contained in:
Salvo 'LtWorf' Tomaselli
2015-02-19 14:00:47 +01:00
parent 98da6fa7f6
commit cf377eca46
11 changed files with 526 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
relational_gui/survey.py
View File

@@ -2,98 +2,84 @@
# Form implementation generated from reading ui file 'relational_gui/survey.ui'
#
# Created: Fri Dec 27 00:23:51 2013
# by: PyQt4 UI code generator 4.10.3
# Created: Thu Feb 19 13:07:47 2015
# by: PyQt5 UI code generator 5.3.2
#
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
def _fromUtf8(s):
return s
try:
_encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding)
except AttributeError:
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig)
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_Form(object):
def setupUi(self, Form):
Form.setObjectName(_fromUtf8("Form"))
Form.setObjectName("Form")
Form.resize(422, 313)
Form.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
self.verticalLayout = QtGui.QVBoxLayout(Form)
self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
self.formLayout = QtGui.QGridLayout()
self.formLayout.setObjectName(_fromUtf8("formLayout"))
self.txtSystem = QtGui.QLineEdit(Form)
self.txtSystem.setObjectName(_fromUtf8("txtSystem"))
self.verticalLayout = QtWidgets.QVBoxLayout(Form)
self.verticalLayout.setObjectName("verticalLayout")
self.formLayout = QtWidgets.QGridLayout()
self.formLayout.setObjectName("formLayout")
self.txtSystem = QtWidgets.QLineEdit(Form)
self.txtSystem.setObjectName("txtSystem")
self.formLayout.addWidget(self.txtSystem, 0, 1, 1, 1)
self.label = QtGui.QLabel(Form)
self.label = QtWidgets.QLabel(Form)
self.label.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
self.label.setObjectName(_fromUtf8("label"))
self.label.setObjectName("label")
self.formLayout.addWidget(self.label, 1, 0, 1, 1)
self.txtCountry = QtGui.QLineEdit(Form)
self.txtCountry.setObjectName(_fromUtf8("txtCountry"))
self.txtCountry = QtWidgets.QLineEdit(Form)
self.txtCountry.setObjectName("txtCountry")
self.formLayout.addWidget(self.txtCountry, 1, 1, 1, 1)
self.label_2 = QtGui.QLabel(Form)
self.label_2 = QtWidgets.QLabel(Form)
self.label_2.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
self.label_2.setObjectName(_fromUtf8("label_2"))
self.label_2.setObjectName("label_2")
self.formLayout.addWidget(self.label_2, 2, 0, 1, 1)
self.txtSchool = QtGui.QLineEdit(Form)
self.txtSchool.setObjectName(_fromUtf8("txtSchool"))
self.txtSchool = QtWidgets.QLineEdit(Form)
self.txtSchool.setObjectName("txtSchool")
self.formLayout.addWidget(self.txtSchool, 2, 1, 1, 1)
self.label_3 = QtGui.QLabel(Form)
self.label_3 = QtWidgets.QLabel(Form)
self.label_3.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
self.label_3.setObjectName(_fromUtf8("label_3"))
self.label_3.setObjectName("label_3")
self.formLayout.addWidget(self.label_3, 3, 0, 1, 1)
self.txtAge = QtGui.QLineEdit(Form)
self.txtAge.setObjectName(_fromUtf8("txtAge"))
self.txtAge = QtWidgets.QLineEdit(Form)
self.txtAge.setObjectName("txtAge")
self.formLayout.addWidget(self.txtAge, 3, 1, 1, 1)
self.label_4 = QtGui.QLabel(Form)
self.label_4 = QtWidgets.QLabel(Form)
self.label_4.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
self.label_4.setObjectName(_fromUtf8("label_4"))
self.label_4.setObjectName("label_4")
self.formLayout.addWidget(self.label_4, 4, 0, 1, 1)
self.txtFind = QtGui.QLineEdit(Form)
self.txtFind.setObjectName(_fromUtf8("txtFind"))
self.txtFind = QtWidgets.QLineEdit(Form)
self.txtFind.setObjectName("txtFind")
self.formLayout.addWidget(self.txtFind, 4, 1, 1, 1)
self.label_5 = QtGui.QLabel(Form)
self.label_5 = QtWidgets.QLabel(Form)
self.label_5.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
self.label_5.setObjectName(_fromUtf8("label_5"))
self.label_5.setObjectName("label_5")
self.formLayout.addWidget(self.label_5, 0, 0, 1, 1)
self.label_6 = QtGui.QLabel(Form)
self.label_6.setObjectName(_fromUtf8("label_6"))
self.label_6 = QtWidgets.QLabel(Form)
self.label_6.setObjectName("label_6")
self.formLayout.addWidget(self.label_6, 6, 0, 1, 1)
self.txtComments = QtGui.QTextEdit(Form)
self.txtComments = QtWidgets.QTextEdit(Form)
self.txtComments.setTabChangesFocus(True)
self.txtComments.setObjectName(_fromUtf8("txtComments"))
self.txtComments.setObjectName("txtComments")
self.formLayout.addWidget(self.txtComments, 6, 1, 1, 1)
self.label_7 = QtGui.QLabel(Form)
self.label_7.setObjectName(_fromUtf8("label_7"))
self.label_7 = QtWidgets.QLabel(Form)
self.label_7.setObjectName("label_7")
self.formLayout.addWidget(self.label_7, 5, 0, 1, 1)
self.txtEmail = QtGui.QLineEdit(Form)
self.txtEmail.setObjectName(_fromUtf8("txtEmail"))
self.txtEmail = QtWidgets.QLineEdit(Form)
self.txtEmail.setObjectName("txtEmail")
self.formLayout.addWidget(self.txtEmail, 5, 1, 1, 1)
self.verticalLayout.addLayout(self.formLayout)
self.horizontalLayout = QtGui.QHBoxLayout()
self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout.addItem(spacerItem)
self.cmdCancel = QtGui.QPushButton(Form)
self.cmdCancel.setObjectName(_fromUtf8("cmdCancel"))
self.cmdCancel = QtWidgets.QPushButton(Form)
self.cmdCancel.setObjectName("cmdCancel")
self.horizontalLayout.addWidget(self.cmdCancel)
self.cmdClear = QtGui.QPushButton(Form)
self.cmdClear.setObjectName(_fromUtf8("cmdClear"))
self.cmdClear = QtWidgets.QPushButton(Form)
self.cmdClear.setObjectName("cmdClear")
self.horizontalLayout.addWidget(self.cmdClear)
self.cmdSend = QtGui.QPushButton(Form)
self.cmdSend = QtWidgets.QPushButton(Form)
self.cmdSend.setDefault(True)
self.cmdSend.setObjectName(_fromUtf8("cmdSend"))
self.cmdSend.setObjectName("cmdSend")
self.horizontalLayout.addWidget(self.cmdSend)
self.verticalLayout.addLayout(self.horizontalLayout)
self.label.setBuddy(self.txtCountry)
@@ -105,21 +91,21 @@ class Ui_Form(object):
self.label_7.setBuddy(self.txtEmail)
self.retranslateUi(Form)
QtCore.QObject.connect(self.cmdCancel, QtCore.SIGNAL(_fromUtf8("clicked()")), Form.close)
QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtComments.clear)
QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtFind.clear)
QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtAge.clear)
QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtSchool.clear)
QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtCountry.clear)
QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtSystem.clear)
QtCore.QObject.connect(self.txtSystem, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.txtCountry.setFocus)
QtCore.QObject.connect(self.txtCountry, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.txtSchool.setFocus)
QtCore.QObject.connect(self.txtSchool, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.txtAge.setFocus)
QtCore.QObject.connect(self.txtAge, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.txtFind.setFocus)
QtCore.QObject.connect(self.cmdSend, QtCore.SIGNAL(_fromUtf8("clicked()")), Form.send)
QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtEmail.clear)
QtCore.QObject.connect(self.txtFind, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.txtEmail.setFocus)
QtCore.QObject.connect(self.txtEmail, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.txtComments.setFocus)
self.cmdCancel.clicked.connect(Form.close)
self.cmdClear.clicked.connect(self.txtComments.clear)
self.cmdClear.clicked.connect(self.txtFind.clear)
self.cmdClear.clicked.connect(self.txtAge.clear)
self.cmdClear.clicked.connect(self.txtSchool.clear)
self.cmdClear.clicked.connect(self.txtCountry.clear)
self.cmdClear.clicked.connect(self.txtSystem.clear)
self.txtSystem.returnPressed.connect(self.txtCountry.setFocus)
self.txtCountry.returnPressed.connect(self.txtSchool.setFocus)
self.txtSchool.returnPressed.connect(self.txtAge.setFocus)
self.txtAge.returnPressed.connect(self.txtFind.setFocus)
self.cmdSend.clicked.connect(Form.send)
self.cmdClear.clicked.connect(self.txtEmail.clear)
self.txtFind.returnPressed.connect(self.txtEmail.setFocus)
self.txtEmail.returnPressed.connect(self.txtComments.setFocus)
QtCore.QMetaObject.connectSlotsByName(Form)
Form.setTabOrder(self.txtSystem, self.txtCountry)
Form.setTabOrder(self.txtCountry, self.txtSchool)
@@ -132,15 +118,16 @@ class Ui_Form(object):
Form.setTabOrder(self.cmdClear, self.cmdCancel)
def retranslateUi(self, Form):
Form.setWindowTitle(_translate("Form", "Survey", None))
self.label.setText(_translate("Form", "Country", None))
self.label_2.setText(_translate("Form", "School", None))
self.label_3.setText(_translate("Form", "Age", None))
self.label_4.setText(_translate("Form", "How did you find relational", None))
self.label_5.setText(_translate("Form", "System", None))
self.label_6.setText(_translate("Form", "Comments", None))
self.label_7.setText(_translate("Form", "Email (only if you want a reply)", None))
self.cmdCancel.setText(_translate("Form", "Cancel", None))
self.cmdClear.setText(_translate("Form", "Clear", None))
self.cmdSend.setText(_translate("Form", "Send", None))
_translate = QtCore.QCoreApplication.translate
Form.setWindowTitle(_translate("Form", "Survey"))
self.label.setText(_translate("Form", "Country"))
self.label_2.setText(_translate("Form", "School"))
self.label_3.setText(_translate("Form", "Age"))
self.label_4.setText(_translate("Form", "How did you find relational"))
self.label_5.setText(_translate("Form", "System"))
self.label_6.setText(_translate("Form", "Comments"))
self.label_7.setText(_translate("Form", "Email (only if you want a reply)"))
self.cmdCancel.setText(_translate("Form", "Cancel"))
self.cmdClear.setText(_translate("Form", "Clear"))
self.cmdSend.setText(_translate("Form", "Send"))