diff --git a/relational_gui/maingui.py b/relational_gui/maingui.py
index bd7c41f..29ed85b 100644
--- a/relational_gui/maingui.py
+++ b/relational_gui/maingui.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'relational_gui/maingui.ui'
#
-# Created: Thu Feb 19 13:07:47 2015
+# Created: Mon Feb 23 15:16:57 2015
# by: PyQt5 UI code generator 5.3.2
#
# WARNING! All changes made in this file will be lost!
@@ -41,42 +41,55 @@ class Ui_MainWindow(object):
self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.groupBox_4)
self.verticalLayout_10.setObjectName("verticalLayout_10")
self.cmdProduct = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdProduct.setText("*")
self.cmdProduct.setObjectName("cmdProduct")
self.verticalLayout_10.addWidget(self.cmdProduct)
self.cmdDifference = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdDifference.setText("-")
self.cmdDifference.setObjectName("cmdDifference")
self.verticalLayout_10.addWidget(self.cmdDifference)
self.cmdUnion = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdUnion.setText("ᑌ")
self.cmdUnion.setObjectName("cmdUnion")
self.verticalLayout_10.addWidget(self.cmdUnion)
self.cmdIntersection = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdIntersection.setText("ᑎ")
self.cmdIntersection.setObjectName("cmdIntersection")
self.verticalLayout_10.addWidget(self.cmdIntersection)
self.cmdDivision = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdDivision.setText("÷")
self.cmdDivision.setObjectName("cmdDivision")
self.verticalLayout_10.addWidget(self.cmdDivision)
self.cmdJoin = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdJoin.setText("ᐅᐊ")
self.cmdJoin.setObjectName("cmdJoin")
self.verticalLayout_10.addWidget(self.cmdJoin)
self.cmdOuterLeft = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdOuterLeft.setText("ᐅLEFTᐊ")
self.cmdOuterLeft.setObjectName("cmdOuterLeft")
self.verticalLayout_10.addWidget(self.cmdOuterLeft)
self.cmdOuterRight = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdOuterRight.setText("ᐅRIGHTᐊ")
self.cmdOuterRight.setObjectName("cmdOuterRight")
self.verticalLayout_10.addWidget(self.cmdOuterRight)
self.cmdOuter = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdOuter.setText("ᐅFULLᐊ")
self.cmdOuter.setObjectName("cmdOuter")
self.verticalLayout_10.addWidget(self.cmdOuter)
self.cmdProjection = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdProjection.setText("π")
self.cmdProjection.setObjectName("cmdProjection")
self.verticalLayout_10.addWidget(self.cmdProjection)
self.cmdSelection = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdSelection.setText("σ")
self.cmdSelection.setObjectName("cmdSelection")
self.verticalLayout_10.addWidget(self.cmdSelection)
self.cmdRename = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdRename.setText("ρ")
self.cmdRename.setObjectName("cmdRename")
self.verticalLayout_10.addWidget(self.cmdRename)
self.cmdArrow = QtWidgets.QPushButton(self.groupBox_4)
+ self.cmdArrow.setText("➡")
self.cmdArrow.setObjectName("cmdArrow")
self.verticalLayout_10.addWidget(self.cmdArrow)
spacerItem = QtWidgets.QSpacerItem(20, 25, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
@@ -108,9 +121,6 @@ class Ui_MainWindow(object):
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 = QtWidgets.QHBoxLayout()
@@ -326,30 +336,17 @@ class Ui_MainWindow(object):
self.cmdSurvey.setText(_translate("MainWindow", "Survey"))
self.groupBox_4.setTitle(_translate("MainWindow", "Operators"))
self.cmdProduct.setToolTip(_translate("MainWindow", "Product"))
- self.cmdProduct.setText(_translate("MainWindow", "*"))
self.cmdDifference.setToolTip(_translate("MainWindow", "Difference"))
- self.cmdDifference.setText(_translate("MainWindow", "-"))
self.cmdUnion.setToolTip(_translate("MainWindow", "Union"))
- self.cmdUnion.setText(_translate("MainWindow", "ᑌ"))
self.cmdIntersection.setToolTip(_translate("MainWindow", "Intersection"))
- self.cmdIntersection.setText(_translate("MainWindow", "ᑎ"))
self.cmdDivision.setToolTip(_translate("MainWindow", "Division"))
- self.cmdDivision.setText(_translate("MainWindow", "÷"))
self.cmdJoin.setToolTip(_translate("MainWindow", "Natural join"))
- self.cmdJoin.setText(_translate("MainWindow", "ᐅᐊ"))
self.cmdOuterLeft.setToolTip(_translate("MainWindow", "Left outer join"))
- self.cmdOuterLeft.setText(_translate("MainWindow", "ᐅLEFTᐊ"))
self.cmdOuterRight.setToolTip(_translate("MainWindow", "Right outer join"))
- self.cmdOuterRight.setText(_translate("MainWindow", "ᐅRIGHTᐊ"))
self.cmdOuter.setToolTip(_translate("MainWindow", "Full outer join"))
- self.cmdOuter.setText(_translate("MainWindow", "ᐅFULLᐊ"))
self.cmdProjection.setToolTip(_translate("MainWindow", "Projection"))
- self.cmdProjection.setText(_translate("MainWindow", "π"))
self.cmdSelection.setToolTip(_translate("MainWindow", "Selection"))
- self.cmdSelection.setText(_translate("MainWindow", "σ"))
self.cmdRename.setToolTip(_translate("MainWindow", "Rename"))
- self.cmdRename.setText(_translate("MainWindow", "ρ"))
- self.cmdArrow.setText(_translate("MainWindow", "➡"))
self.cmdOptimize.setText(_translate("MainWindow", "Optimize"))
self.cmdUndoOptimize.setText(_translate("MainWindow", "Undo optimize"))
self.cmdClearHistory.setText(_translate("MainWindow", "Clear history"))
diff --git a/relational_gui/maingui.ui b/relational_gui/maingui.ui
index 94ecc3a..e2c862f 100644
--- a/relational_gui/maingui.ui
+++ b/relational_gui/maingui.ui
@@ -58,7 +58,7 @@
Product
- *
+ *
@@ -68,7 +68,7 @@
Difference
- -
+ -
@@ -78,7 +78,7 @@
Union
- ᑌ
+ ᑌ
@@ -88,7 +88,7 @@
Intersection
- ᑎ
+ ᑎ
@@ -98,7 +98,7 @@
Division
- ÷
+ ÷
@@ -108,7 +108,7 @@
Natural join
- ᐅᐊ
+ ᐅᐊ
@@ -118,7 +118,7 @@
Left outer join
- ᐅLEFTᐊ
+ ᐅLEFTᐊ
@@ -128,7 +128,7 @@
Right outer join
- ᐅRIGHTᐊ
+ ᐅRIGHTᐊ
@@ -138,7 +138,7 @@
Full outer join
- ᐅFULLᐊ
+ ᐅFULLᐊ
@@ -148,7 +148,7 @@
Projection
- π
+ π
@@ -158,7 +158,7 @@
Selection
- σ
+ σ
@@ -168,14 +168,14 @@
Rename
- ρ
+ ρ
-
- ➡
+ ➡
@@ -252,11 +252,6 @@
0
-
-
- false
-
-
-