diff --git a/relational_gui/guihandler.py b/relational_gui/guihandler.py index ed235d3..e66148a 100644 --- a/relational_gui/guihandler.py +++ b/relational_gui/guihandler.py @@ -87,9 +87,11 @@ class relForm(QtWidgets.QMainWindow): def setMultiline(self, multiline): self.multiline = multiline self.settings.setValue('multiline', multiline) - self.ui.lineExpressionFrame.setVisible(not multiline) - self.ui.frmOptimizations.setVisible(not multiline) - self.ui.frmMultiLine.setVisible(multiline) + if multiline: + index = 0 + else: + index = 1 + self.ui.stackedWidget.setCurrentIndex(index) self.ui.actionMulti_line_mode.setChecked(multiline) def load_query(self, *index): diff --git a/relational_gui/maingui.ui b/relational_gui/maingui.ui index f9f05ef..1c4e684 100644 --- a/relational_gui/maingui.ui +++ b/relational_gui/maingui.ui @@ -80,292 +80,255 @@ - - - - QLayout::SetMinimumSize - - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - + + + 0 + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 120 + 60 + + + + + DejaVu Sans + 11 + 50 + false + false + false + false + true + + + + + + + false + + + result=query + + + + 3 - - QLayout::SetMinimumSize - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - 0 - - - - - 120 - 60 - - - - - 16777215 - 16777215 - - - - - 0 - 0 - + + + - - - - - Optimize - - - - - - - Undo optimize - - - - - - - Clear history - - - - + + + Execute + + + false + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + - - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - + + + + + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 120 + 60 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + + + + + 1 + + + + + Optimize + + + + + + + Undo optimize + + + + + + + Clear history + + + + + + + 0 - - 0 - - - 0 - - - 0 - - - 0 - - + - + 0 0 - - - 120 - 60 - - - - - DejaVu Sans - 11 - 50 - false - false - false - false - true - - - - - - - false - - - result=query + + _last1 - - - 3 + + + = - - - - - - - - - - - Execute - - - false - - - false - - - - + + txtQuery + + + + + + + + + + + 0 + 0 + + + + + 50 + 16777215 + + + + + + + true + + + + + + + Execute + + + true + + + true + + - - - + + + - - - - QFrame::NoFrame - - - QFrame::Plain - - - 0 - - - - 3 - - - 0 - - - 5 - - - 0 - - - 5 - - - - - - 0 - 0 - - - - _last1 - - - - - - - = - - - txtQuery - - - - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - - - true - - - - - - - Execute - - - true - - - true - - - - - - @@ -373,8 +336,8 @@ 0 0 - 637 - 18 + 644 + 27 @@ -404,7 +367,7 @@ - Settings + Setti&ngs @@ -421,7 +384,7 @@ Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - Operators + &Operators 1 @@ -831,7 +794,7 @@ Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - Attributes + Attrib&utes 2 @@ -892,7 +855,7 @@ Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - Relations + Re&lations 2 @@ -998,7 +961,7 @@ 99 - 89 + 101 @@ -1008,7 +971,7 @@ Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - Menu + &Menu 1 @@ -1084,12 +1047,12 @@ - Check for new versions + &Check for new versions - New relation + &New relation Ctrl+N @@ -1097,7 +1060,7 @@ - Edit relation + &Edit relation Ctrl+E @@ -1123,7 +1086,7 @@ - Unload relation + &Unload relation @@ -1131,7 +1094,7 @@ true - Multi-line mode + &Multi-line mode Ctrl+L @@ -1140,17 +1103,6 @@ table - lstHistory - cmdOptimize - cmdUndoOptimize - cmdClearHistory - txtMultiQuery - cmdClearMultilineQuery - cmdExecuteMultiline - txtResult - txtQuery - cmdClearQuery - cmdExecute cmdProduct cmdDifference cmdUnion