Skip to content
Permalink
Browse files
[Atlas] Fix UI to be consistent with the use of QgsCollapsibleWidgets
  • Loading branch information
Hugo Mercier committed Feb 22, 2013
1 parent eea57cf commit 34e6b9a2f011d1655f1f967f0abb46f991c7ee32
Showing with 303 additions and 167 deletions.
  1. +18 −3 src/app/composer/qgsatlascompositionwidget.cpp
  2. +1 −0 src/app/composer/qgscomposer.cpp
  3. +284 −164 src/ui/qgsatlascompositionwidgetbase.ui
@@ -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 );
}
@@ -320,6 +320,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
tabifyDockWidget( mGeneralDock, mUndoDock );
tabifyDockWidget( mItemDock, mUndoDock );
tabifyDockWidget( mGeneralDock, mItemDock );
tabifyDockWidget( mItemDock, mAtlasDock );

mGeneralDock->raise();

Loading

0 comments on commit 34e6b9a

Please sign in to comment.