diff --git a/relational_gui/maingui.py b/relational_gui/maingui.py
index 0d2aac4..18dbf48 100644
--- a/relational_gui/maingui.py
+++ b/relational_gui/maingui.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_gui/maingui.ui'
#
-# Created: Sun Jun 30 11:47:05 2013
-# by: PyQt4 UI code generator 4.10.2
+# Created: Fri Dec 27 00:05:54 2013
+# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -213,7 +213,7 @@ class Ui_MainWindow(object):
self.verticalLayout_7.addLayout(self.horizontalLayout_2)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtGui.QMenuBar(MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 20))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 19))
self.menubar.setObjectName(_fromUtf8("menubar"))
self.menuFile = QtGui.QMenu(self.menubar)
self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -221,8 +221,6 @@ class Ui_MainWindow(object):
self.menuAbout.setObjectName(_fromUtf8("menuAbout"))
self.action = QtGui.QAction(MainWindow)
self.action.setObjectName(_fromUtf8("action"))
- self.menuSession = QtGui.QMenu(self.menubar)
- self.menuSession.setObjectName(_fromUtf8("menuSession"))
self.menuRelations = QtGui.QMenu(self.menubar)
self.menuRelations.setObjectName(_fromUtf8("menuRelations"))
MainWindow.setMenuBar(self.menubar)
@@ -254,9 +252,6 @@ class Ui_MainWindow(object):
self.menuFile.addAction(self.action_Quit)
self.menuAbout.addAction(self.actionAbout)
self.menuAbout.addAction(self.actionCheck_for_new_versions)
- self.menuSession.addAction(self.actionNew_session)
- self.menuSession.addAction(self.actionSave_session_as)
- self.menuSession.addAction(self.actionManage_sessions)
self.menuRelations.addAction(self.actionNew_relation)
self.menuRelations.addAction(self.action_Load_relation)
self.menuRelations.addAction(self.action_Save_relation)
@@ -264,7 +259,6 @@ class Ui_MainWindow(object):
self.menuRelations.addAction(self.actionUnload_relation)
self.menubar.addAction(self.menuFile.menuAction())
self.menubar.addAction(self.menuRelations.menuAction())
- self.menubar.addAction(self.menuSession.menuAction())
self.menubar.addAction(self.menuAbout.menuAction())
self.label.setBuddy(self.txtQuery)
@@ -307,9 +301,6 @@ class Ui_MainWindow(object):
QtCore.QObject.connect(self.actionEdit_relation, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.editRelation)
QtCore.QObject.connect(self.cmdNew, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.newRelation)
QtCore.QObject.connect(self.actionNew_relation, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.newRelation)
- QtCore.QObject.connect(self.actionManage_sessions, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.manageSessions)
- QtCore.QObject.connect(self.actionNew_session, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.newSession)
- QtCore.QObject.connect(self.actionSave_session_as, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.saveSessionAs)
QtCore.QObject.connect(self.actionUnload_relation, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.unloadRelation)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
MainWindow.setTabOrder(self.cmdAbout, self.cmdSurvey)
@@ -389,7 +380,6 @@ class Ui_MainWindow(object):
self.cmdExecute.setText(_translate("MainWindow", "Execute", None))
self.menuFile.setTitle(_translate("MainWindow", "&File", None))
self.menuAbout.setTitle(_translate("MainWindow", "&Help", None))
- self.menuSession.setTitle(_translate("MainWindow", "Session", None))
self.menuRelations.setTitle(_translate("MainWindow", "Relations", None))
self.actionAbout.setText(_translate("MainWindow", "&About", None))
self.action_Load_relation.setText(_translate("MainWindow", "&Load relation", None))
diff --git a/relational_gui/maingui.ui b/relational_gui/maingui.ui
index 6afdbfb..94ecc3a 100644
--- a/relational_gui/maingui.ui
+++ b/relational_gui/maingui.ui
@@ -455,7 +455,7 @@
0
0
800
- 20
+ 19
-
-
@@ -1217,54 +1208,6 @@
-
- actionManage_sessions
- triggered()
- MainWindow
- manageSessions()
-
-
- -1
- -1
-
-
- 399
- 305
-
-
-
-
- actionNew_session
- triggered()
- MainWindow
- newSession()
-
-
- -1
- -1
-
-
- 399
- 305
-
-
-
-
- actionSave_session_as
- triggered()
- MainWindow
- saveSessionAs()
-
-
- -1
- -1
-
-
- 399
- 305
-
-
-
actionUnload_relation
triggered()
diff --git a/relational_gui/rel_edit.py b/relational_gui/rel_edit.py
index d489442..94018df 100644
--- a/relational_gui/rel_edit.py
+++ b/relational_gui/rel_edit.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_gui/rel_edit.ui'
#
-# Created: Sat Oct 22 15:25:32 2011
-# by: PyQt4 UI code generator 4.8.3
+# Created: Fri Dec 27 00:05:54 2013
+# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- _fromUtf8 = lambda s: s
+ 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)
class Ui_Dialog(object):
def setupUi(self, Dialog):
@@ -64,11 +73,11 @@ class Ui_Dialog(object):
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))
+ Dialog.setWindowTitle(_translate("Dialog", "Relation editor", None))
+ self.groupBox.setTitle(_translate("Dialog", "Edit", None))
+ self.cmdAddTuple.setText(_translate("Dialog", "Add tuple", None))
+ self.cmdRemoveTuple.setText(_translate("Dialog", "Remove tuple", None))
+ self.cmdAddColumn.setText(_translate("Dialog", "Add column", None))
+ self.cmdRemoveColumn.setText(_translate("Dialog", "Remove column", None))
+ self.label.setText(_translate("Dialog", "Remember that new relations and modified relations are not automatically saved", None))
diff --git a/relational_gui/survey.py b/relational_gui/survey.py
index 088cfa8..4c7d515 100644
--- a/relational_gui/survey.py
+++ b/relational_gui/survey.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_gui/survey.ui'
#
-# Created: Sat Oct 22 15:25:32 2011
-# by: PyQt4 UI code generator 4.8.3
+# Created: Fri Dec 27 00:05:54 2013
+# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- _fromUtf8 = lambda s: s
+ 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)
class Ui_Form(object):
def setupUi(self, Form):
@@ -123,15 +132,15 @@ class Ui_Form(object):
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))
+ 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))
diff --git a/relational_pyside/maingui.py b/relational_pyside/maingui.py
index 3588d8c..433e7cb 100644
--- a/relational_pyside/maingui.py
+++ b/relational_pyside/maingui.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_pyside/maingui.ui'
#
-# Created: Sat Oct 22 15:25:32 2011
-# by: pyside-uic 0.2.13 running on PySide 1.0.7
+# Created: Fri Dec 27 00:05:55 2013
+# by: pyside-uic 0.2.15 running on PySide 1.2.1
#
# WARNING! All changes made in this file will be lost!
@@ -199,7 +199,7 @@ class Ui_MainWindow(object):
self.verticalLayout_7.addLayout(self.horizontalLayout_2)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtGui.QMenuBar(MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 20))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 19))
self.menubar.setObjectName("menubar")
self.menuFile = QtGui.QMenu(self.menubar)
self.menuFile.setObjectName("menuFile")
@@ -207,6 +207,8 @@ class Ui_MainWindow(object):
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)
@@ -224,15 +226,25 @@ class Ui_MainWindow(object):
self.actionNew_relation.setObjectName("actionNew_relation")
self.actionEdit_relation = QtGui.QAction(MainWindow)
self.actionEdit_relation.setObjectName("actionEdit_relation")
- self.menuFile.addAction(self.actionNew_relation)
- self.menuFile.addAction(self.action_Load_relation)
- self.menuFile.addAction(self.action_Save_relation)
- self.menuFile.addAction(self.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)
@@ -275,6 +287,7 @@ class Ui_MainWindow(object):
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)
@@ -311,17 +324,29 @@ class Ui_MainWindow(object):
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))
@@ -341,6 +366,7 @@ class Ui_MainWindow(object):
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))
@@ -353,4 +379,9 @@ class Ui_MainWindow(object):
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/rel_edit.py b/relational_pyside/rel_edit.py
index 9f25a63..f94aed7 100644
--- a/relational_pyside/rel_edit.py
+++ b/relational_pyside/rel_edit.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_pyside/rel_edit.ui'
#
-# Created: Sat Oct 22 15:25:32 2011
-# by: pyside-uic 0.2.13 running on PySide 1.0.7
+# Created: Fri Dec 27 00:05:55 2013
+# by: pyside-uic 0.2.15 running on PySide 1.2.1
#
# WARNING! All changes made in this file will be lost!
diff --git a/relational_pyside/survey.py b/relational_pyside/survey.py
index 1420206..11b5396 100644
--- a/relational_pyside/survey.py
+++ b/relational_pyside/survey.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_pyside/survey.ui'
#
-# Created: Sat Oct 22 15:25:32 2011
-# by: pyside-uic 0.2.13 running on PySide 1.0.7
+# Created: Fri Dec 27 00:05:54 2013
+# by: pyside-uic 0.2.15 running on PySide 1.2.1
#
# WARNING! All changes made in this file will be lost!