Explicitly disable remove button if no child report section is selected

nyalldawson · nyalldawson · commit b184c5e102a5 · 2018-01-05T12:40:26.000+10:00
diff --git a/src/app/layout/qgsreportorganizerwidget.cpp b/src/app/layout/qgsreportorganizerwidget.cpp
@@ -66,6 +66,7 @@ QgsReportOrganizerWidget::QgsReportOrganizerWidget( QWidget *parent, QgsLayoutDe
 
   mButtonAddSection->setMenu( addMenu );
   connect( mButtonRemoveSection, &QPushButton::clicked, this, &QgsReportOrganizerWidget::removeSection );
+  mButtonRemoveSection->setEnabled( false ); //disable until section clicked
 }
 
 void QgsReportOrganizerWidget::setMessageBar( QgsMessageBar *bar )
@@ -112,6 +113,9 @@ void QgsReportOrganizerWidget::selectionChanged( const QModelIndex &current, con
   if ( !parent )
     parent = mReport;
 
+  // report cannot be deleted
+  mButtonRemoveSection->setEnabled( parent != mReport );
+
   delete mConfigWidget;
   if ( QgsReportSectionLayout *section = dynamic_cast< QgsReportSectionLayout * >( parent ) )
   {

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ QgsReportOrganizerWidget::QgsReportOrganizerWidget( QWidget *parent, QgsLayoutDe`
`66`	`66`
`67`	`67`	`mButtonAddSection->setMenu( addMenu );`
`68`	`68`	`connect( mButtonRemoveSection, &QPushButton::clicked, this, &QgsReportOrganizerWidget::removeSection );`
	`69`	`+ mButtonRemoveSection->setEnabled( false ); //disable until section clicked`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`void QgsReportOrganizerWidget::setMessageBar( QgsMessageBar *bar )`
`@@ -112,6 +113,9 @@ void QgsReportOrganizerWidget::selectionChanged( const QModelIndex &current, con`
`112`	`113`	`if ( !parent )`
`113`	`114`	`parent = mReport;`
`114`	`115`
	`116`	`+ // report cannot be deleted`
	`117`	`+ mButtonRemoveSection->setEnabled( parent != mReport );`
	`118`	`+`
`115`	`119`	`delete mConfigWidget;`
`116`	`120`	`if ( QgsReportSectionLayout section = dynamic_cast< QgsReportSectionLayout >( parent ) )`
`117`	`121`	`{`