diff --git a/GUI/View/SampleDesigner/SampleView.cpp b/GUI/View/SampleDesigner/SampleView.cpp index 6ccb40759cc433f9df350d0ff066051279b9f4bd..e59ac2d3c097f6e5924bd3d347b3991fd2df8a5c 100644 --- a/GUI/View/SampleDesigner/SampleView.cpp +++ b/GUI/View/SampleDesigner/SampleView.cpp @@ -71,9 +71,6 @@ SampleView::SampleView(QWidget* parent, ProjectDocument* document) m_docks->addWidget(REALSPACEPANEL, m_realSpacePanel, Qt::BottomDockWidgetArea); m_docks->addWidget(PYTHONPANEL, scriptPanel, Qt::BottomDockWidgetArea); - connect(scriptPanel, &ScriptPanel::widgetHeightRequest, m_docks, - &DocksController::setDockHeightForWidget); - connect(sampleSelectionView, &SampleListView::currentSampleChanged, editor, &LayerOrientedSampleEditor::setCurrentSample); diff --git a/GUI/View/SampleDesigner/ScriptPanel.cpp b/GUI/View/SampleDesigner/ScriptPanel.cpp index b48d55a3c2cb5596c9910b13dac5274fbab43be7..db157586f30402faeec11721554a71c8ca4eac75 100644 --- a/GUI/View/SampleDesigner/ScriptPanel.cpp +++ b/GUI/View/SampleDesigner/ScriptPanel.cpp @@ -34,7 +34,7 @@ const int accumulateUpdatesDuringMsec = 20.; } ScriptPanel::ScriptPanel(SampleModel* sampleModel, QWidget* parent) - : InfoPanel(parent) + : QWidget(parent) , m_textEdit(new QTextEdit) , m_sampleModel(sampleModel) , m_highlighter(nullptr) @@ -46,22 +46,14 @@ ScriptPanel::ScriptPanel(SampleModel* sampleModel, QWidget* parent) m_textEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - auto* mainLayout = new QVBoxLayout; + auto* mainLayout = new QVBoxLayout(this); mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->addWidget(m_textEdit); - auto* mainWidget = new QWidget(this); - mainWidget->setLayout(mainLayout); - m_textEdit->setReadOnly(true); QFont textFont("Monospace"); m_textEdit->setFont(textFont); m_textEdit->setFontPointSize(DesignerHelper::getPythonEditorFontSize()); - - m_stackedWidget->addWidget(mainWidget); - - setContentVisible(false); - showToolBar(false); } void ScriptPanel::updateEditor() diff --git a/GUI/View/SampleDesigner/ScriptPanel.h b/GUI/View/SampleDesigner/ScriptPanel.h index 527fbdf376b62a8b1a08f5f60c35fd3d8abdd474..bc8bd6c6c1a7b8a1fb1048c9d00168aa2fa292dc 100644 --- a/GUI/View/SampleDesigner/ScriptPanel.h +++ b/GUI/View/SampleDesigner/ScriptPanel.h @@ -15,7 +15,7 @@ #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SCRIPTPANEL_H #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SCRIPTPANEL_H -#include "GUI/View/Common/InfoPanel.h" +#include <QWidget> class SampleModel; class PythonSyntaxHighlighter; @@ -28,7 +28,7 @@ class QModelIndex; //! Resides at the bottom of SampleView and displays a Python script. -class ScriptPanel : public InfoPanel { +class ScriptPanel : public QWidget { Q_OBJECT public: