IPKM/nmreval
14
2
Fork 1
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

242-uncaught-exception #252

Merged
dominik merged 5 commits from 242-uncaught-exception into master 2024-02-27 14:20:08 +00:00
Conversation 0 Commits 5 Files Changed 4 +39 -19
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f4473d78a5 - Show all commits

19
src/gui_qt/_py/basewindow.py
View File

@ -22,8 +22,6 @@ 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)
@ -70,8 +68,22 @@ class Ui_BaseWindow(object):
self.integralwidget = IntegralWidget()
self.integralwidget.setObjectName("integralwidget")
self.tabWidget.addTab(self.integralwidget, "")
self.area = MdiAreaTile(self.splitter)
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.setObjectName("area")
self.verticalLayout.addWidget(self.area)
self.horizontalLayout.addWidget(self.splitter)
BaseWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(BaseWindow)
@ -643,5 +655,6 @@ 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

39
src/resources/_ui/basewindow.ui
View File

@ -22,21 +22,6 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
@ -125,7 +110,23 @@
</attribute>
</widget>
</widget>
<widget class="MdiAreaTile" name="area"/>
<widget class="QWidget" name="verticalLayoutWidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="EditorWidget" name="widget" native="true"/>
</item>
<item>
<widget class="MdiAreaTile" name="area">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
@ -1086,6 +1087,12 @@
<header>..lib.mdiarea</header>
<container>1</container>
</customwidget>
<customwidget>
<class>EditorWidget</class>
<extends>QWidget</extends>
<header>..lib.codeeditor</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections>