regenerated UI

relational_gui/maingui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'relational_gui/maingui.ui'
 #
-# Created: Sun Jun  7 01:48:25 2015
+# Created: Sun Jun  7 13:34:01 2015
 #      by: PyQt5 UI code generator 5.3.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -15,17 +15,11 @@ class Ui_MainWindow(object):
         MainWindow.resize(800, 669)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.centralwidget)
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.centralwidget)
-        self.verticalLayout_7.setObjectName("verticalLayout_7")
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.splitter_4 = QtWidgets.QSplitter(self.centralwidget)
+        self.verticalLayout_11 = QtWidgets.QVBoxLayout()
-        self.splitter_4.setOrientation(QtCore.Qt.Horizontal)
-        self.splitter_4.setObjectName("splitter_4")
-        self.layoutWidget = QtWidgets.QWidget(self.splitter_4)
-        self.layoutWidget.setObjectName("layoutWidget")
-        self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.layoutWidget)
-        self.verticalLayout_11.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_11.setObjectName("verticalLayout_11")
-        self.groupBox_3 = QtWidgets.QGroupBox(self.layoutWidget)
+        self.groupBox_3 = QtWidgets.QGroupBox(self.centralwidget)
         self.groupBox_3.setObjectName("groupBox_3")
         self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_3)
         self.verticalLayout_5.setObjectName("verticalLayout_5")
@@ -36,9 +30,7 @@ class Ui_MainWindow(object):
         self.cmdSurvey.setObjectName("cmdSurvey")
         self.verticalLayout_5.addWidget(self.cmdSurvey)
         self.verticalLayout_11.addWidget(self.groupBox_3)
-        self.groupOperators = QtWidgets.QGroupBox(self.layoutWidget)
+        self.groupOperators = QtWidgets.QFrame(self.centralwidget)
-        self.groupOperators.setTitle("")
-        self.groupOperators.setFlat(True)
         self.groupOperators.setObjectName("groupOperators")
         self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.groupOperators)
         self.verticalLayout_10.setObjectName("verticalLayout_10")
@@ -97,7 +89,10 @@ class Ui_MainWindow(object):
         spacerItem = QtWidgets.QSpacerItem(20, 25, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout_10.addItem(spacerItem)
         self.verticalLayout_11.addWidget(self.groupOperators)
-        self.splitter_3 = QtWidgets.QSplitter(self.splitter_4)
+        self.horizontalLayout_4.addLayout(self.verticalLayout_11)
+        self.verticalLayout = QtWidgets.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.splitter_3 = QtWidgets.QSplitter(self.centralwidget)
         self.splitter_3.setOrientation(QtCore.Qt.Horizontal)
         self.splitter_3.setObjectName("splitter_3")
         self.splitter_2 = QtWidgets.QSplitter(self.splitter_3)
@@ -109,13 +104,13 @@ class Ui_MainWindow(object):
         self.table.setRootIsDecorated(False)
         self.table.setObjectName("table")
         self.table.headerItem().setText(0, "Empty relation")
-        self.layoutWidget1 = QtWidgets.QWidget(self.splitter_2)
+        self.layoutWidget = QtWidgets.QWidget(self.splitter_2)
-        self.layoutWidget1.setObjectName("layoutWidget1")
+        self.layoutWidget.setObjectName("layoutWidget")
-        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.layoutWidget1)
+        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.layoutWidget)
         self.verticalLayout_6.setSizeConstraint(QtWidgets.QLayout.SetMinimumSize)
         self.verticalLayout_6.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.frmOptimizations = QtWidgets.QFrame(self.layoutWidget1)
+        self.frmOptimizations = QtWidgets.QFrame(self.layoutWidget)
         self.frmOptimizations.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.frmOptimizations.setFrameShadow(QtWidgets.QFrame.Plain)
         self.frmOptimizations.setLineWidth(0)
@@ -145,7 +140,7 @@ class Ui_MainWindow(object):
         self.horizontalLayout_3.addWidget(self.cmdClearHistory)
         self.verticalLayout_2.addLayout(self.horizontalLayout_3)
         self.verticalLayout_6.addWidget(self.frmOptimizations)
-        self.frmMultiLine = QtWidgets.QFrame(self.layoutWidget1)
+        self.frmMultiLine = QtWidgets.QFrame(self.layoutWidget)
         self.frmMultiLine.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.frmMultiLine.setFrameShadow(QtWidgets.QFrame.Plain)
         self.frmMultiLine.setLineWidth(0)
@@ -185,8 +180,8 @@ class Ui_MainWindow(object):
         self.groupBox.setMinimumSize(QtCore.QSize(0, 0))
         self.groupBox.setMaximumSize(QtCore.QSize(300, 16777215))
         self.groupBox.setObjectName("groupBox")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox)
+        self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.groupBox)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout_7.setObjectName("verticalLayout_7")
         self.lstRelations = QtWidgets.QListWidget(self.groupBox)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
@@ -195,22 +190,25 @@ class Ui_MainWindow(object):
         self.lstRelations.setSizePolicy(sizePolicy)
         self.lstRelations.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.lstRelations.setObjectName("lstRelations")
-        self.verticalLayout.addWidget(self.lstRelations)
+        self.verticalLayout_7.addWidget(self.lstRelations)
-        self.cmdNew = QtWidgets.QPushButton(self.groupBox)
+        self.gridLayout = QtWidgets.QGridLayout()
-        self.cmdNew.setObjectName("cmdNew")
+        self.gridLayout.setObjectName("gridLayout")
-        self.verticalLayout.addWidget(self.cmdNew)
-        self.cmdLoad = QtWidgets.QPushButton(self.groupBox)
-        self.cmdLoad.setObjectName("cmdLoad")
-        self.verticalLayout.addWidget(self.cmdLoad)
-        self.cmdSave = QtWidgets.QPushButton(self.groupBox)
-        self.cmdSave.setObjectName("cmdSave")
-        self.verticalLayout.addWidget(self.cmdSave)
         self.cmdEdit = QtWidgets.QPushButton(self.groupBox)
         self.cmdEdit.setObjectName("cmdEdit")
-        self.verticalLayout.addWidget(self.cmdEdit)
+        self.gridLayout.addWidget(self.cmdEdit, 1, 1, 1, 1)
         self.cmdUnload = QtWidgets.QPushButton(self.groupBox)
         self.cmdUnload.setObjectName("cmdUnload")
-        self.verticalLayout.addWidget(self.cmdUnload)
+        self.gridLayout.addWidget(self.cmdUnload, 2, 0, 1, 1)
+        self.cmdLoad = QtWidgets.QPushButton(self.groupBox)
+        self.cmdLoad.setObjectName("cmdLoad")
+        self.gridLayout.addWidget(self.cmdLoad, 0, 0, 1, 1)
+        self.cmdSave = QtWidgets.QPushButton(self.groupBox)
+        self.cmdSave.setObjectName("cmdSave")
+        self.gridLayout.addWidget(self.cmdSave, 0, 1, 1, 1)
+        self.cmdNew = QtWidgets.QPushButton(self.groupBox)
+        self.cmdNew.setObjectName("cmdNew")
+        self.gridLayout.addWidget(self.cmdNew, 1, 0, 1, 1)
+        self.verticalLayout_7.addLayout(self.gridLayout)
         self.groupBox_2 = QtWidgets.QGroupBox(self.splitter)
         self.groupBox_2.setMinimumSize(QtCore.QSize(0, 0))
         self.groupBox_2.setMaximumSize(QtCore.QSize(300, 16777215))
@@ -226,7 +224,7 @@ class Ui_MainWindow(object):
         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.verticalLayout.addWidget(self.splitter_3)
         self.lineExpressionFrame = QtWidgets.QFrame(self.centralwidget)
         self.lineExpressionFrame.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.lineExpressionFrame.setFrameShadow(QtWidgets.QFrame.Plain)
@@ -256,7 +254,8 @@ class Ui_MainWindow(object):
         self.cmdExecute.setDefault(True)
         self.cmdExecute.setObjectName("cmdExecute")
         self.horizontalLayout.addWidget(self.cmdExecute)
-        self.verticalLayout_7.addWidget(self.lineExpressionFrame)
+        self.verticalLayout.addWidget(self.lineExpressionFrame)
+        self.horizontalLayout_4.addLayout(self.verticalLayout)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(MainWindow)
         self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21))
@@ -318,22 +317,9 @@ class Ui_MainWindow(object):
         self.retranslateUi(MainWindow)
         self.cmdAbout.clicked.connect(MainWindow.showAbout)
         self.cmdSurvey.clicked.connect(MainWindow.showSurvey)
-        self.cmdProduct.clicked.connect(MainWindow.addProduct)
-        self.cmdDifference.clicked.connect(MainWindow.addDifference)
-        self.cmdArrow.clicked.connect(MainWindow.addArrow)
-        self.cmdRename.clicked.connect(MainWindow.addRename)
-        self.cmdSelection.clicked.connect(MainWindow.addSelection)
-        self.cmdProjection.clicked.connect(MainWindow.addProjection)
         self.cmdUnload.clicked.connect(MainWindow.unloadRelation)
         self.cmdSave.clicked.connect(MainWindow.saveRelation)
         self.cmdLoad.clicked.connect(MainWindow.loadRelation)
-        self.cmdOuterRight.clicked.connect(MainWindow.addORight)
-        self.cmdOuter.clicked.connect(MainWindow.addOuter)
-        self.cmdOuterLeft.clicked.connect(MainWindow.addOLeft)
-        self.cmdJoin.clicked.connect(MainWindow.addJoin)
-        self.cmdDivision.clicked.connect(MainWindow.addDivision)
-        self.cmdIntersection.clicked.connect(MainWindow.addIntersection)
-        self.cmdUnion.clicked.connect(MainWindow.addUnion)
         self.lstRelations.itemDoubleClicked['QListWidgetItem*'].connect(MainWindow.printRelation)
         self.lstRelations.itemClicked['QListWidgetItem*'].connect(MainWindow.showAttributes)
         self.actionAbout.triggered.connect(MainWindow.showAbout)
@@ -380,10 +366,7 @@ class Ui_MainWindow(object):
         MainWindow.setTabOrder(self.txtMultiQuery, self.cmdClearMultilineQuery)
         MainWindow.setTabOrder(self.cmdClearMultilineQuery, self.cmdExecuteMultiline)
         MainWindow.setTabOrder(self.cmdExecuteMultiline, self.lstRelations)
-        MainWindow.setTabOrder(self.lstRelations, self.cmdNew)
+        MainWindow.setTabOrder(self.lstRelations, self.cmdEdit)
-        MainWindow.setTabOrder(self.cmdNew, self.cmdLoad)
-        MainWindow.setTabOrder(self.cmdLoad, self.cmdSave)
-        MainWindow.setTabOrder(self.cmdSave, self.cmdEdit)
         MainWindow.setTabOrder(self.cmdEdit, self.cmdUnload)
         MainWindow.setTabOrder(self.cmdUnload, self.lstAttributes)
         MainWindow.setTabOrder(self.lstAttributes, self.txtResult)
@@ -416,11 +399,11 @@ class Ui_MainWindow(object):
         self.cmdExecuteMultiline.setText(_translate("MainWindow", "Execute"))
         self.groupBox.setTitle(_translate("MainWindow", "Relations"))
         self.lstRelations.setSortingEnabled(True)
-        self.cmdNew.setText(_translate("MainWindow", "New relation"))
+        self.cmdEdit.setText(_translate("MainWindow", "Edit"))
-        self.cmdLoad.setText(_translate("MainWindow", "Load relation"))
+        self.cmdUnload.setText(_translate("MainWindow", "Unload"))
-        self.cmdSave.setText(_translate("MainWindow", "Save relation"))
+        self.cmdLoad.setText(_translate("MainWindow", "Load"))
-        self.cmdEdit.setText(_translate("MainWindow", "Edit relation"))
+        self.cmdSave.setText(_translate("MainWindow", "Save"))
-        self.cmdUnload.setText(_translate("MainWindow", "Unload relation"))
+        self.cmdNew.setText(_translate("MainWindow", "New"))
         self.groupBox_2.setTitle(_translate("MainWindow", "Attributes"))
         self.txtResult.setText(_translate("MainWindow", "_last1"))
         self.label.setText(_translate("MainWindow", "="))

relational_gui/rel_edit.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'relational_gui/rel_edit.ui'
 #
-# Created: Sun Jun  7 01:48:25 2015
+# Created: Sun Jun  7 13:34:01 2015
 #      by: PyQt5 UI code generator 5.3.2
 #
 # WARNING! All changes made in this file will be lost!

relational_gui/survey.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'relational_gui/survey.ui'
 #
-# Created: Sun Jun  7 01:48:25 2015
+# Created: Sun Jun  7 13:34:01 2015
 #      by: PyQt5 UI code generator 5.3.2
 #
 # WARNING! All changes made in this file will be lost!