Merge pull request #435 from Oslandia/atlas

[Atlas] Fix UI to be consistent with the use of QgsCollapsibleWidgets
qgis · Feb 28, 2013 · c857313 · c857313
2 parents 13b362e + 62e6b13
commit c857313
Show file tree

Hide file tree

Showing 3 changed files with 398 additions and 212 deletions.
diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -85,12 +85,22 @@ void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
   if ( state == Qt::Checked )
   {
     atlasMap->setEnabled( true );
-    mAtlasFrame->setEnabled( true );
+    mConfigurationGroup->setEnabled( true );
+    mVisibilityGroup->setEnabled( true );
+    mSortingGroup->setEnabled( true );
+    mFilteringGroup->setEnabled( true );
+    mScalingGroup->setEnabled( true );
+    mOutputGroup->setEnabled( true );
   }
   else
   {
     atlasMap->setEnabled( false );
-    mAtlasFrame->setEnabled( false );
+    mConfigurationGroup->setEnabled( false );
+    mVisibilityGroup->setEnabled( false );
+    mSortingGroup->setEnabled( false );
+    mFilteringGroup->setEnabled( false );
+    mScalingGroup->setEnabled( false );
+    mOutputGroup->setEnabled( false );
   }
 }
 
@@ -409,5 +419,10 @@ void QgsAtlasCompositionWidget::updateGuiElements()
 void QgsAtlasCompositionWidget::blockAllSignals( bool b )
 {
   mUseAtlasCheckBox->blockSignals( b );
-  mAtlasFrame->blockSignals( b );
+  mConfigurationGroup->blockSignals( b );
+  mVisibilityGroup->blockSignals( b );
+  mSortingGroup->blockSignals( b );
+  mFilteringGroup->blockSignals( b );
+  mScalingGroup->blockSignals( b );
+  mOutputGroup->blockSignals( b );
 }
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -323,6 +323,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   tabifyDockWidget( mGeneralDock, mUndoDock );
   tabifyDockWidget( mItemDock, mUndoDock );
   tabifyDockWidget( mGeneralDock, mItemDock );
+  tabifyDockWidget( mItemDock, mAtlasDock );
 
   mGeneralDock->raise();