[composer] Correctly restore dock visibility and active dock tab

After using the show/hide panels action all dock tabs would be shown (ignoring previously hidden tabs) and the active dock tab would be randomly chosen. Now, the previous settings are remembered and correctly restored.
qgis · Jan 29, 2015 · 77fcf8c · 77fcf8c
1 parent a20b8e0
commit 77fcf8c
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 10 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -540,11 +540,12 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mItemsDock->setObjectName( "ItemsDock" );
   mPanelMenu->addAction( mItemsDock->toggleViewAction() );
 
-  mGeneralDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
-  mItemDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
-  mUndoDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
-  mAtlasDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
-  mItemsDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
+  QList<QDockWidget *> docks = findChildren<QDockWidget *>();
+  foreach ( QDockWidget* dock, docks )
+  {
+    dock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
+    connect( dock, SIGNAL( visibilityChanged( bool ) ), this, SLOT( dockVisibilityChanged( bool ) ) );
+  }
 
   createCompositionWidget();
 
@@ -1251,12 +1252,61 @@ void QgsComposer::on_mActionToggleFullScreen_triggered()
 
 void QgsComposer::on_mActionHidePanels_triggered()
 {
+  /*
+  workaround the limited Qt dock widget API
+  see http://qt-project.org/forums/viewthread/1141/
+  and http://qt-project.org/faq/answer/how_can_i_check_which_tab_is_the_current_one_in_a_tabbed_qdockwidget
+  */
+
   bool showPanels = !mActionHidePanels->isChecked();
-  mItemDock->setVisible( showPanels );
-  mGeneralDock->setVisible( showPanels );
-  mUndoDock->setVisible( showPanels );
-  mAtlasDock->setVisible( showPanels );
-  mItemsDock->setVisible( showPanels );
+  QList<QDockWidget *> docks = findChildren<QDockWidget *>();
+  QList<QTabBar *> tabBars = findChildren<QTabBar *>();
+
+  if ( !showPanels )
+  {
+    mPanelStatus.clear();
+    //record status of all docks
+
+    foreach ( QDockWidget* dock, docks )
+    {
+      mPanelStatus.insert( dock->windowTitle(), PanelStatus( dock->isVisible(), false ) );
+      dock->setVisible( false );
+    }
+
+    //record active dock tabs
+    foreach ( QTabBar* tabBar, tabBars )
+    {
+      QString currentTabTitle = tabBar->tabText( tabBar->currentIndex() );
+      mPanelStatus[ currentTabTitle ].isActive = true;
+    }
+  }
+  else
+  {
+    //restore visibility of all docks
+    foreach ( QDockWidget* dock, docks )
+    {
+      if ( ! mPanelStatus.contains( dock->windowTitle() ) )
+      {
+        dock->setVisible( true );
+        continue;
+      }
+      dock->setVisible( mPanelStatus.value( dock->windowTitle() ).isVisible );
+    }
+
+    //restore previously active dock tabs
+    foreach ( QTabBar* tabBar, tabBars )
+    {
+      //loop through all tabs in tab bar
+      for ( int i = 0; i < tabBar->count(); ++i )
+      {
+        QString tabTitle = tabBar->tabText( i );
+        if ( mPanelStatus.value( tabTitle ).isActive )
+        {
+          tabBar->setCurrentIndex( i );
+        }
+      }
+    }
+  }
 }
 
 void QgsComposer::disablePreviewMode()
@@ -1348,6 +1398,16 @@ void QgsComposer::setComposition( QgsComposition* composition )
   setPrinterPageDefaults();
 }
 
+void QgsComposer::dockVisibilityChanged( bool visible )
+{
+  if ( visible )
+  {
+    mActionHidePanels->blockSignals( true );
+    mActionHidePanels->setChecked( false );
+    mActionHidePanels->blockSignals( false );
+  }
+}
+
 void QgsComposer::on_mActionExportAtlasAsPDF_triggered()
 {
   QgsComposition::AtlasMode previousMode = mComposition->atlasMode();

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -594,6 +594,15 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
 
     QgsMapLayerAction* mAtlasFeatureAction;
 
+    struct PanelStatus
+    {
+      PanelStatus( bool visible = true, bool active = false ) : isVisible( visible ), isActive( active ) {}
+      bool isVisible;
+      bool isActive;
+    };
+
+    QMap< QString, PanelStatus > mPanelStatus;
+
   signals:
     void printAsRasterChanged( bool state );
 
@@ -637,6 +646,8 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //! Sets the composition for the composer window
     void setComposition( QgsComposition* composition );
 
+    void dockVisibilityChanged( bool visible );
+
 };
 
 #endif