From 7530c30185ee4dd9b42b76a82dd458bc51404bd0 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Mon, 1 Jun 2015 00:02:23 +0200 Subject: [PATCH] Generated UI --- relational_gui/maingui.py | 129 ++++++++++++++++++++++++++++---------- 1 file changed, 97 insertions(+), 32 deletions(-) diff --git a/relational_gui/maingui.py b/relational_gui/maingui.py index 315a438..ded4d22 100644 --- a/relational_gui/maingui.py +++ b/relational_gui/maingui.py @@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 612) + MainWindow.resize(800, 669) self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.centralwidget) @@ -112,7 +112,14 @@ class Ui_MainWindow(object): self.verticalLayout_6.setSizeConstraint(QtWidgets.QLayout.SetMinimumSize) self.verticalLayout_6.setContentsMargins(0, 0, 0, 0) self.verticalLayout_6.setObjectName("verticalLayout_6") - self.lstHistory = QtWidgets.QListWidget(self.layoutWidget1) + self.frmOptimizations = QtWidgets.QFrame(self.layoutWidget1) + self.frmOptimizations.setFrameShape(QtWidgets.QFrame.NoFrame) + self.frmOptimizations.setFrameShadow(QtWidgets.QFrame.Plain) + self.frmOptimizations.setLineWidth(0) + self.frmOptimizations.setObjectName("frmOptimizations") + self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.frmOptimizations) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.lstHistory = QtWidgets.QListWidget(self.frmOptimizations) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -121,19 +128,53 @@ class Ui_MainWindow(object): self.lstHistory.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.lstHistory.setBaseSize(QtCore.QSize(0, 0)) self.lstHistory.setObjectName("lstHistory") - self.verticalLayout_6.addWidget(self.lstHistory) + self.verticalLayout_2.addWidget(self.lstHistory) self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.cmdOptimize = QtWidgets.QPushButton(self.layoutWidget1) + self.cmdOptimize = QtWidgets.QPushButton(self.frmOptimizations) self.cmdOptimize.setObjectName("cmdOptimize") self.horizontalLayout_3.addWidget(self.cmdOptimize) - self.cmdUndoOptimize = QtWidgets.QPushButton(self.layoutWidget1) + self.cmdUndoOptimize = QtWidgets.QPushButton(self.frmOptimizations) self.cmdUndoOptimize.setObjectName("cmdUndoOptimize") self.horizontalLayout_3.addWidget(self.cmdUndoOptimize) - self.cmdClearHistory = QtWidgets.QPushButton(self.layoutWidget1) + self.cmdClearHistory = QtWidgets.QPushButton(self.frmOptimizations) self.cmdClearHistory.setObjectName("cmdClearHistory") self.horizontalLayout_3.addWidget(self.cmdClearHistory) - self.verticalLayout_6.addLayout(self.horizontalLayout_3) + self.verticalLayout_2.addLayout(self.horizontalLayout_3) + self.verticalLayout_6.addWidget(self.frmOptimizations) + self.frmMultiLine = QtWidgets.QFrame(self.layoutWidget1) + self.frmMultiLine.setFrameShape(QtWidgets.QFrame.NoFrame) + self.frmMultiLine.setFrameShadow(QtWidgets.QFrame.Plain) + self.frmMultiLine.setLineWidth(0) + self.frmMultiLine.setObjectName("frmMultiLine") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.frmMultiLine) + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.txtMultiQuery = QtWidgets.QPlainTextEdit(self.frmMultiLine) + font = QtGui.QFont() + font.setFamily("DejaVu Sans") + font.setPointSize(11) + font.setBold(False) + font.setItalic(False) + font.setUnderline(False) + font.setWeight(50) + font.setStrikeOut(False) + font.setKerning(True) + self.txtMultiQuery.setFont(font) + self.txtMultiQuery.setPlainText("") + self.txtMultiQuery.setObjectName("txtMultiQuery") + self.horizontalLayout_2.addWidget(self.txtMultiQuery) + self.verticalLayout_4 = QtWidgets.QVBoxLayout() + self.verticalLayout_4.setObjectName("verticalLayout_4") + self.cmdClearMultilineQuery = QtWidgets.QPushButton(self.frmMultiLine) + self.cmdClearMultilineQuery.setObjectName("cmdClearMultilineQuery") + self.verticalLayout_4.addWidget(self.cmdClearMultilineQuery) + self.cmdExecuteMultiline = QtWidgets.QPushButton(self.frmMultiLine) + self.cmdExecuteMultiline.setAutoDefault(False) + self.cmdExecuteMultiline.setDefault(False) + self.cmdExecuteMultiline.setObjectName("cmdExecuteMultiline") + self.verticalLayout_4.addWidget(self.cmdExecuteMultiline) + self.horizontalLayout_2.addLayout(self.verticalLayout_4) + self.verticalLayout_6.addWidget(self.frmMultiLine) self.splitter = QtWidgets.QSplitter(self.splitter_3) self.splitter.setOrientation(QtCore.Qt.Vertical) self.splitter.setObjectName("splitter") @@ -183,29 +224,36 @@ class Ui_MainWindow(object): self.lstAttributes.setObjectName("lstAttributes") self.verticalLayout_3.addWidget(self.lstAttributes) self.verticalLayout_7.addWidget(self.splitter_4) - self.horizontalLayout_2 = QtWidgets.QHBoxLayout() - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.txtResult = QtWidgets.QLineEdit(self.centralwidget) + self.lineExpressionFrame = QtWidgets.QFrame(self.centralwidget) + self.lineExpressionFrame.setFrameShape(QtWidgets.QFrame.NoFrame) + self.lineExpressionFrame.setFrameShadow(QtWidgets.QFrame.Plain) + self.lineExpressionFrame.setLineWidth(0) + self.lineExpressionFrame.setObjectName("lineExpressionFrame") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.lineExpressionFrame) + self.horizontalLayout.setObjectName("horizontalLayout") + self.txtResult = QtWidgets.QLineEdit(self.lineExpressionFrame) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.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 = QtWidgets.QLabel(self.centralwidget) + self.horizontalLayout.addWidget(self.txtResult) + self.label = QtWidgets.QLabel(self.lineExpressionFrame) self.label.setObjectName("label") - self.horizontalLayout_2.addWidget(self.label) - self.txtQuery = QtWidgets.QLineEdit(self.centralwidget) + self.horizontalLayout.addWidget(self.label) + self.txtQuery = QtWidgets.QLineEdit(self.lineExpressionFrame) self.txtQuery.setObjectName("txtQuery") - self.horizontalLayout_2.addWidget(self.txtQuery) - self.cmdClearQuery = QtWidgets.QPushButton(self.centralwidget) + self.horizontalLayout.addWidget(self.txtQuery) + self.cmdClearQuery = QtWidgets.QPushButton(self.lineExpressionFrame) self.cmdClearQuery.setObjectName("cmdClearQuery") - self.horizontalLayout_2.addWidget(self.cmdClearQuery) - self.cmdExecute = QtWidgets.QPushButton(self.centralwidget) + self.horizontalLayout.addWidget(self.cmdClearQuery) + self.cmdExecute = QtWidgets.QPushButton(self.lineExpressionFrame) + self.cmdExecute.setAutoDefault(True) + self.cmdExecute.setDefault(True) self.cmdExecute.setObjectName("cmdExecute") - self.horizontalLayout_2.addWidget(self.cmdExecute) - self.verticalLayout_7.addLayout(self.horizontalLayout_2) + self.horizontalLayout.addWidget(self.cmdExecute) + self.verticalLayout_7.addWidget(self.lineExpressionFrame) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21)) @@ -218,6 +266,8 @@ class Ui_MainWindow(object): self.action.setObjectName("action") self.menuRelations = QtWidgets.QMenu(self.menubar) self.menuRelations.setObjectName("menuRelations") + self.menuSettings = QtWidgets.QMenu(self.menubar) + self.menuSettings.setObjectName("menuSettings") MainWindow.setMenuBar(self.menubar) self.actionAbout = QtWidgets.QAction(MainWindow) self.actionAbout.setMenuRole(QtWidgets.QAction.AboutRole) @@ -243,6 +293,9 @@ class Ui_MainWindow(object): self.actionManage_sessions.setObjectName("actionManage_sessions") self.actionUnload_relation = QtWidgets.QAction(MainWindow) self.actionUnload_relation.setObjectName("actionUnload_relation") + self.actionMulti_line_mode = QtWidgets.QAction(MainWindow) + self.actionMulti_line_mode.setCheckable(True) + self.actionMulti_line_mode.setObjectName("actionMulti_line_mode") self.menuFile.addSeparator() self.menuFile.addAction(self.action_Quit) self.menuAbout.addAction(self.actionAbout) @@ -252,16 +305,14 @@ class Ui_MainWindow(object): self.menuRelations.addAction(self.action_Save_relation) self.menuRelations.addAction(self.actionEdit_relation) self.menuRelations.addAction(self.actionUnload_relation) + self.menuSettings.addAction(self.actionMulti_line_mode) self.menubar.addAction(self.menuFile.menuAction()) self.menubar.addAction(self.menuRelations.menuAction()) + self.menubar.addAction(self.menuSettings.menuAction()) self.menubar.addAction(self.menuAbout.menuAction()) self.label.setBuddy(self.txtQuery) self.retranslateUi(MainWindow) - self.cmdClearQuery.clicked.connect(self.txtQuery.clear) - self.cmdClearHistory.clicked.connect(self.lstHistory.clear) - self.txtQuery.returnPressed.connect(MainWindow.execute) - self.cmdExecute.clicked.connect(MainWindow.execute) self.cmdAbout.clicked.connect(MainWindow.showAbout) self.cmdSurvey.clicked.connect(MainWindow.showSurvey) self.cmdProduct.clicked.connect(MainWindow.addProduct) @@ -273,9 +324,6 @@ class Ui_MainWindow(object): self.cmdUnload.clicked.connect(MainWindow.unloadRelation) self.cmdSave.clicked.connect(MainWindow.saveRelation) self.cmdLoad.clicked.connect(MainWindow.loadRelation) - self.cmdOptimize.clicked.connect(MainWindow.optimize) - self.cmdUndoOptimize.clicked.connect(MainWindow.undoOptimize) - self.txtResult.returnPressed.connect(self.txtQuery.setFocus) self.cmdOuterRight.clicked.connect(MainWindow.addORight) self.cmdOuter.clicked.connect(MainWindow.addOuter) self.cmdOuterLeft.clicked.connect(MainWindow.addOLeft) @@ -285,8 +333,6 @@ class Ui_MainWindow(object): self.cmdUnion.clicked.connect(MainWindow.addUnion) self.lstRelations.itemDoubleClicked['QListWidgetItem*'].connect(MainWindow.printRelation) self.lstRelations.itemClicked['QListWidgetItem*'].connect(MainWindow.showAttributes) - self.cmdClearQuery.clicked.connect(self.txtQuery.setFocus) - self.lstHistory.itemDoubleClicked['QListWidgetItem*'].connect(MainWindow.resumeHistory) self.actionAbout.triggered.connect(MainWindow.showAbout) self.action_Load_relation.triggered.connect(MainWindow.loadRelation) self.action_Save_relation.triggered.connect(MainWindow.saveRelation) @@ -297,6 +343,15 @@ class Ui_MainWindow(object): self.cmdNew.clicked.connect(MainWindow.newRelation) self.actionNew_relation.triggered.connect(MainWindow.newRelation) self.actionUnload_relation.triggered.connect(MainWindow.unloadRelation) + self.actionMulti_line_mode.toggled['bool'].connect(MainWindow.setMultiline) + self.cmdClearMultilineQuery.clicked.connect(self.txtMultiQuery.clear) + self.cmdExecuteMultiline.clicked.connect(MainWindow.execute) + self.cmdClearQuery.clicked.connect(self.txtQuery.clear) + self.cmdClearHistory.clicked.connect(self.lstHistory.clear) + self.cmdOptimize.clicked.connect(MainWindow.optimize) + self.cmdUndoOptimize.clicked.connect(MainWindow.undoOptimize) + self.cmdExecute.clicked.connect(MainWindow.execute) + self.txtQuery.returnPressed.connect(MainWindow.execute) QtCore.QMetaObject.connectSlotsByName(MainWindow) MainWindow.setTabOrder(self.cmdAbout, self.cmdSurvey) MainWindow.setTabOrder(self.cmdSurvey, self.cmdProduct) @@ -317,10 +372,15 @@ class Ui_MainWindow(object): 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.cmdClearHistory, self.txtMultiQuery) + 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.cmdNew, self.cmdLoad) MainWindow.setTabOrder(self.cmdLoad, self.cmdSave) - MainWindow.setTabOrder(self.cmdSave, self.cmdUnload) + MainWindow.setTabOrder(self.cmdSave, self.cmdEdit) + MainWindow.setTabOrder(self.cmdEdit, self.cmdUnload) MainWindow.setTabOrder(self.cmdUnload, self.lstAttributes) MainWindow.setTabOrder(self.lstAttributes, self.txtResult) MainWindow.setTabOrder(self.txtResult, self.txtQuery) @@ -349,6 +409,8 @@ class Ui_MainWindow(object): self.cmdOptimize.setText(_translate("MainWindow", "Optimize")) self.cmdUndoOptimize.setText(_translate("MainWindow", "Undo optimize")) self.cmdClearHistory.setText(_translate("MainWindow", "Clear history")) + self.cmdClearMultilineQuery.setText(_translate("MainWindow", "⌫")) + self.cmdExecuteMultiline.setText(_translate("MainWindow", "Execute")) self.groupBox.setTitle(_translate("MainWindow", "Relations")) self.lstRelations.setSortingEnabled(True) self.cmdNew.setText(_translate("MainWindow", "New relation")) @@ -364,6 +426,7 @@ class Ui_MainWindow(object): self.menuFile.setTitle(_translate("MainWindow", "&File")) self.menuAbout.setTitle(_translate("MainWindow", "&Help")) self.menuRelations.setTitle(_translate("MainWindow", "Relations")) + self.menuSettings.setTitle(_translate("MainWindow", "Settings")) self.actionAbout.setText(_translate("MainWindow", "&About")) self.action_Load_relation.setText(_translate("MainWindow", "&Load relation")) self.action_Load_relation.setShortcut(_translate("MainWindow", "Ctrl+O")) @@ -381,4 +444,6 @@ class Ui_MainWindow(object): self.actionSave_session_as.setToolTip(_translate("MainWindow", "Save session as")) self.actionManage_sessions.setText(_translate("MainWindow", "Manage sessions")) self.actionUnload_relation.setText(_translate("MainWindow", "Unload relation")) + self.actionMulti_line_mode.setText(_translate("MainWindow", "Multi-line mode")) + self.actionMulti_line_mode.setShortcut(_translate("MainWindow", "Ctrl+L"))