[j.grpbox3] GUI repairs and standardization ()

Merging branch 'j.grpbox3'  into 'main'.

See merge request !2069

GUI/View/Instrument/InstrumentView.cpp

@@ -22,10 +22,8 @@
 #include "GUI/View/Widget/ApplicationSettings.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include "GUI/View/Widget/StyledToolbar.h"
-#include <QAction>
 #include <QCheckBox>
 #include <QFormLayout>
-#include <QGroupBox>
 #include <QLineEdit>
 #include <QMenu>
 #include <QMessageBox>
@@ -99,7 +97,7 @@ void InstrumentView::createWidgetsForCurrentInstrument()
 
     //... Groupbox with instrument name and description (same layout for all instrument types)
 
-    auto title = QString("Information (%1 instrument)").arg(currentInstrument->instrumentType());
+    auto title = QString("Summary (%1 instrument)").arg(currentInstrument->instrumentType());
     auto* g = new CollapsibleGroupBox(title, m_scrollArea, currentInstrument->expandInfo);
     g->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     auto* formLayout = new QFormLayout;

GUI/View/Instrument/InstrumentView.h

@@ -22,10 +22,8 @@ class InstrumentItem;
 class InstrumentListView;
 class ProjectDocument;
 class QCheckBox;
-class QLabel;
 class QMenu;
 class QScrollArea;
-class QWidgetAction;
 
 class InstrumentView : public QWidget {
     Q_OBJECT

GUI/View/Mask/MaskEditorPropertyPanel.cpp

@@ -22,7 +22,6 @@
 #include "GUI/View/Numeric/NumberUtil.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QCheckBox>
-#include <QGroupBox>
 #include <QLineEdit>
 
 using std::function;
@@ -48,27 +47,24 @@ MaskEditorPropertyPanel::MaskEditorPropertyPanel(QWidget* parent)
     mainLayout->setSpacing(8);
 
     // -- plot properties
-    auto* plotPropertiesGroup = new QGroupBox("Plot properties", this);
+    auto* plotPropertiesGroup = new StaticGroupBox("Plot properties", this);
     auto* plotPropertiesLayout = new QVBoxLayout(plotPropertiesGroup);
     plotPropertiesLayout->setContentsMargins(0, 0, 0, 0);
     m_propertyPanel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
     plotPropertiesLayout->addWidget(m_propertyPanel);
-    GroupBoxCollapser::installIntoGroupBox(plotPropertiesGroup);
 
     // -- mask stack
-    auto* maskStackGroup = new QGroupBox("Mask stack", this);
+    auto* maskStackGroup = new StaticGroupBox("Mask stack", this);
     auto* maskStackLayout = new QVBoxLayout(maskStackGroup);
     maskStackLayout->setContentsMargins(0, 0, 0, 0);
     m_listView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
     maskStackLayout->addWidget(m_listView);
-    GroupBoxCollapser::installIntoGroupBox(maskStackGroup);
 
     // -- mask properties
-    auto* maskPropertiesGroup = new QGroupBox("Mask properties", this);
+    auto* maskPropertiesGroup = new StaticGroupBox("Mask properties", this);
     maskPropertiesGroup->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
     m_maskPropertiesLayout = new QFormLayout(maskPropertiesGroup);
     m_maskPropertiesLayout->setContentsMargins(8, 8, 8, 8);
-    GroupBoxCollapser::installIntoGroupBox(maskPropertiesGroup);
 
     mainLayout->addWidget(plotPropertiesGroup);
     mainLayout->addWidget(maskStackGroup);

GUI/View/SampleDesigner/SampleForm.cpp

@@ -58,7 +58,8 @@ public:
 
 
 SampleForm::SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorController* ec)
-    : CollapsibleGroupBox("Sample", parent, sampleItem->expandInfo)
+    : CollapsibleGroupBox("Summary and layer-independent parameters", parent,
+                          sampleItem->expandInfo)
     , m_sampleItem(sampleItem)
     , m_ec(ec)
 {
@@ -77,7 +78,7 @@ SampleForm::SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorCont
     auto* descriptionEdit = new QTextEdit;
     m_layout->addRow("Description:", descriptionEdit);
     descriptionEdit->setFixedWidth(585);
-    descriptionEdit->setMaximumHeight(100);
+    descriptionEdit->setFixedHeight(60);
     descriptionEdit->setAcceptRichText(false);
     descriptionEdit->setTabChangesFocus(true);
     descriptionEdit->setPlainText(sampleItem->description());