Make report/atlas settings actions checkable, so they can also hide the panels

nyalldawson · nyalldawson · commit 4e6a072e4908 · 2018-01-05T12:20:55.000+10:00
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -659,9 +659,11 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
 
   mAtlasDock = new QgsDockWidget( tr( "Atlas" ), this );
   mAtlasDock->setObjectName( QStringLiteral( "AtlasDock" ) );
+  connect( mAtlasDock, &QDockWidget::visibilityChanged, mActionAtlasSettings, &QAction::setChecked );
 
   mReportDock = new QgsDockWidget( tr( "Report" ), this );
   mReportDock->setObjectName( QStringLiteral( "ReportDock" ) );
+  connect( mReportDock, &QDockWidget::visibilityChanged, mActionReportSettings, &QAction::setChecked );
 
   const QList<QDockWidget *> docks = findChildren<QDockWidget *>();
   for ( QDockWidget *dock : docks )
@@ -1992,12 +1994,12 @@ void QgsLayoutDesignerDialog::exportToSvg()
   QApplication::restoreOverrideCursor();
 }
 
-void QgsLayoutDesignerDialog::showAtlasSettings()
+void QgsLayoutDesignerDialog::showAtlasSettings( bool checked )
 {
   if ( !mAtlasDock )
     return;
 
-  mAtlasDock->setUserVisible( true );
+  mAtlasDock->setUserVisible( checked );
 }
 
 void QgsLayoutDesignerDialog::atlasPreviewTriggered( bool checked )
@@ -3274,12 +3276,12 @@ void QgsLayoutDesignerDialog::printReport()
   QApplication::restoreOverrideCursor();
 }
 
-void QgsLayoutDesignerDialog::showReportSettings()
+void QgsLayoutDesignerDialog::showReportSettings( bool checked )
 {
   if ( !mReportDock )
     return;
 
-  mReportDock->setUserVisible( true );
+  mReportDock->setUserVisible( checked );
 }
 
 void QgsLayoutDesignerDialog::pageSetup()
diff --git a/src/app/layout/qgslayoutdesignerdialog.h b/src/app/layout/qgslayoutdesignerdialog.h
@@ -309,7 +309,7 @@ class QgsLayoutDesignerDialog: public QMainWindow, private Ui::QgsLayoutDesigner
     void exportToRaster();
     void exportToPdf();
     void exportToSvg();
-    void showAtlasSettings();
+    void showAtlasSettings( bool checked );
     void atlasPreviewTriggered( bool checked );
     void atlasPageComboEditingFinished();
     void atlasNext();
@@ -325,7 +325,7 @@ class QgsLayoutDesignerDialog: public QMainWindow, private Ui::QgsLayoutDesigner
     void exportReportToSvg();
     void exportReportToPdf();
     void printReport();
-    void showReportSettings();
+    void showReportSettings( bool checked );
 
     void pageSetup();
 
diff --git a/src/ui/layout/qgslayoutdesignerbase.ui b/src/ui/layout/qgslayoutdesignerbase.ui
@@ -99,7 +99,7 @@
      <x>0</x>
      <y>0</y>
      <width>2180</width>
-     <height>42</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="mLayoutMenu">
@@ -1369,6 +1369,9 @@
    </property>
   </action>
   <action name="mActionAtlasSettings">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset resource="../../../images/images.qrc">
      <normaloff>:/images/themes/default/mActionAtlasSettings.svg</normaloff>:/images/themes/default/mActionAtlasSettings.svg</iconset>
@@ -1429,6 +1432,9 @@
    </property>
   </action>
   <action name="mActionReportSettings">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset resource="../../../images/images.qrc">
      <normaloff>:/images/themes/default/mActionAtlasSettings.svg</normaloff>:/images/themes/default/mActionAtlasSettings.svg</iconset>
@@ -1510,6 +1516,7 @@
   <include location="../../../images/images.qrc"/>
   <include location="../../../images/images.qrc"/>
   <include location="../../../images/images.qrc"/>
+  <include location="../../../images/images.qrc"/>
  </resources>
  <connections/>
 </ui>

Original file line number	Diff line number	Diff line change
`@@ -659,9 +659,11 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla`
`659`	`659`
`660`	`660`	`mAtlasDock = new QgsDockWidget( tr( "Atlas" ), this );`
`661`	`661`	`mAtlasDock->setObjectName( QStringLiteral( "AtlasDock" ) );`
	`662`	`+ connect( mAtlasDock, &QDockWidget::visibilityChanged, mActionAtlasSettings, &QAction::setChecked );`
`662`	`663`
`663`	`664`	`mReportDock = new QgsDockWidget( tr( "Report" ), this );`
`664`	`665`	`mReportDock->setObjectName( QStringLiteral( "ReportDock" ) );`
	`666`	`+ connect( mReportDock, &QDockWidget::visibilityChanged, mActionReportSettings, &QAction::setChecked );`
`665`	`667`
`666`	`668`	`const QList<QDockWidget > docks = findChildren<QDockWidget >();`
`667`	`669`	`for ( QDockWidget *dock : docks )`
`@@ -1992,12 +1994,12 @@ void QgsLayoutDesignerDialog::exportToSvg()`
`1992`	`1994`	`QApplication::restoreOverrideCursor();`
`1993`	`1995`	`}`
`1994`	`1996`
`1995`		`-void QgsLayoutDesignerDialog::showAtlasSettings()`
	`1997`	`+void QgsLayoutDesignerDialog::showAtlasSettings( bool checked )`
`1996`	`1998`	`{`
`1997`	`1999`	`if ( !mAtlasDock )`
`1998`	`2000`	`return;`
`1999`	`2001`
`2000`		`- mAtlasDock->setUserVisible( true );`
	`2002`	`+ mAtlasDock->setUserVisible( checked );`
`2001`	`2003`	`}`
`2002`	`2004`
`2003`	`2005`	`void QgsLayoutDesignerDialog::atlasPreviewTriggered( bool checked )`
`@@ -3274,12 +3276,12 @@ void QgsLayoutDesignerDialog::printReport()`
`3274`	`3276`	`QApplication::restoreOverrideCursor();`
`3275`	`3277`	`}`
`3276`	`3278`
`3277`		`-void QgsLayoutDesignerDialog::showReportSettings()`
	`3279`	`+void QgsLayoutDesignerDialog::showReportSettings( bool checked )`
`3278`	`3280`	`{`
`3279`	`3281`	`if ( !mReportDock )`
`3280`	`3282`	`return;`
`3281`	`3283`
`3282`		`- mReportDock->setUserVisible( true );`
	`3284`	`+ mReportDock->setUserVisible( checked );`
`3283`	`3285`	`}`
`3284`	`3286`
`3285`	`3287`	`void QgsLayoutDesignerDialog::pageSetup()`