From 3932e47d13519310ddb6314739bab69787faf52b Mon Sep 17 00:00:00 2001 From: Dominik Demuth Date: Sun, 25 Feb 2024 15:17:04 +0100 Subject: [PATCH] Revert "add textedit to main ui" This reverts commit f4473d78a530a3166e8d9bf27b3af0747f43d182. --- src/gui_qt/_py/basewindow.py | 19 +++------------- src/resources/_ui/basewindow.ui | 39 ++++++++++++++------------------- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/src/gui_qt/_py/basewindow.py b/src/gui_qt/_py/basewindow.py index ea0c0f2..d916548 100644 --- a/src/gui_qt/_py/basewindow.py +++ b/src/gui_qt/_py/basewindow.py @@ -22,6 +22,8 @@ class Ui_BaseWindow(object): self.centralwidget = QtWidgets.QWidget(BaseWindow) self.centralwidget.setObjectName("centralwidget") self.horizontalLayout = QtWidgets.QHBoxLayout(self.centralwidget) + self.horizontalLayout.setContentsMargins(3, 3, 3, 3) + self.horizontalLayout.setSpacing(3) self.horizontalLayout.setObjectName("horizontalLayout") self.splitter = QtWidgets.QSplitter(self.centralwidget) self.splitter.setOrientation(QtCore.Qt.Horizontal) @@ -68,22 +70,8 @@ class Ui_BaseWindow(object): self.integralwidget = IntegralWidget() self.integralwidget.setObjectName("integralwidget") self.tabWidget.addTab(self.integralwidget, "") - self.verticalLayoutWidget = QtWidgets.QWidget(self.splitter) - self.verticalLayoutWidget.setObjectName("verticalLayoutWidget") - self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget) - self.verticalLayout.setContentsMargins(0, 0, 0, 0) - self.verticalLayout.setObjectName("verticalLayout") - self.widget = EditorWidget(self.verticalLayoutWidget) - self.widget.setObjectName("widget") - self.verticalLayout.addWidget(self.widget) - self.area = MdiAreaTile(self.verticalLayoutWidget) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.area.sizePolicy().hasHeightForWidth()) - self.area.setSizePolicy(sizePolicy) + self.area = MdiAreaTile(self.splitter) self.area.setObjectName("area") - self.verticalLayout.addWidget(self.area) self.horizontalLayout.addWidget(self.splitter) BaseWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(BaseWindow) @@ -655,6 +643,5 @@ from ..data.signaledit.editsignalwidget import EditSignalWidget from ..data.valueeditwidget import ValueEditWidget from ..fit.fitwindow import QFitDialog from ..graphs.drawings import DrawingsWidget -from ..lib.codeeditor import EditorWidget from ..lib.mdiarea import MdiAreaTile from ..nmr.t1widget import QT1Widget diff --git a/src/resources/_ui/basewindow.ui b/src/resources/_ui/basewindow.ui index 2c48b6a..01987b8 100644 --- a/src/resources/_ui/basewindow.ui +++ b/src/resources/_ui/basewindow.ui @@ -22,6 +22,21 @@ + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + @@ -110,23 +125,7 @@ - - - - - - - - - - 0 - 0 - - - - - - + @@ -1087,12 +1086,6 @@
..lib.mdiarea
1 - - EditorWidget - QWidget -
..lib.codeeditor
- 1 -