From 3fed2361c0cb59bd81a6a68b7ff310cf8ee6ea11 Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <svechnikovmv@gmail.com> Date: Thu, 16 Nov 2023 22:08:18 +0100 Subject: [PATCH] QGroupBox --> StaticGroupBox --- GUI/View/Access/IntensityDataPropertyWidget.cpp | 14 +++++++------- .../PlotSpecular/SpecularDataPropertyWidget.cpp | 9 +++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/GUI/View/Access/IntensityDataPropertyWidget.cpp b/GUI/View/Access/IntensityDataPropertyWidget.cpp index 469d83349d6..a7df6f19913 100644 --- a/GUI/View/Access/IntensityDataPropertyWidget.cpp +++ b/GUI/View/Access/IntensityDataPropertyWidget.cpp @@ -21,10 +21,10 @@ #include "GUI/Support/Tool/LayoutUtil.h" #include "GUI/View/Numeric/ComboUtil.h" #include "GUI/View/Numeric/NumWidgetUtil.h" +#include "GUI/View/Widget/GroupBoxes.h" #include <QCheckBox> #include <QDoubleSpinBox> #include <QFormLayout> -#include <QGroupBox> #include <QLineEdit> IntensityDataPropertyWidget::IntensityDataPropertyWidget(QWidget* parent) @@ -88,8 +88,8 @@ void IntensityDataPropertyWidget::createPanelElements() &m_updaters)); // -- x-axis - auto* xGroup = new QGroupBox("X axis", this); - auto* xFormLayout = new QFormLayout(xGroup); + auto* xGroup = new StaticGroupBox("X axis", this); + auto* xFormLayout = new QFormLayout(xGroup->body()); xFormLayout->setSpacing(5); xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinbox( @@ -113,8 +113,8 @@ void IntensityDataPropertyWidget::createPanelElements() m_mainLayout->addRow(xGroup); // -- y-axis - auto* yGroup = new QGroupBox("Y axis", this); - auto* yFormLayout = new QFormLayout(yGroup); + auto* yGroup = new StaticGroupBox("Y axis", this); + auto* yFormLayout = new QFormLayout(yGroup->body()); yFormLayout->setSpacing(5); yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinbox( @@ -138,8 +138,8 @@ void IntensityDataPropertyWidget::createPanelElements() m_mainLayout->addRow(yGroup); // -- color-axis - auto* zGroup = new QGroupBox("Color legend", this); - auto* zFormLayout = new QFormLayout(zGroup); + auto* zGroup = new StaticGroupBox("Color legend", this); + auto* zFormLayout = new QFormLayout(zGroup->body()); zFormLayout->setSpacing(5); auto* logRangeSpinbox = GUI::Util::createDoubleSpinbox( diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp index 19e336cf89e..67e9f82940e 100644 --- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp +++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp @@ -21,6 +21,7 @@ #include "GUI/Support/Tool/LayoutUtil.h" #include "GUI/View/Numeric/DoubleSpinBox.h" #include "GUI/View/Numeric/NumWidgetUtil.h" +#include "GUI/View/Widget/GroupBoxes.h" #include <QAction> #include <QCheckBox> #include <QFormLayout> @@ -57,8 +58,8 @@ void SpecularDataPropertyWidget::createPanelElements() */ // -- x-axis - auto* xGroup = new QGroupBox("X axis", this); - auto* xFormLayout = new QFormLayout(xGroup); + auto* xGroup = new StaticGroupBox("X axis", this); + auto* xFormLayout = new QFormLayout(xGroup->body()); xFormLayout->setSpacing(5); xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinbox( @@ -82,8 +83,8 @@ void SpecularDataPropertyWidget::createPanelElements() m_mainLayout->addRow(xGroup); // -- y-axis - auto* yGroup = new QGroupBox("Y axis", this); - auto* yFormLayout = new QFormLayout(yGroup); + auto* yGroup = new StaticGroupBox("Y axis", this); + auto* yFormLayout = new QFormLayout(yGroup->body()); yFormLayout->setSpacing(5); auto* logRangeSpinbox = GUI::Util::createDoubleSpinbox( -- GitLab