From 1b2dc96af18bb823892f87ded24e745b1bfb5a38 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Wed, 9 Sep 2015 12:43:25 +0200 Subject: [PATCH] Re-generated UI --- relational_gui/maingui.py | 219 ++++++++++++++++++++++++++----------- relational_gui/rel_edit.py | 3 +- relational_gui/survey.py | 3 +- 3 files changed, 155 insertions(+), 70 deletions(-) diff --git a/relational_gui/maingui.py b/relational_gui/maingui.py index ecdff48..f1087ab 100644 --- a/relational_gui/maingui.py +++ b/relational_gui/maingui.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'relational_gui/maingui.ui' # -# Created: Mon Jun 8 01:14:09 2015 -# by: PyQt5 UI code generator 5.3.2 +# Created by: PyQt5 UI code generator 5.4.2 # # WARNING! All changes made in this file will be lost! @@ -32,62 +31,153 @@ class Ui_MainWindow(object): self.verticalLayout_11.addWidget(self.groupBox_3) self.groupOperators = QtWidgets.QFrame(self.centralwidget) self.groupOperators.setObjectName("groupOperators") - self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.groupOperators) - self.verticalLayout_10.setObjectName("verticalLayout_10") - self.cmdProduct = QtWidgets.QPushButton(self.groupOperators) - self.cmdProduct.setText("*") - self.cmdProduct.setObjectName("cmdProduct") - self.verticalLayout_10.addWidget(self.cmdProduct) + self.gridLayout_2 = QtWidgets.QGridLayout(self.groupOperators) + self.gridLayout_2.setObjectName("gridLayout_2") self.cmdDifference = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdDifference.sizePolicy().hasHeightForWidth()) + self.cmdDifference.setSizePolicy(sizePolicy) + self.cmdDifference.setMaximumSize(QtCore.QSize(40, 16777215)) self.cmdDifference.setText("-") + self.cmdDifference.setFlat(True) self.cmdDifference.setObjectName("cmdDifference") - self.verticalLayout_10.addWidget(self.cmdDifference) - self.cmdUnion = QtWidgets.QPushButton(self.groupOperators) - self.cmdUnion.setText("∪") - self.cmdUnion.setObjectName("cmdUnion") - self.verticalLayout_10.addWidget(self.cmdUnion) - self.cmdIntersection = QtWidgets.QPushButton(self.groupOperators) - self.cmdIntersection.setText("∩") - self.cmdIntersection.setObjectName("cmdIntersection") - self.verticalLayout_10.addWidget(self.cmdIntersection) - self.cmdDivision = QtWidgets.QPushButton(self.groupOperators) - self.cmdDivision.setText("÷") - self.cmdDivision.setObjectName("cmdDivision") - self.verticalLayout_10.addWidget(self.cmdDivision) - self.cmdJoin = QtWidgets.QPushButton(self.groupOperators) - self.cmdJoin.setText("⋈") - self.cmdJoin.setObjectName("cmdJoin") - self.verticalLayout_10.addWidget(self.cmdJoin) - self.cmdOuterLeft = QtWidgets.QPushButton(self.groupOperators) - self.cmdOuterLeft.setText("⧑") - self.cmdOuterLeft.setObjectName("cmdOuterLeft") - self.verticalLayout_10.addWidget(self.cmdOuterLeft) - self.cmdOuterRight = QtWidgets.QPushButton(self.groupOperators) - self.cmdOuterRight.setText("⧒") - self.cmdOuterRight.setObjectName("cmdOuterRight") - self.verticalLayout_10.addWidget(self.cmdOuterRight) + self.gridLayout_2.addWidget(self.cmdDifference, 1, 0, 1, 1) self.cmdOuter = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdOuter.sizePolicy().hasHeightForWidth()) + self.cmdOuter.setSizePolicy(sizePolicy) + self.cmdOuter.setMaximumSize(QtCore.QSize(40, 16777215)) self.cmdOuter.setText("⧓") + self.cmdOuter.setFlat(True) self.cmdOuter.setObjectName("cmdOuter") - self.verticalLayout_10.addWidget(self.cmdOuter) - self.cmdProjection = QtWidgets.QPushButton(self.groupOperators) - self.cmdProjection.setText("π") - self.cmdProjection.setObjectName("cmdProjection") - self.verticalLayout_10.addWidget(self.cmdProjection) + self.gridLayout_2.addWidget(self.cmdOuter, 8, 0, 1, 1) + self.cmdDivision = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdDivision.sizePolicy().hasHeightForWidth()) + self.cmdDivision.setSizePolicy(sizePolicy) + self.cmdDivision.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdDivision.setText("÷") + self.cmdDivision.setFlat(True) + self.cmdDivision.setObjectName("cmdDivision") + self.gridLayout_2.addWidget(self.cmdDivision, 4, 0, 1, 1) + self.cmdProduct = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdProduct.sizePolicy().hasHeightForWidth()) + self.cmdProduct.setSizePolicy(sizePolicy) + self.cmdProduct.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdProduct.setText("*") + self.cmdProduct.setFlat(True) + self.cmdProduct.setObjectName("cmdProduct") + self.gridLayout_2.addWidget(self.cmdProduct, 0, 0, 1, 1) self.cmdSelection = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdSelection.sizePolicy().hasHeightForWidth()) + self.cmdSelection.setSizePolicy(sizePolicy) + self.cmdSelection.setMaximumSize(QtCore.QSize(40, 16777215)) self.cmdSelection.setText("σ") + self.cmdSelection.setFlat(True) self.cmdSelection.setObjectName("cmdSelection") - self.verticalLayout_10.addWidget(self.cmdSelection) - self.cmdRename = QtWidgets.QPushButton(self.groupOperators) - self.cmdRename.setText("ρ") - self.cmdRename.setObjectName("cmdRename") - self.verticalLayout_10.addWidget(self.cmdRename) + self.gridLayout_2.addWidget(self.cmdSelection, 10, 0, 1, 1) self.cmdArrow = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdArrow.sizePolicy().hasHeightForWidth()) + self.cmdArrow.setSizePolicy(sizePolicy) + self.cmdArrow.setMaximumSize(QtCore.QSize(40, 16777215)) self.cmdArrow.setText("➡") + self.cmdArrow.setFlat(True) self.cmdArrow.setObjectName("cmdArrow") - self.verticalLayout_10.addWidget(self.cmdArrow) + self.gridLayout_2.addWidget(self.cmdArrow, 12, 0, 1, 1) + self.cmdOuterLeft = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdOuterLeft.sizePolicy().hasHeightForWidth()) + self.cmdOuterLeft.setSizePolicy(sizePolicy) + self.cmdOuterLeft.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdOuterLeft.setText("⧑") + self.cmdOuterLeft.setFlat(True) + self.cmdOuterLeft.setObjectName("cmdOuterLeft") + self.gridLayout_2.addWidget(self.cmdOuterLeft, 6, 0, 1, 1) spacerItem = QtWidgets.QSpacerItem(20, 25, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_10.addItem(spacerItem) + self.gridLayout_2.addItem(spacerItem, 13, 0, 1, 1) + self.cmdUnion = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdUnion.sizePolicy().hasHeightForWidth()) + self.cmdUnion.setSizePolicy(sizePolicy) + self.cmdUnion.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdUnion.setText("∪") + self.cmdUnion.setFlat(True) + self.cmdUnion.setObjectName("cmdUnion") + self.gridLayout_2.addWidget(self.cmdUnion, 0, 1, 1, 1) + self.cmdIntersection = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdIntersection.sizePolicy().hasHeightForWidth()) + self.cmdIntersection.setSizePolicy(sizePolicy) + self.cmdIntersection.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdIntersection.setText("∩") + self.cmdIntersection.setFlat(True) + self.cmdIntersection.setObjectName("cmdIntersection") + self.gridLayout_2.addWidget(self.cmdIntersection, 1, 1, 1, 1) + self.cmdJoin = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdJoin.sizePolicy().hasHeightForWidth()) + self.cmdJoin.setSizePolicy(sizePolicy) + self.cmdJoin.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdJoin.setText("⋈") + self.cmdJoin.setFlat(True) + self.cmdJoin.setObjectName("cmdJoin") + self.gridLayout_2.addWidget(self.cmdJoin, 4, 1, 1, 1) + self.cmdOuterRight = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdOuterRight.sizePolicy().hasHeightForWidth()) + self.cmdOuterRight.setSizePolicy(sizePolicy) + self.cmdOuterRight.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdOuterRight.setText("⧒") + self.cmdOuterRight.setFlat(True) + self.cmdOuterRight.setObjectName("cmdOuterRight") + self.gridLayout_2.addWidget(self.cmdOuterRight, 6, 1, 1, 1) + self.cmdProjection = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdProjection.sizePolicy().hasHeightForWidth()) + self.cmdProjection.setSizePolicy(sizePolicy) + self.cmdProjection.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdProjection.setText("π") + self.cmdProjection.setFlat(True) + self.cmdProjection.setObjectName("cmdProjection") + self.gridLayout_2.addWidget(self.cmdProjection, 8, 1, 1, 1) + self.cmdRename = QtWidgets.QPushButton(self.groupOperators) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmdRename.sizePolicy().hasHeightForWidth()) + self.cmdRename.setSizePolicy(sizePolicy) + self.cmdRename.setMaximumSize(QtCore.QSize(40, 16777215)) + self.cmdRename.setText("ρ") + self.cmdRename.setFlat(True) + self.cmdRename.setObjectName("cmdRename") + self.gridLayout_2.addWidget(self.cmdRename, 10, 1, 1, 1) self.verticalLayout_11.addWidget(self.groupOperators) self.horizontalLayout_4.addLayout(self.verticalLayout_11) self.verticalLayout = QtWidgets.QVBoxLayout() @@ -108,7 +198,6 @@ class Ui_MainWindow(object): self.layoutWidget.setObjectName("layoutWidget") 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.layoutWidget) self.frmOptimizations.setFrameShape(QtWidgets.QFrame.NoFrame) @@ -205,9 +294,12 @@ class Ui_MainWindow(object): self.cmdNew = QtWidgets.QPushButton(self.groupBox) self.cmdNew.setObjectName("cmdNew") self.gridLayout.addWidget(self.cmdNew, 1, 0, 1, 1) + self.cmdNewSession = QtWidgets.QPushButton(self.groupBox) + self.cmdNewSession.setObjectName("cmdNewSession") + self.gridLayout.addWidget(self.cmdNewSession, 2, 1, 1, 1) self.cmdUnload = QtWidgets.QPushButton(self.groupBox) self.cmdUnload.setObjectName("cmdUnload") - self.gridLayout.addWidget(self.cmdUnload, 2, 0, 1, 2) + self.gridLayout.addWidget(self.cmdUnload, 2, 0, 1, 1) self.verticalLayout_7.addLayout(self.gridLayout) self.groupBox_2 = QtWidgets.QGroupBox(self.splitter) self.groupBox_2.setMinimumSize(QtCore.QSize(0, 0)) @@ -258,7 +350,7 @@ class Ui_MainWindow(object): self.horizontalLayout_4.addLayout(self.verticalLayout) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 20)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile.setObjectName("menuFile") @@ -355,21 +447,16 @@ class Ui_MainWindow(object): self.cmdSelection.clicked.connect(MainWindow.addSelection) self.cmdRename.clicked.connect(MainWindow.addRename) self.cmdArrow.clicked.connect(MainWindow.addArrow) + self.cmdNewSession.clicked.connect(MainWindow.newSession) 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.cmdDifference, self.cmdDivision) + MainWindow.setTabOrder(self.cmdDivision, self.cmdOuterLeft) + MainWindow.setTabOrder(self.cmdOuterLeft, self.cmdOuter) + MainWindow.setTabOrder(self.cmdOuter, self.cmdSelection) + MainWindow.setTabOrder(self.cmdSelection, self.cmdArrow) MainWindow.setTabOrder(self.cmdArrow, self.table) MainWindow.setTabOrder(self.table, self.lstHistory) MainWindow.setTabOrder(self.lstHistory, self.cmdOptimize) @@ -380,8 +467,7 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.cmdClearMultilineQuery, self.cmdExecuteMultiline) MainWindow.setTabOrder(self.cmdExecuteMultiline, self.lstRelations) MainWindow.setTabOrder(self.lstRelations, self.cmdEdit) - MainWindow.setTabOrder(self.cmdEdit, self.cmdUnload) - MainWindow.setTabOrder(self.cmdUnload, self.lstAttributes) + MainWindow.setTabOrder(self.cmdEdit, self.lstAttributes) MainWindow.setTabOrder(self.lstAttributes, self.txtResult) MainWindow.setTabOrder(self.txtResult, self.txtQuery) MainWindow.setTabOrder(self.txtQuery, self.cmdClearQuery) @@ -393,17 +479,17 @@ class Ui_MainWindow(object): self.groupBox_3.setTitle(_translate("MainWindow", "Menu")) self.cmdAbout.setText(_translate("MainWindow", "About")) self.cmdSurvey.setText(_translate("MainWindow", "Survey")) - self.cmdProduct.setToolTip(_translate("MainWindow", "Product")) self.cmdDifference.setToolTip(_translate("MainWindow", "Difference")) + self.cmdOuter.setToolTip(_translate("MainWindow", "Full outer join")) + self.cmdDivision.setToolTip(_translate("MainWindow", "Division")) + self.cmdProduct.setToolTip(_translate("MainWindow", "Product")) + self.cmdSelection.setToolTip(_translate("MainWindow", "Selection")) + self.cmdOuterLeft.setToolTip(_translate("MainWindow", "Left outer join")) self.cmdUnion.setToolTip(_translate("MainWindow", "Union")) self.cmdIntersection.setToolTip(_translate("MainWindow", "Intersection")) - self.cmdDivision.setToolTip(_translate("MainWindow", "Division")) self.cmdJoin.setToolTip(_translate("MainWindow", "Natural join")) - self.cmdOuterLeft.setToolTip(_translate("MainWindow", "Left outer join")) self.cmdOuterRight.setToolTip(_translate("MainWindow", "Right outer join")) - self.cmdOuter.setToolTip(_translate("MainWindow", "Full outer join")) self.cmdProjection.setToolTip(_translate("MainWindow", "Projection")) - self.cmdSelection.setToolTip(_translate("MainWindow", "Selection")) self.cmdRename.setToolTip(_translate("MainWindow", "Rename")) self.cmdOptimize.setText(_translate("MainWindow", "Optimize")) self.cmdUndoOptimize.setText(_translate("MainWindow", "Undo optimize")) @@ -416,6 +502,7 @@ class Ui_MainWindow(object): self.cmdLoad.setText(_translate("MainWindow", "Load")) self.cmdSave.setText(_translate("MainWindow", "Save")) self.cmdNew.setText(_translate("MainWindow", "New")) + self.cmdNewSession.setText(_translate("MainWindow", "Unload all")) self.cmdUnload.setText(_translate("MainWindow", "Unload")) self.groupBox_2.setTitle(_translate("MainWindow", "Attributes")) self.txtResult.setText(_translate("MainWindow", "_last1")) diff --git a/relational_gui/rel_edit.py b/relational_gui/rel_edit.py index cc6c5c5..0b23c8e 100644 --- a/relational_gui/rel_edit.py +++ b/relational_gui/rel_edit.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'relational_gui/rel_edit.ui' # -# Created: Sun Jun 7 13:34:01 2015 -# by: PyQt5 UI code generator 5.3.2 +# Created by: PyQt5 UI code generator 5.4.2 # # WARNING! All changes made in this file will be lost! diff --git a/relational_gui/survey.py b/relational_gui/survey.py index 2efd0a5..14b8d6a 100644 --- a/relational_gui/survey.py +++ b/relational_gui/survey.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'relational_gui/survey.ui' # -# Created: Sun Jun 7 13:34:01 2015 -# by: PyQt5 UI code generator 5.3.2 +# Created by: PyQt5 UI code generator 5.4.2 # # WARNING! All changes made in this file will be lost!