Use a checkable groupbox instead of an intermediate checkbox

qgis · Oct 31, 2021 · 1008b1e · 1008b1e
1 parent 95f7829
commit 1008b1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/src/gui/vector/qgsvectorlayerlegendwidget.cpp b/src/gui/vector/qgsvectorlayerlegendwidget.cpp
@@ -60,11 +60,9 @@ QgsVectorLayerLegendWidget::QgsVectorLayerLegendWidget( QWidget *parent )
   mTextOnSymbolGroupBox->setLayout( groupLayout );
   mTextOnSymbolGroupBox->setCollapsed( false );
 
-  mShowLabelLegendCheckBox = new QCheckBox( tr( "Show label legend" ) );
-  connect( mShowLabelLegendCheckBox, &QCheckBox::toggled, this, &QgsVectorLayerLegendWidget::enableLabelLegendGroupBox );
   mLabelLegendGroupBox = new QgsCollapsibleGroupBox;
-  mLabelLegendGroupBox->setVisible( false );
-  mLabelLegendGroupBox->setTitle( tr( "Label legend" ) );
+  mLabelLegendGroupBox->setCheckable( true );
+  mLabelLegendGroupBox->setTitle( tr( "Show Label Legend" ) );
 
   mLabelLegendTreeWidget = new QTreeWidget;
   connect( mLabelLegendTreeWidget, &QTreeWidget::itemDoubleClicked, this, &QgsVectorLayerLegendWidget::labelLegendTreeWidgetItemDoubleClicked );
@@ -85,22 +83,12 @@ QgsVectorLayerLegendWidget::QgsVectorLayerLegendWidget( QWidget *parent )
   layout->setContentsMargins( 0, 0, 0, 0 );
   layout->addWidget( mPlaceholderImageLabel );
   layout->addWidget( mImageSourceLineEdit );
-  layout->addWidget( mShowLabelLegendCheckBox );
   layout->addWidget( mLabelLegendGroupBox );
   layout->addWidget( mTextOnSymbolGroupBox );
 
   setLayout( layout );
 }
 
-void QgsVectorLayerLegendWidget::enableLabelLegendGroupBox( bool enable )
-{
-  mLabelLegendGroupBox->setVisible( enable );
-  if ( enable )
-  {
-    populateLabelLegendTreeWidget();
-  }
-}
-
 void QgsVectorLayerLegendWidget::labelLegendTreeWidgetItemDoubleClicked( QTreeWidgetItem *item, int column )
 {
   const Qt::ItemFlags flags = item->flags();
@@ -128,7 +116,8 @@ void QgsVectorLayerLegendWidget::setLayer( QgsVectorLayer *layer )
   if ( !legend )
     return;
 
-  mShowLabelLegendCheckBox->setChecked( legend->showLabelLegend() );
+  mLabelLegendGroupBox->setChecked( legend->showLabelLegend() );
+  populateLabelLegendTreeWidget();
   mTextOnSymbolGroupBox->setChecked( legend->textOnSymbolEnabled() );
   mTextOnSymbolFormatButton->setTextFormat( legend->textOnSymbolTextFormat() );
   populateLegendTreeView( legend->textOnSymbolContent() );
@@ -227,7 +216,7 @@ void QgsVectorLayerLegendWidget::applyToLayer()
   }
   legend->setTextOnSymbolContent( content );
 
-  const bool showLabelLegend = mShowLabelLegendCheckBox->isChecked();
+  const bool showLabelLegend = mLabelLegendGroupBox->isChecked();
   legend->setShowLabelLegend( showLabelLegend );
   if ( showLabelLegend )
   {

diff --git a/src/gui/vector/qgsvectorlayerlegendwidget.h b/src/gui/vector/qgsvectorlayerlegendwidget.h
@@ -24,7 +24,6 @@
 #include "qgstextformat.h"
 #include "qgis_gui.h"
 
-class QCheckBox;
 class QgsImageSourceLineEdit;
 class QLabel;
 class QPushButton;
@@ -60,7 +59,6 @@ class GUI_EXPORT QgsVectorLayerLegendWidget : public QWidget
 
   private slots:
     void labelsFromExpression();
-    void enableLabelLegendGroupBox( bool enable );
     void labelLegendTreeWidgetItemDoubleClicked( QTreeWidgetItem *item, int column );
 
   private:
@@ -74,7 +72,6 @@ class GUI_EXPORT QgsVectorLayerLegendWidget : public QWidget
     QPushButton *mTextOnSymbolFromExpressionButton = nullptr;
     QgsCollapsibleGroupBox *mTextOnSymbolGroupBox = nullptr;
     QLabel *mTextOnSymbolLabel = nullptr;
-    QCheckBox *mShowLabelLegendCheckBox = nullptr;
     QgsCollapsibleGroupBox *mLabelLegendGroupBox = nullptr;
     QTreeWidget *mLabelLegendTreeWidget = nullptr;
     QLabel *mPlaceholderImageLabel = nullptr;