Initially set width and height spinboxes in composition paper setup to disabled (since initial format is A4)

manisandro · nyalldawson · commit ca2e68c407dc · 2014-04-13T13:41:11.000+10:00
diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp
@@ -139,7 +139,6 @@ void QgsCompositionWidget::createPaperEntries()
     mPaperSizeComboBox->addItem( it->mName );
     mPaperMap.insert( it->mName, *it );
   }
-  mPaperSizeComboBox->setCurrentIndex( 2 ); //A4
 }
 
 void QgsCompositionWidget::on_mPaperSizeComboBox_currentIndexChanged( const QString& text )
@@ -380,6 +379,12 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
     //custom
     mPaperSizeComboBox->setCurrentIndex( 0 );
   }
+  else
+  {
+    mPaperWidthDoubleSpinBox->setEnabled( false );
+    mPaperHeightDoubleSpinBox->setEnabled( false );
+    mPaperUnitsComboBox->setEnabled( false );
+  }
 }
 
 void QgsCompositionWidget::on_mPageStyleButton_clicked()
@@ -567,3 +572,4 @@ void QgsCompositionWidget::blockSignals( bool block )
   mGridToleranceSpinBox->blockSignals( block );
   mAlignmentToleranceSpinBox->blockSignals( block );
 }
+

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,6 @@ void QgsCompositionWidget::createPaperEntries()`
`139`	`139`	`mPaperSizeComboBox->addItem( it->mName );`
`140`	`140`	`mPaperMap.insert( it->mName, *it );`
`141`	`141`	`}`
`142`		`- mPaperSizeComboBox->setCurrentIndex( 2 ); //A4`
`143`	`142`	`}`
`144`	`143`
`145`	`144`	`void QgsCompositionWidget::on_mPaperSizeComboBox_currentIndexChanged( const QString& text )`
`@@ -380,6 +379,12 @@ void QgsCompositionWidget::displayCompositionWidthHeight()`
`380`	`379`	`//custom`
`381`	`380`	`mPaperSizeComboBox->setCurrentIndex( 0 );`
`382`	`381`	`}`
	`382`	`+ else`
	`383`	`+ {`
	`384`	`+ mPaperWidthDoubleSpinBox->setEnabled( false );`
	`385`	`+ mPaperHeightDoubleSpinBox->setEnabled( false );`
	`386`	`+ mPaperUnitsComboBox->setEnabled( false );`
	`387`	`+ }`
`383`	`388`	`}`
`384`	`389`
`385`	`390`	`void QgsCompositionWidget::on_mPageStyleButton_clicked()`
`@@ -567,3 +572,4 @@ void QgsCompositionWidget::blockSignals( bool block )`
`567`	`572`	`mGridToleranceSpinBox->blockSignals( block );`
`568`	`573`	`mAlignmentToleranceSpinBox->blockSignals( block );`
`569`	`574`	`}`
	`575`	`+`