diff --git a/CHANGELOG b/CHANGELOG index 64c448e..498d16e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ 1.3 - Fix bug in relational-cli that made it crash when an exception was raised +- Point to new website +- Drop support for PySide 1.2 - Better tokenizer, gives more indicative errors diff --git a/relational_gui/about.py b/relational_gui/about.py index 53027bc..f27f76d 100644 --- a/relational_gui/about.py +++ b/relational_gui/about.py @@ -18,22 +18,13 @@ # author Salvo "LtWorf" Tomaselli import os +from PyQt4 import QtCore, QtGui -try: - from PyQt4 import QtCore, QtGui - try: # If QtWebKit is available, uses it - from PyQt4 import QtWebKit - webk = True - except: - webk = False - +try: # If QtWebKit is available, uses it + from PyQt4 import QtWebKit + webk = True except: - from PySide import QtCore, QtGui - try: # If QtWebKit is available, uses it - from PySide import QtWebKit - webk = True - except: - webk = False + webk = False version = 0 diff --git a/relational_gui/compatibility.py b/relational_gui/compatibility.py index 858613b..cad6efa 100644 --- a/relational_gui/compatibility.py +++ b/relational_gui/compatibility.py @@ -19,45 +19,22 @@ # # 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 - +from PyQt4 import QtCore, QtGui def get_py_str(a): '''Returns a python string out of a QString''' - if pyqt: - return unicode(a.toUtf8(), 'utf-8') - return a # Already a python string in PySide - + return unicode(a.toUtf8(), 'utf-8') def set_utf8_text(component, text): - if not pyqt: - component.setText(text) - else: - component.setText(QtCore.QString.fromUtf8(text)) - + component.setText(QtCore.QString.fromUtf8(text)) def get_filename(filename): - if pyqt: - return str(filename.toUtf8()) - return filename[0] - + return str(filename.toUtf8()) def add_list_item(l, item): - if pyqt: - history_item = QtCore.QString() - history_item.append(item) - hitem = QtGui.QListWidgetItem(None, 0) - hitem.setText(history_item) - l.addItem(hitem) - l.setCurrentItem(hitem) - else: - hitem = QtGui.QListWidgetItem(None, 0) - hitem.setText(item) - l.addItem(hitem) - l.setCurrentItem(hitem) + history_item = QtCore.QString() + history_item.append(item) + hitem = QtGui.QListWidgetItem(None, 0) + hitem.setText(history_item) + l.addItem(hitem) + l.setCurrentItem(hitem) diff --git a/relational_gui/guihandler.py b/relational_gui/guihandler.py index 6192ece..8c61195 100644 --- a/relational_gui/guihandler.py +++ b/relational_gui/guihandler.py @@ -18,13 +18,8 @@ # author Salvo "LtWorf" Tomaselli import sys import os -import pickle - -try: - from PyQt4 import QtCore, QtGui -except: - from PySide import QtCore, QtGui +from PyQt4 import QtCore, QtGui from relational import relation, parser, optimizer, rtypes diff --git a/relational_gui/surveyForm.py b/relational_gui/surveyForm.py index c135747..09820e6 100644 --- a/relational_gui/surveyForm.py +++ b/relational_gui/surveyForm.py @@ -16,10 +16,8 @@ # along with this program. If not, see . # # author Salvo "LtWorf" Tomaselli -try: - from PyQt4 import QtCore, QtGui -except: - from PySide import QtCore, QtGui + +from PyQt4 import QtCore, QtGui import compatibility from relational import maintenance diff --git a/relational_pyside/__init__.py b/relational_pyside/__init__.py deleted file mode 120000 index 103073e..0000000 --- a/relational_pyside/__init__.py +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/__init__.py \ No newline at end of file diff --git a/relational_pyside/about.py b/relational_pyside/about.py deleted file mode 120000 index 6df96e2..0000000 --- a/relational_pyside/about.py +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/about.py \ No newline at end of file diff --git a/relational_pyside/compatibility.py b/relational_pyside/compatibility.py deleted file mode 120000 index 7840e34..0000000 --- a/relational_pyside/compatibility.py +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/compatibility.py \ No newline at end of file diff --git a/relational_pyside/creator.py b/relational_pyside/creator.py deleted file mode 120000 index 6ec91df..0000000 --- a/relational_pyside/creator.py +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/creator.py \ No newline at end of file diff --git a/relational_pyside/guihandler.py b/relational_pyside/guihandler.py deleted file mode 120000 index 791ef62..0000000 --- a/relational_pyside/guihandler.py +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/guihandler.py \ No newline at end of file diff --git a/relational_pyside/maingui.py b/relational_pyside/maingui.py deleted file mode 100644 index b3d92a4..0000000 --- a/relational_pyside/maingui.py +++ /dev/null @@ -1,387 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'relational_pyside/maingui.ui' -# -# Created: Fri Dec 27 00:23:51 2013 -# by: pyside-uic 0.2.15 running on PySide 1.2.1 -# -# WARNING! All changes made in this file will be lost! - -from PySide import QtCore, QtGui - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 612) - self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_7 = QtGui.QVBoxLayout(self.centralwidget) - self.verticalLayout_7.setObjectName("verticalLayout_7") - self.splitter_4 = QtGui.QSplitter(self.centralwidget) - self.splitter_4.setOrientation(QtCore.Qt.Horizontal) - self.splitter_4.setObjectName("splitter_4") - self.layoutWidget = QtGui.QWidget(self.splitter_4) - self.layoutWidget.setObjectName("layoutWidget") - self.verticalLayout_11 = QtGui.QVBoxLayout(self.layoutWidget) - self.verticalLayout_11.setContentsMargins(0, 0, 0, 0) - self.verticalLayout_11.setObjectName("verticalLayout_11") - self.groupBox_3 = QtGui.QGroupBox(self.layoutWidget) - self.groupBox_3.setObjectName("groupBox_3") - self.verticalLayout_5 = QtGui.QVBoxLayout(self.groupBox_3) - self.verticalLayout_5.setObjectName("verticalLayout_5") - self.cmdAbout = QtGui.QPushButton(self.groupBox_3) - self.cmdAbout.setObjectName("cmdAbout") - self.verticalLayout_5.addWidget(self.cmdAbout) - self.cmdSurvey = QtGui.QPushButton(self.groupBox_3) - self.cmdSurvey.setObjectName("cmdSurvey") - self.verticalLayout_5.addWidget(self.cmdSurvey) - self.verticalLayout_11.addWidget(self.groupBox_3) - self.groupBox_4 = QtGui.QGroupBox(self.layoutWidget) - self.groupBox_4.setObjectName("groupBox_4") - self.verticalLayout_10 = QtGui.QVBoxLayout(self.groupBox_4) - self.verticalLayout_10.setObjectName("verticalLayout_10") - self.cmdProduct = QtGui.QPushButton(self.groupBox_4) - self.cmdProduct.setObjectName("cmdProduct") - self.verticalLayout_10.addWidget(self.cmdProduct) - self.cmdDifference = QtGui.QPushButton(self.groupBox_4) - self.cmdDifference.setObjectName("cmdDifference") - self.verticalLayout_10.addWidget(self.cmdDifference) - self.cmdUnion = QtGui.QPushButton(self.groupBox_4) - self.cmdUnion.setObjectName("cmdUnion") - self.verticalLayout_10.addWidget(self.cmdUnion) - self.cmdIntersection = QtGui.QPushButton(self.groupBox_4) - self.cmdIntersection.setObjectName("cmdIntersection") - self.verticalLayout_10.addWidget(self.cmdIntersection) - self.cmdDivision = QtGui.QPushButton(self.groupBox_4) - self.cmdDivision.setObjectName("cmdDivision") - self.verticalLayout_10.addWidget(self.cmdDivision) - self.cmdJoin = QtGui.QPushButton(self.groupBox_4) - self.cmdJoin.setObjectName("cmdJoin") - self.verticalLayout_10.addWidget(self.cmdJoin) - self.cmdOuterLeft = QtGui.QPushButton(self.groupBox_4) - self.cmdOuterLeft.setObjectName("cmdOuterLeft") - self.verticalLayout_10.addWidget(self.cmdOuterLeft) - self.cmdOuterRight = QtGui.QPushButton(self.groupBox_4) - self.cmdOuterRight.setObjectName("cmdOuterRight") - self.verticalLayout_10.addWidget(self.cmdOuterRight) - self.cmdOuter = QtGui.QPushButton(self.groupBox_4) - self.cmdOuter.setObjectName("cmdOuter") - self.verticalLayout_10.addWidget(self.cmdOuter) - self.cmdProjection = QtGui.QPushButton(self.groupBox_4) - self.cmdProjection.setObjectName("cmdProjection") - self.verticalLayout_10.addWidget(self.cmdProjection) - self.cmdSelection = QtGui.QPushButton(self.groupBox_4) - self.cmdSelection.setObjectName("cmdSelection") - self.verticalLayout_10.addWidget(self.cmdSelection) - self.cmdRename = QtGui.QPushButton(self.groupBox_4) - self.cmdRename.setObjectName("cmdRename") - self.verticalLayout_10.addWidget(self.cmdRename) - self.cmdArrow = QtGui.QPushButton(self.groupBox_4) - self.cmdArrow.setObjectName("cmdArrow") - self.verticalLayout_10.addWidget(self.cmdArrow) - spacerItem = QtGui.QSpacerItem(20, 25, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_10.addItem(spacerItem) - self.verticalLayout_11.addWidget(self.groupBox_4) - self.splitter_3 = QtGui.QSplitter(self.splitter_4) - self.splitter_3.setOrientation(QtCore.Qt.Horizontal) - self.splitter_3.setObjectName("splitter_3") - self.splitter_2 = QtGui.QSplitter(self.splitter_3) - self.splitter_2.setOrientation(QtCore.Qt.Vertical) - self.splitter_2.setObjectName("splitter_2") - self.table = QtGui.QTreeWidget(self.splitter_2) - self.table.setMinimumSize(QtCore.QSize(450, 400)) - self.table.setSizeIncrement(QtCore.QSize(0, 0)) - self.table.setRootIsDecorated(False) - self.table.setObjectName("table") - self.table.headerItem().setText(0, "Empty relation") - self.layoutWidget1 = QtGui.QWidget(self.splitter_2) - self.layoutWidget1.setObjectName("layoutWidget1") - self.verticalLayout_6 = QtGui.QVBoxLayout(self.layoutWidget1) - self.verticalLayout_6.setSizeConstraint(QtGui.QLayout.SetMinimumSize) - self.verticalLayout_6.setContentsMargins(0, 0, 0, 0) - self.verticalLayout_6.setObjectName("verticalLayout_6") - self.lstHistory = QtGui.QListWidget(self.layoutWidget1) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lstHistory.sizePolicy().hasHeightForWidth()) - self.lstHistory.setSizePolicy(sizePolicy) - self.lstHistory.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.lstHistory.setBaseSize(QtCore.QSize(0, 0)) - font = QtGui.QFont() - font.setStrikeOut(False) - self.lstHistory.setFont(font) - self.lstHistory.setObjectName("lstHistory") - self.verticalLayout_6.addWidget(self.lstHistory) - self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.cmdOptimize = QtGui.QPushButton(self.layoutWidget1) - self.cmdOptimize.setObjectName("cmdOptimize") - self.horizontalLayout_3.addWidget(self.cmdOptimize) - self.cmdUndoOptimize = QtGui.QPushButton(self.layoutWidget1) - self.cmdUndoOptimize.setObjectName("cmdUndoOptimize") - self.horizontalLayout_3.addWidget(self.cmdUndoOptimize) - self.cmdClearHistory = QtGui.QPushButton(self.layoutWidget1) - self.cmdClearHistory.setObjectName("cmdClearHistory") - self.horizontalLayout_3.addWidget(self.cmdClearHistory) - self.verticalLayout_6.addLayout(self.horizontalLayout_3) - self.splitter = QtGui.QSplitter(self.splitter_3) - self.splitter.setOrientation(QtCore.Qt.Vertical) - self.splitter.setObjectName("splitter") - self.groupBox = QtGui.QGroupBox(self.splitter) - self.groupBox.setMinimumSize(QtCore.QSize(0, 0)) - self.groupBox.setMaximumSize(QtCore.QSize(300, 16777215)) - self.groupBox.setObjectName("groupBox") - self.verticalLayout = QtGui.QVBoxLayout(self.groupBox) - self.verticalLayout.setObjectName("verticalLayout") - self.lstRelations = QtGui.QListWidget(self.groupBox) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lstRelations.sizePolicy().hasHeightForWidth()) - self.lstRelations.setSizePolicy(sizePolicy) - self.lstRelations.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.lstRelations.setObjectName("lstRelations") - self.verticalLayout.addWidget(self.lstRelations) - self.cmdNew = QtGui.QPushButton(self.groupBox) - self.cmdNew.setObjectName("cmdNew") - self.verticalLayout.addWidget(self.cmdNew) - self.cmdLoad = QtGui.QPushButton(self.groupBox) - self.cmdLoad.setObjectName("cmdLoad") - self.verticalLayout.addWidget(self.cmdLoad) - self.cmdSave = QtGui.QPushButton(self.groupBox) - self.cmdSave.setObjectName("cmdSave") - self.verticalLayout.addWidget(self.cmdSave) - self.cmdEdit = QtGui.QPushButton(self.groupBox) - self.cmdEdit.setObjectName("cmdEdit") - self.verticalLayout.addWidget(self.cmdEdit) - self.cmdUnload = QtGui.QPushButton(self.groupBox) - self.cmdUnload.setObjectName("cmdUnload") - self.verticalLayout.addWidget(self.cmdUnload) - self.groupBox_2 = QtGui.QGroupBox(self.splitter) - self.groupBox_2.setMinimumSize(QtCore.QSize(0, 0)) - self.groupBox_2.setMaximumSize(QtCore.QSize(300, 16777215)) - self.groupBox_2.setObjectName("groupBox_2") - self.verticalLayout_3 = QtGui.QVBoxLayout(self.groupBox_2) - self.verticalLayout_3.setObjectName("verticalLayout_3") - self.lstAttributes = QtGui.QListWidget(self.groupBox_2) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lstAttributes.sizePolicy().hasHeightForWidth()) - self.lstAttributes.setSizePolicy(sizePolicy) - self.lstAttributes.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.lstAttributes.setObjectName("lstAttributes") - self.verticalLayout_3.addWidget(self.lstAttributes) - self.verticalLayout_7.addWidget(self.splitter_4) - self.horizontalLayout_2 = QtGui.QHBoxLayout() - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.txtResult = QtGui.QLineEdit(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.txtResult.sizePolicy().hasHeightForWidth()) - self.txtResult.setSizePolicy(sizePolicy) - self.txtResult.setObjectName("txtResult") - self.horizontalLayout_2.addWidget(self.txtResult) - self.label = QtGui.QLabel(self.centralwidget) - self.label.setObjectName("label") - self.horizontalLayout_2.addWidget(self.label) - self.txtQuery = QtGui.QLineEdit(self.centralwidget) - self.txtQuery.setObjectName("txtQuery") - self.horizontalLayout_2.addWidget(self.txtQuery) - self.cmdClearQuery = QtGui.QPushButton(self.centralwidget) - self.cmdClearQuery.setObjectName("cmdClearQuery") - self.horizontalLayout_2.addWidget(self.cmdClearQuery) - self.cmdExecute = QtGui.QPushButton(self.centralwidget) - self.cmdExecute.setObjectName("cmdExecute") - self.horizontalLayout_2.addWidget(self.cmdExecute) - self.verticalLayout_7.addLayout(self.horizontalLayout_2) - MainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 19)) - self.menubar.setObjectName("menubar") - self.menuFile = QtGui.QMenu(self.menubar) - self.menuFile.setObjectName("menuFile") - self.menuAbout = QtGui.QMenu(self.menubar) - self.menuAbout.setObjectName("menuAbout") - self.action = QtGui.QAction(MainWindow) - self.action.setObjectName("action") - self.menuRelations = QtGui.QMenu(self.menubar) - self.menuRelations.setObjectName("menuRelations") - MainWindow.setMenuBar(self.menubar) - self.actionAbout = QtGui.QAction(MainWindow) - self.actionAbout.setMenuRole(QtGui.QAction.AboutRole) - self.actionAbout.setObjectName("actionAbout") - self.action_Load_relation = QtGui.QAction(MainWindow) - self.action_Load_relation.setObjectName("action_Load_relation") - self.action_Save_relation = QtGui.QAction(MainWindow) - self.action_Save_relation.setObjectName("action_Save_relation") - self.action_Quit = QtGui.QAction(MainWindow) - self.action_Quit.setMenuRole(QtGui.QAction.QuitRole) - self.action_Quit.setObjectName("action_Quit") - self.actionCheck_for_new_versions = QtGui.QAction(MainWindow) - self.actionCheck_for_new_versions.setObjectName("actionCheck_for_new_versions") - self.actionNew_relation = QtGui.QAction(MainWindow) - self.actionNew_relation.setObjectName("actionNew_relation") - self.actionEdit_relation = QtGui.QAction(MainWindow) - self.actionEdit_relation.setObjectName("actionEdit_relation") - self.actionNew_session = QtGui.QAction(MainWindow) - self.actionNew_session.setObjectName("actionNew_session") - self.actionSave_session_as = QtGui.QAction(MainWindow) - self.actionSave_session_as.setObjectName("actionSave_session_as") - self.actionManage_sessions = QtGui.QAction(MainWindow) - self.actionManage_sessions.setObjectName("actionManage_sessions") - self.actionUnload_relation = QtGui.QAction(MainWindow) - self.actionUnload_relation.setObjectName("actionUnload_relation") - self.menuFile.addSeparator() - self.menuFile.addAction(self.action_Quit) - self.menuAbout.addAction(self.actionAbout) - self.menuAbout.addAction(self.actionCheck_for_new_versions) - self.menuRelations.addAction(self.actionNew_relation) - self.menuRelations.addAction(self.action_Load_relation) - self.menuRelations.addAction(self.action_Save_relation) - self.menuRelations.addAction(self.actionEdit_relation) - self.menuRelations.addAction(self.actionUnload_relation) - self.menubar.addAction(self.menuFile.menuAction()) - self.menubar.addAction(self.menuRelations.menuAction()) - self.menubar.addAction(self.menuAbout.menuAction()) - self.label.setBuddy(self.txtQuery) - - self.retranslateUi(MainWindow) - QtCore.QObject.connect(self.cmdClearQuery, QtCore.SIGNAL("clicked()"), self.txtQuery.clear) - QtCore.QObject.connect(self.cmdClearHistory, QtCore.SIGNAL("clicked()"), self.lstHistory.clear) - QtCore.QObject.connect(self.txtQuery, QtCore.SIGNAL("returnPressed()"), MainWindow.execute) - QtCore.QObject.connect(self.cmdExecute, QtCore.SIGNAL("clicked()"), MainWindow.execute) - QtCore.QObject.connect(self.cmdAbout, QtCore.SIGNAL("clicked()"), MainWindow.showAbout) - QtCore.QObject.connect(self.cmdSurvey, QtCore.SIGNAL("clicked()"), MainWindow.showSurvey) - QtCore.QObject.connect(self.cmdProduct, QtCore.SIGNAL("clicked()"), MainWindow.addProduct) - QtCore.QObject.connect(self.cmdDifference, QtCore.SIGNAL("clicked()"), MainWindow.addDifference) - QtCore.QObject.connect(self.cmdArrow, QtCore.SIGNAL("clicked()"), MainWindow.addArrow) - QtCore.QObject.connect(self.cmdRename, QtCore.SIGNAL("clicked()"), MainWindow.addRename) - QtCore.QObject.connect(self.cmdSelection, QtCore.SIGNAL("clicked()"), MainWindow.addSelection) - QtCore.QObject.connect(self.cmdProjection, QtCore.SIGNAL("clicked()"), MainWindow.addProjection) - QtCore.QObject.connect(self.cmdUnload, QtCore.SIGNAL("clicked()"), MainWindow.unloadRelation) - QtCore.QObject.connect(self.cmdSave, QtCore.SIGNAL("clicked()"), MainWindow.saveRelation) - QtCore.QObject.connect(self.cmdLoad, QtCore.SIGNAL("clicked()"), MainWindow.loadRelation) - QtCore.QObject.connect(self.cmdOptimize, QtCore.SIGNAL("clicked()"), MainWindow.optimize) - QtCore.QObject.connect(self.cmdUndoOptimize, QtCore.SIGNAL("clicked()"), MainWindow.undoOptimize) - QtCore.QObject.connect(self.txtResult, QtCore.SIGNAL("returnPressed()"), self.txtQuery.setFocus) - QtCore.QObject.connect(self.cmdOuterRight, QtCore.SIGNAL("clicked()"), MainWindow.addORight) - QtCore.QObject.connect(self.cmdOuter, QtCore.SIGNAL("clicked()"), MainWindow.addOuter) - QtCore.QObject.connect(self.cmdOuterLeft, QtCore.SIGNAL("clicked()"), MainWindow.addOLeft) - QtCore.QObject.connect(self.cmdJoin, QtCore.SIGNAL("clicked()"), MainWindow.addJoin) - QtCore.QObject.connect(self.cmdDivision, QtCore.SIGNAL("clicked()"), MainWindow.addDivision) - QtCore.QObject.connect(self.cmdIntersection, QtCore.SIGNAL("clicked()"), MainWindow.addIntersection) - QtCore.QObject.connect(self.cmdUnion, QtCore.SIGNAL("clicked()"), MainWindow.addUnion) - QtCore.QObject.connect(self.lstRelations, QtCore.SIGNAL("itemDoubleClicked(QListWidgetItem*)"), MainWindow.printRelation) - QtCore.QObject.connect(self.lstRelations, QtCore.SIGNAL("itemClicked(QListWidgetItem*)"), MainWindow.showAttributes) - QtCore.QObject.connect(self.cmdClearQuery, QtCore.SIGNAL("clicked()"), self.txtQuery.setFocus) - QtCore.QObject.connect(self.lstHistory, QtCore.SIGNAL("itemDoubleClicked(QListWidgetItem*)"), MainWindow.resumeHistory) - QtCore.QObject.connect(self.actionAbout, QtCore.SIGNAL("triggered()"), MainWindow.showAbout) - QtCore.QObject.connect(self.action_Load_relation, QtCore.SIGNAL("triggered()"), MainWindow.loadRelation) - QtCore.QObject.connect(self.action_Save_relation, QtCore.SIGNAL("triggered()"), MainWindow.saveRelation) - QtCore.QObject.connect(self.action_Quit, QtCore.SIGNAL("triggered()"), MainWindow.close) - QtCore.QObject.connect(self.actionCheck_for_new_versions, QtCore.SIGNAL("triggered()"), MainWindow.checkVersion) - QtCore.QObject.connect(self.cmdEdit, QtCore.SIGNAL("clicked()"), MainWindow.editRelation) - QtCore.QObject.connect(self.actionEdit_relation, QtCore.SIGNAL("triggered()"), MainWindow.editRelation) - QtCore.QObject.connect(self.cmdNew, QtCore.SIGNAL("clicked()"), MainWindow.newRelation) - QtCore.QObject.connect(self.actionNew_relation, QtCore.SIGNAL("triggered()"), MainWindow.newRelation) - QtCore.QObject.connect(self.actionUnload_relation, QtCore.SIGNAL("triggered()"), MainWindow.unloadRelation) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - MainWindow.setTabOrder(self.cmdAbout, self.cmdSurvey) - MainWindow.setTabOrder(self.cmdSurvey, self.cmdProduct) - MainWindow.setTabOrder(self.cmdProduct, self.cmdDifference) - MainWindow.setTabOrder(self.cmdDifference, self.cmdUnion) - MainWindow.setTabOrder(self.cmdUnion, self.cmdIntersection) - MainWindow.setTabOrder(self.cmdIntersection, self.cmdDivision) - MainWindow.setTabOrder(self.cmdDivision, self.cmdJoin) - MainWindow.setTabOrder(self.cmdJoin, self.cmdOuterLeft) - MainWindow.setTabOrder(self.cmdOuterLeft, self.cmdOuterRight) - MainWindow.setTabOrder(self.cmdOuterRight, self.cmdOuter) - MainWindow.setTabOrder(self.cmdOuter, self.cmdProjection) - MainWindow.setTabOrder(self.cmdProjection, self.cmdSelection) - MainWindow.setTabOrder(self.cmdSelection, self.cmdRename) - MainWindow.setTabOrder(self.cmdRename, self.cmdArrow) - MainWindow.setTabOrder(self.cmdArrow, self.table) - MainWindow.setTabOrder(self.table, self.lstHistory) - MainWindow.setTabOrder(self.lstHistory, self.cmdOptimize) - MainWindow.setTabOrder(self.cmdOptimize, self.cmdUndoOptimize) - MainWindow.setTabOrder(self.cmdUndoOptimize, self.cmdClearHistory) - MainWindow.setTabOrder(self.cmdClearHistory, self.lstRelations) - MainWindow.setTabOrder(self.lstRelations, self.cmdLoad) - MainWindow.setTabOrder(self.cmdLoad, self.cmdSave) - MainWindow.setTabOrder(self.cmdSave, self.cmdUnload) - MainWindow.setTabOrder(self.cmdUnload, self.lstAttributes) - MainWindow.setTabOrder(self.lstAttributes, self.txtResult) - MainWindow.setTabOrder(self.txtResult, self.txtQuery) - MainWindow.setTabOrder(self.txtQuery, self.cmdClearQuery) - MainWindow.setTabOrder(self.cmdClearQuery, self.cmdExecute) - - def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Relational", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_3.setTitle(QtGui.QApplication.translate("MainWindow", "Menu", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdSurvey.setText(QtGui.QApplication.translate("MainWindow", "Survey", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_4.setTitle(QtGui.QApplication.translate("MainWindow", "Operators", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdProduct.setToolTip(QtGui.QApplication.translate("MainWindow", "Product", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdProduct.setText(QtGui.QApplication.translate("MainWindow", "*", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdDifference.setToolTip(QtGui.QApplication.translate("MainWindow", "Difference", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdDifference.setText(QtGui.QApplication.translate("MainWindow", "-", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdUnion.setToolTip(QtGui.QApplication.translate("MainWindow", "Union", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdUnion.setText(QtGui.QApplication.translate("MainWindow", "ᑌ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdIntersection.setToolTip(QtGui.QApplication.translate("MainWindow", "Intersection", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdIntersection.setText(QtGui.QApplication.translate("MainWindow", "ᑎ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdDivision.setToolTip(QtGui.QApplication.translate("MainWindow", "Division", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdDivision.setText(QtGui.QApplication.translate("MainWindow", "÷", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdJoin.setToolTip(QtGui.QApplication.translate("MainWindow", "Natural join", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdJoin.setText(QtGui.QApplication.translate("MainWindow", "ᐅᐊ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdOuterLeft.setToolTip(QtGui.QApplication.translate("MainWindow", "Left outer join", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdOuterLeft.setText(QtGui.QApplication.translate("MainWindow", "ᐅLEFTᐊ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdOuterRight.setToolTip(QtGui.QApplication.translate("MainWindow", "Right outer join", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdOuterRight.setText(QtGui.QApplication.translate("MainWindow", "ᐅRIGHTᐊ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdOuter.setToolTip(QtGui.QApplication.translate("MainWindow", "Full outer join", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdOuter.setText(QtGui.QApplication.translate("MainWindow", "ᐅFULLᐊ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdProjection.setToolTip(QtGui.QApplication.translate("MainWindow", "Projection", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdProjection.setText(QtGui.QApplication.translate("MainWindow", "π", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdSelection.setToolTip(QtGui.QApplication.translate("MainWindow", "Selection", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdSelection.setText(QtGui.QApplication.translate("MainWindow", "σ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdRename.setToolTip(QtGui.QApplication.translate("MainWindow", "Rename", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdRename.setText(QtGui.QApplication.translate("MainWindow", "ρ", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdArrow.setText(QtGui.QApplication.translate("MainWindow", "➡", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdOptimize.setText(QtGui.QApplication.translate("MainWindow", "Optimize", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdUndoOptimize.setText(QtGui.QApplication.translate("MainWindow", "Undo optimize", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdClearHistory.setText(QtGui.QApplication.translate("MainWindow", "Clear history", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("MainWindow", "Relations", None, QtGui.QApplication.UnicodeUTF8)) - self.lstRelations.setSortingEnabled(True) - self.cmdNew.setText(QtGui.QApplication.translate("MainWindow", "New relation", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdLoad.setText(QtGui.QApplication.translate("MainWindow", "Load relation", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdSave.setText(QtGui.QApplication.translate("MainWindow", "Save relation", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdEdit.setText(QtGui.QApplication.translate("MainWindow", "Edit relation", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdUnload.setText(QtGui.QApplication.translate("MainWindow", "Unload relation", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_2.setTitle(QtGui.QApplication.translate("MainWindow", "Attributes", None, QtGui.QApplication.UnicodeUTF8)) - self.txtResult.setText(QtGui.QApplication.translate("MainWindow", "_last1", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("MainWindow", "=", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdClearQuery.setText(QtGui.QApplication.translate("MainWindow", "⌫", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdExecute.setText(QtGui.QApplication.translate("MainWindow", "Execute", None, QtGui.QApplication.UnicodeUTF8)) - self.menuFile.setTitle(QtGui.QApplication.translate("MainWindow", "&File", None, QtGui.QApplication.UnicodeUTF8)) - self.menuAbout.setTitle(QtGui.QApplication.translate("MainWindow", "&Help", None, QtGui.QApplication.UnicodeUTF8)) - self.menuRelations.setTitle(QtGui.QApplication.translate("MainWindow", "Relations", None, QtGui.QApplication.UnicodeUTF8)) - self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "&About", None, QtGui.QApplication.UnicodeUTF8)) - self.action_Load_relation.setText(QtGui.QApplication.translate("MainWindow", "&Load relation", None, QtGui.QApplication.UnicodeUTF8)) - self.action_Load_relation.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+O", None, QtGui.QApplication.UnicodeUTF8)) - self.action_Save_relation.setText(QtGui.QApplication.translate("MainWindow", "&Save relation", None, QtGui.QApplication.UnicodeUTF8)) - self.action_Save_relation.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+S", None, QtGui.QApplication.UnicodeUTF8)) - self.action_Quit.setText(QtGui.QApplication.translate("MainWindow", "&Quit", None, QtGui.QApplication.UnicodeUTF8)) - self.action_Quit.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+Q", None, QtGui.QApplication.UnicodeUTF8)) - self.actionCheck_for_new_versions.setText(QtGui.QApplication.translate("MainWindow", "Check for new versions", None, QtGui.QApplication.UnicodeUTF8)) - self.actionNew_relation.setText(QtGui.QApplication.translate("MainWindow", "New relation", None, QtGui.QApplication.UnicodeUTF8)) - self.actionNew_relation.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+N", None, QtGui.QApplication.UnicodeUTF8)) - self.actionEdit_relation.setText(QtGui.QApplication.translate("MainWindow", "Edit relation", None, QtGui.QApplication.UnicodeUTF8)) - self.actionEdit_relation.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+E", None, QtGui.QApplication.UnicodeUTF8)) - self.actionNew_session.setText(QtGui.QApplication.translate("MainWindow", "New session", None, QtGui.QApplication.UnicodeUTF8)) - self.actionSave_session_as.setText(QtGui.QApplication.translate("MainWindow", "Save session as", None, QtGui.QApplication.UnicodeUTF8)) - self.actionSave_session_as.setToolTip(QtGui.QApplication.translate("MainWindow", "Save session as", None, QtGui.QApplication.UnicodeUTF8)) - self.actionManage_sessions.setText(QtGui.QApplication.translate("MainWindow", "Manage sessions", None, QtGui.QApplication.UnicodeUTF8)) - self.actionUnload_relation.setText(QtGui.QApplication.translate("MainWindow", "Unload relation", None, QtGui.QApplication.UnicodeUTF8)) - diff --git a/relational_pyside/maingui.ui b/relational_pyside/maingui.ui deleted file mode 120000 index d67ceb0..0000000 --- a/relational_pyside/maingui.ui +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/maingui.ui \ No newline at end of file diff --git a/relational_pyside/rel_edit.py b/relational_pyside/rel_edit.py deleted file mode 100644 index 9347f85..0000000 --- a/relational_pyside/rel_edit.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'relational_pyside/rel_edit.ui' -# -# Created: Fri Dec 27 00:23:51 2013 -# by: pyside-uic 0.2.15 running on PySide 1.2.1 -# -# WARNING! All changes made in this file will be lost! - -from PySide import QtCore, QtGui - -class Ui_Dialog(object): - def setupUi(self, Dialog): - Dialog.setObjectName("Dialog") - Dialog.resize(594, 444) - self.verticalLayout_2 = QtGui.QVBoxLayout(Dialog) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.groupBox = QtGui.QGroupBox(Dialog) - self.groupBox.setObjectName("groupBox") - self.verticalLayout = QtGui.QVBoxLayout(self.groupBox) - self.verticalLayout.setObjectName("verticalLayout") - self.cmdAddTuple = QtGui.QPushButton(self.groupBox) - self.cmdAddTuple.setObjectName("cmdAddTuple") - self.verticalLayout.addWidget(self.cmdAddTuple) - self.cmdRemoveTuple = QtGui.QPushButton(self.groupBox) - self.cmdRemoveTuple.setObjectName("cmdRemoveTuple") - self.verticalLayout.addWidget(self.cmdRemoveTuple) - self.cmdAddColumn = QtGui.QPushButton(self.groupBox) - self.cmdAddColumn.setObjectName("cmdAddColumn") - self.verticalLayout.addWidget(self.cmdAddColumn) - self.cmdRemoveColumn = QtGui.QPushButton(self.groupBox) - self.cmdRemoveColumn.setObjectName("cmdRemoveColumn") - self.verticalLayout.addWidget(self.cmdRemoveColumn) - self.horizontalLayout.addWidget(self.groupBox) - self.table = QtGui.QTableWidget(Dialog) - self.table.setObjectName("table") - self.table.setColumnCount(0) - self.table.setRowCount(0) - self.horizontalLayout.addWidget(self.table) - self.verticalLayout_2.addLayout(self.horizontalLayout) - self.label = QtGui.QLabel(Dialog) - self.label.setObjectName("label") - self.verticalLayout_2.addWidget(self.label) - self.buttonBox = QtGui.QDialogButtonBox(Dialog) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName("buttonBox") - self.verticalLayout_2.addWidget(self.buttonBox) - - self.retranslateUi(Dialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), Dialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), Dialog.reject) - QtCore.QObject.connect(self.cmdAddColumn, QtCore.SIGNAL("clicked()"), Dialog.addColumn) - QtCore.QObject.connect(self.cmdRemoveColumn, QtCore.SIGNAL("clicked()"), Dialog.deleteColumn) - QtCore.QObject.connect(self.cmdAddTuple, QtCore.SIGNAL("clicked()"), Dialog.addRow) - QtCore.QObject.connect(self.cmdRemoveTuple, QtCore.SIGNAL("clicked()"), Dialog.deleteRow) - QtCore.QMetaObject.connectSlotsByName(Dialog) - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Relation editor", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("Dialog", "Edit", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdAddTuple.setText(QtGui.QApplication.translate("Dialog", "Add tuple", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdRemoveTuple.setText(QtGui.QApplication.translate("Dialog", "Remove tuple", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdAddColumn.setText(QtGui.QApplication.translate("Dialog", "Add column", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdRemoveColumn.setText(QtGui.QApplication.translate("Dialog", "Remove column", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("Dialog", "Remember that new relations and modified relations are not automatically saved", None, QtGui.QApplication.UnicodeUTF8)) - diff --git a/relational_pyside/rel_edit.ui b/relational_pyside/rel_edit.ui deleted file mode 120000 index 29f6d8a..0000000 --- a/relational_pyside/rel_edit.ui +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/rel_edit.ui \ No newline at end of file diff --git a/relational_pyside/survey.py b/relational_pyside/survey.py deleted file mode 100644 index f335228..0000000 --- a/relational_pyside/survey.py +++ /dev/null @@ -1,132 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'relational_pyside/survey.ui' -# -# Created: Fri Dec 27 00:23:51 2013 -# by: pyside-uic 0.2.15 running on PySide 1.2.1 -# -# WARNING! All changes made in this file will be lost! - -from PySide import QtCore, QtGui - -class Ui_Form(object): - def setupUi(self, 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("verticalLayout") - self.formLayout = QtGui.QGridLayout() - self.formLayout.setObjectName("formLayout") - self.txtSystem = QtGui.QLineEdit(Form) - self.txtSystem.setObjectName("txtSystem") - self.formLayout.addWidget(self.txtSystem, 0, 1, 1, 1) - self.label = QtGui.QLabel(Form) - self.label.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.label.setObjectName("label") - self.formLayout.addWidget(self.label, 1, 0, 1, 1) - self.txtCountry = QtGui.QLineEdit(Form) - self.txtCountry.setObjectName("txtCountry") - self.formLayout.addWidget(self.txtCountry, 1, 1, 1, 1) - self.label_2 = QtGui.QLabel(Form) - self.label_2.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.label_2.setObjectName("label_2") - self.formLayout.addWidget(self.label_2, 2, 0, 1, 1) - self.txtSchool = QtGui.QLineEdit(Form) - self.txtSchool.setObjectName("txtSchool") - self.formLayout.addWidget(self.txtSchool, 2, 1, 1, 1) - self.label_3 = QtGui.QLabel(Form) - self.label_3.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.label_3.setObjectName("label_3") - self.formLayout.addWidget(self.label_3, 3, 0, 1, 1) - self.txtAge = QtGui.QLineEdit(Form) - self.txtAge.setObjectName("txtAge") - self.formLayout.addWidget(self.txtAge, 3, 1, 1, 1) - self.label_4 = QtGui.QLabel(Form) - self.label_4.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - self.label_4.setObjectName("label_4") - self.formLayout.addWidget(self.label_4, 4, 0, 1, 1) - self.txtFind = QtGui.QLineEdit(Form) - self.txtFind.setObjectName("txtFind") - self.formLayout.addWidget(self.txtFind, 4, 1, 1, 1) - self.label_5 = QtGui.QLabel(Form) - self.label_5.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) - 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("label_6") - self.formLayout.addWidget(self.label_6, 6, 0, 1, 1) - self.txtComments = QtGui.QTextEdit(Form) - self.txtComments.setTabChangesFocus(True) - self.txtComments.setObjectName("txtComments") - self.formLayout.addWidget(self.txtComments, 6, 1, 1, 1) - self.label_7 = QtGui.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("txtEmail") - self.formLayout.addWidget(self.txtEmail, 5, 1, 1, 1) - self.verticalLayout.addLayout(self.formLayout) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.cmdCancel = QtGui.QPushButton(Form) - self.cmdCancel.setObjectName("cmdCancel") - self.horizontalLayout.addWidget(self.cmdCancel) - self.cmdClear = QtGui.QPushButton(Form) - self.cmdClear.setObjectName("cmdClear") - self.horizontalLayout.addWidget(self.cmdClear) - self.cmdSend = QtGui.QPushButton(Form) - self.cmdSend.setDefault(True) - self.cmdSend.setObjectName("cmdSend") - self.horizontalLayout.addWidget(self.cmdSend) - self.verticalLayout.addLayout(self.horizontalLayout) - self.label.setBuddy(self.txtCountry) - self.label_2.setBuddy(self.txtSchool) - self.label_3.setBuddy(self.txtAge) - self.label_4.setBuddy(self.txtFind) - self.label_5.setBuddy(self.txtSystem) - self.label_6.setBuddy(self.txtComments) - self.label_7.setBuddy(self.txtEmail) - - self.retranslateUi(Form) - QtCore.QObject.connect(self.cmdCancel, QtCore.SIGNAL("clicked()"), Form.close) - QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL("clicked()"), self.txtComments.clear) - QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL("clicked()"), self.txtFind.clear) - QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL("clicked()"), self.txtAge.clear) - QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL("clicked()"), self.txtSchool.clear) - QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL("clicked()"), self.txtCountry.clear) - QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL("clicked()"), self.txtSystem.clear) - QtCore.QObject.connect(self.txtSystem, QtCore.SIGNAL("returnPressed()"), self.txtCountry.setFocus) - QtCore.QObject.connect(self.txtCountry, QtCore.SIGNAL("returnPressed()"), self.txtSchool.setFocus) - QtCore.QObject.connect(self.txtSchool, QtCore.SIGNAL("returnPressed()"), self.txtAge.setFocus) - QtCore.QObject.connect(self.txtAge, QtCore.SIGNAL("returnPressed()"), self.txtFind.setFocus) - QtCore.QObject.connect(self.cmdSend, QtCore.SIGNAL("clicked()"), Form.send) - QtCore.QObject.connect(self.cmdClear, QtCore.SIGNAL("clicked()"), self.txtEmail.clear) - QtCore.QObject.connect(self.txtFind, QtCore.SIGNAL("returnPressed()"), self.txtEmail.setFocus) - QtCore.QObject.connect(self.txtEmail, QtCore.SIGNAL("returnPressed()"), self.txtComments.setFocus) - QtCore.QMetaObject.connectSlotsByName(Form) - Form.setTabOrder(self.txtSystem, self.txtCountry) - Form.setTabOrder(self.txtCountry, self.txtSchool) - Form.setTabOrder(self.txtSchool, self.txtAge) - Form.setTabOrder(self.txtAge, self.txtFind) - Form.setTabOrder(self.txtFind, self.txtEmail) - Form.setTabOrder(self.txtEmail, self.txtComments) - Form.setTabOrder(self.txtComments, self.cmdSend) - Form.setTabOrder(self.cmdSend, self.cmdClear) - Form.setTabOrder(self.cmdClear, self.cmdCancel) - - def retranslateUi(self, Form): - Form.setWindowTitle(QtGui.QApplication.translate("Form", "Survey", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("Form", "Country", None, QtGui.QApplication.UnicodeUTF8)) - self.label_2.setText(QtGui.QApplication.translate("Form", "School", None, QtGui.QApplication.UnicodeUTF8)) - self.label_3.setText(QtGui.QApplication.translate("Form", "Age", None, QtGui.QApplication.UnicodeUTF8)) - self.label_4.setText(QtGui.QApplication.translate("Form", "How did you find relational", None, QtGui.QApplication.UnicodeUTF8)) - self.label_5.setText(QtGui.QApplication.translate("Form", "System", None, QtGui.QApplication.UnicodeUTF8)) - self.label_6.setText(QtGui.QApplication.translate("Form", "Comments", None, QtGui.QApplication.UnicodeUTF8)) - self.label_7.setText(QtGui.QApplication.translate("Form", "Email (only if you want a reply)", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdCancel.setText(QtGui.QApplication.translate("Form", "Cancel", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdClear.setText(QtGui.QApplication.translate("Form", "Clear", None, QtGui.QApplication.UnicodeUTF8)) - self.cmdSend.setText(QtGui.QApplication.translate("Form", "Send", None, QtGui.QApplication.UnicodeUTF8)) - diff --git a/relational_pyside/survey.ui b/relational_pyside/survey.ui deleted file mode 120000 index 1e13504..0000000 --- a/relational_pyside/survey.ui +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/survey.ui \ No newline at end of file diff --git a/relational_pyside/surveyForm.py b/relational_pyside/surveyForm.py deleted file mode 120000 index 40164de..0000000 --- a/relational_pyside/surveyForm.py +++ /dev/null @@ -1 +0,0 @@ -../relational_gui/surveyForm.py \ No newline at end of file