UI updates for compositionwidget

timlinux · timlinux · commit 4a21d6617d69 · 2009-11-10T14:48:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12070 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp
@@ -43,7 +43,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
   if ( mComposition )
   {
     //read printout resolution from composition
-    mResolutionLineEdit->setText( QString::number( mComposition->printResolution() ) );
+    mResolutionSpinBox->setValue( mComposition->printResolution() );
 
     //print as raster
     if ( mComposition->printAsRaster() )
@@ -64,7 +64,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
     {
       mSnapToGridCheckBox->setCheckState( Qt::Unchecked );
     }
-    mResolutionSpinBox->setValue( mComposition->snapGridResolution() );
+    mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );
     mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );
     mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );
 
@@ -154,20 +154,21 @@ void QgsCompositionWidget::createPaperEntries()
   }
 
   mPaperSizeComboBox->blockSignals( false );
+  mPaperSizeComboBox->setCurrentIndex( 2 ); //A4
 }
 
 void QgsCompositionWidget::on_mPaperSizeComboBox_currentIndexChanged( const QString& text )
 {
   if ( mPaperSizeComboBox->currentText() == tr( "Custom" ) )
   {
-    mPaperWidthLineEdit->setEnabled( true );
-    mPaperHeightLineEdit->setEnabled( true );
+    mPaperWidthDoubleSpinBox->setEnabled( true );
+    mPaperHeightDoubleSpinBox->setEnabled( true );
     mPaperUnitsComboBox->setEnabled( true );
   }
   else
   {
-    mPaperWidthLineEdit->setEnabled( false );
-    mPaperHeightLineEdit->setEnabled( false );
+    mPaperWidthDoubleSpinBox->setEnabled( false );
+    mPaperHeightDoubleSpinBox->setEnabled( false );
     mPaperUnitsComboBox->setEnabled( false );
   }
   applyCurrentPaperSettings();
@@ -189,8 +190,8 @@ void QgsCompositionWidget::on_mPaperOrientationComboBox_currentIndexChanged( con
 
 void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QString& text )
 {
-  double width = size( mPaperWidthLineEdit );
-  double height = size( mPaperHeightLineEdit );
+  double width = size( mPaperWidthDoubleSpinBox );
+  double height = size( mPaperHeightDoubleSpinBox );
 
   if ( mPaperUnitsComboBox->currentIndex() == 0 )
   {
@@ -205,8 +206,8 @@ void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QSt
     height /= 25.4;
   }
 
-  setSize( mPaperWidthLineEdit, width );
-  setSize( mPaperHeightLineEdit, height );
+  setSize( mPaperWidthDoubleSpinBox, width );
+  setSize( mPaperHeightDoubleSpinBox, height );
 
   if ( mPaperSizeComboBox->currentText() == tr( "Custom" ) )
   {
@@ -222,8 +223,8 @@ void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QSt
 
 void QgsCompositionWidget::adjustOrientation()
 {
-  double width = size( mPaperWidthLineEdit );
-  double height = size( mPaperHeightLineEdit );
+  double width = size( mPaperWidthDoubleSpinBox );
+  double height = size( mPaperHeightDoubleSpinBox );
 
   if ( width < 0 || height < 0 )
   {
@@ -237,45 +238,41 @@ void QgsCompositionWidget::adjustOrientation()
     height = tmp;
   }
 
-  bool lineEditsEnabled = mPaperWidthLineEdit->isEnabled();
+  bool lineEditsEnabled = mPaperWidthDoubleSpinBox->isEnabled();
 
-  mPaperWidthLineEdit->setEnabled( true );
-  mPaperHeightLineEdit->setEnabled( true );
+  mPaperWidthDoubleSpinBox->setEnabled( true );
+  mPaperHeightDoubleSpinBox->setEnabled( true );
   if ( mPaperOrientationComboBox->currentText() == tr( "Landscape" ) )
   {
-    setSize( mPaperWidthLineEdit, width );
-    setSize( mPaperHeightLineEdit, height );
+    setSize( mPaperWidthDoubleSpinBox, width );
+    setSize( mPaperHeightDoubleSpinBox, height );
   }
   else
   {
-    setSize( mPaperWidthLineEdit, height );
-    setSize( mPaperHeightLineEdit, width );
+    setSize( mPaperWidthDoubleSpinBox, height );
+    setSize( mPaperHeightDoubleSpinBox, width );
   }
-  mPaperWidthLineEdit->setEnabled( lineEditsEnabled );
-  mPaperHeightLineEdit->setEnabled( lineEditsEnabled );
+  mPaperWidthDoubleSpinBox->setEnabled( lineEditsEnabled );
+  mPaperHeightDoubleSpinBox->setEnabled( lineEditsEnabled );
 }
 
-void QgsCompositionWidget::setSize( QLineEdit *le, double v )
+void QgsCompositionWidget::setSize( QDoubleSpinBox *spin, double v )
 {
   if ( mPaperUnitsComboBox->currentIndex() == 0 )
   {
     // mm
-    le->setText( QString( "%1" ).arg( v ) );
+    spin->setValue( v );
   }
   else
   {
     // inch (show width in inch)
-    le->setText( QString( "%1" ).arg( v / 25.4 ) );
+    spin->setValue(  v / 25.4  );
   }
 }
 
-double QgsCompositionWidget::size( QLineEdit *le )
+double QgsCompositionWidget::size( QDoubleSpinBox *spin )
 {
-  bool conversionSuccess;
-
-  double size = le->text().toDouble( &conversionSuccess );
-  if ( !conversionSuccess )
-    return -1.0;
+  double size = spin->value();
 
   if ( mPaperUnitsComboBox->currentIndex() == 0 )
   {
@@ -300,12 +297,12 @@ void QgsCompositionWidget::applyCurrentPaperSettings()
       return;
     }
 
-    mPaperWidthLineEdit->setEnabled( true );
-    mPaperHeightLineEdit->setEnabled( true );
-    setSize( mPaperWidthLineEdit, it->mWidth );
-    setSize( mPaperHeightLineEdit, it->mHeight );
-    mPaperWidthLineEdit->setEnabled( false );
-    mPaperHeightLineEdit->setEnabled( false );
+    mPaperWidthDoubleSpinBox->setEnabled( true );
+    mPaperHeightDoubleSpinBox->setEnabled( true );
+    setSize( mPaperWidthDoubleSpinBox, it->mWidth );
+    setSize( mPaperHeightDoubleSpinBox, it->mHeight );
+    mPaperWidthDoubleSpinBox->setEnabled( false );
+    mPaperHeightDoubleSpinBox->setEnabled( false );
 
     adjustOrientation();
     applyWidthHeight();
@@ -314,21 +311,21 @@ void QgsCompositionWidget::applyCurrentPaperSettings()
 
 void QgsCompositionWidget::applyWidthHeight()
 {
-  double width = size( mPaperWidthLineEdit );
-  double height = size( mPaperHeightLineEdit );
+  double width = size( mPaperWidthDoubleSpinBox );
+  double height = size( mPaperHeightDoubleSpinBox );
 
   if ( width < 0 || height < 0 )
     return;
 
   mComposition->setPaperSize( width, height );
 }
 
-void QgsCompositionWidget::on_mPaperWidthLineEdit_editingFinished()
+void QgsCompositionWidget::on_mPaperWidthDoubleSpinBox_editingFinished()
 {
   applyWidthHeight();
 }
 
-void QgsCompositionWidget::on_mPaperHeightLineEdit_editingFinished()
+void QgsCompositionWidget::on_mPaperHeightDoubleSpinBox_editingFinished()
 {
   applyWidthHeight();
 }
@@ -343,16 +340,16 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
   //block all signals to avoid infinite recursion
   mPaperSizeComboBox->blockSignals( true );
   mPaperUnitsComboBox->blockSignals( true );
-  mPaperWidthLineEdit->blockSignals( true );
-  mPaperHeightLineEdit->blockSignals( true );
+  mPaperWidthDoubleSpinBox->blockSignals( true );
+  mPaperHeightDoubleSpinBox->blockSignals( true );
   mPaperOrientationComboBox->blockSignals( true );
-  mResolutionLineEdit->blockSignals( true );
+  mResolutionSpinBox->blockSignals( true );
 
   double paperWidth = mComposition->paperWidth();
-  setSize( mPaperWidthLineEdit, paperWidth );
+  setSize( mPaperWidthDoubleSpinBox, paperWidth );
 
   double paperHeight = mComposition->paperHeight();
-  setSize( mPaperHeightLineEdit, paperHeight );
+  setSize( mPaperHeightDoubleSpinBox, paperHeight );
 
   //set orientation
   if ( paperWidth > paperHeight )
@@ -389,10 +386,10 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
 
   mPaperSizeComboBox->blockSignals( false );
   mPaperUnitsComboBox->blockSignals( false );
-  mPaperWidthLineEdit->blockSignals( false );
-  mPaperHeightLineEdit->blockSignals( false );
+  mPaperWidthDoubleSpinBox->blockSignals( false );
+  mPaperHeightDoubleSpinBox->blockSignals( false );
   mPaperOrientationComboBox->blockSignals( false );
-  mResolutionLineEdit->blockSignals( false );
+  mResolutionSpinBox->blockSignals( false );
 }
 
 void QgsCompositionWidget::displaySnapingSettings()
@@ -403,7 +400,7 @@ void QgsCompositionWidget::displaySnapingSettings()
   }
 
   mSnapToGridCheckBox->blockSignals( true );
-  mResolutionSpinBox->blockSignals( true );
+  mGridResolutionSpinBox->blockSignals( true );
   mOffsetXSpinBox->blockSignals( true );
   mOffsetYSpinBox->blockSignals( true );
 
@@ -416,30 +413,19 @@ void QgsCompositionWidget::displaySnapingSettings()
     mSnapToGridCheckBox->setCheckState( Qt::Unchecked );
   }
 
-  mResolutionSpinBox->setValue( mComposition->snapGridResolution() );
+  mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );
   mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );
   mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );
 
   mSnapToGridCheckBox->blockSignals( false );
-  mResolutionSpinBox->blockSignals( false );
+  mGridResolutionSpinBox->blockSignals( false );
   mOffsetXSpinBox->blockSignals( false );
   mOffsetYSpinBox->blockSignals( false );
 }
 
-void QgsCompositionWidget::on_mResolutionLineEdit_textChanged( const QString& text )
+void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( const int value )
 {
-  bool conversionOk;
-  int resolution = text.toInt( &conversionOk );
-  if ( conversionOk && mComposition )
-  {
-    mComposition->setPrintResolution( resolution );
-  }
-  else if ( mComposition )
-  {
-    //set screen resolution per default
-    QPrinter resolutionInfo( QPrinter::ScreenResolution );
-    mComposition->setPrintResolution( resolutionInfo.resolution() );
-  }
+  mComposition->setPrintResolution( value );
 }
 
 void QgsCompositionWidget::on_mPrintAsRasterCheckBox_stateChanged( int state )
@@ -474,7 +460,7 @@ void QgsCompositionWidget::on_mSnapToGridCheckBox_stateChanged( int state )
   }
 }
 
-void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( double d )
+void QgsCompositionWidget::on_mGridResolutionSpinBox_valueChanged( double d )
 {
   if ( mComposition )
   {
diff --git a/src/app/composer/qgscompositionwidget.h b/src/app/composer/qgscompositionwidget.h
@@ -43,13 +43,13 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
     void on_mPaperSizeComboBox_currentIndexChanged( const QString& text );
     void on_mPaperUnitsComboBox_currentIndexChanged( const QString& text );
     void on_mPaperOrientationComboBox_currentIndexChanged( const QString& text );
-    void on_mPaperWidthLineEdit_editingFinished();
-    void on_mPaperHeightLineEdit_editingFinished();
-    void on_mResolutionLineEdit_textChanged( const QString& text );
+    void on_mPaperWidthDoubleSpinBox_editingFinished();
+    void on_mPaperHeightDoubleSpinBox_editingFinished();
+    void on_mResolutionSpinBox_valueChanged( const int value );
     void on_mPrintAsRasterCheckBox_stateChanged( int state );
 
     void on_mSnapToGridCheckBox_stateChanged( int state );
-    void on_mResolutionSpinBox_valueChanged( double d );
+    void on_mGridResolutionSpinBox_valueChanged( double d );
     void on_mOffsetXSpinBox_valueChanged( double d );
     void on_mOffsetYSpinBox_valueChanged( double d );
     void on_mGridColorButton_clicked();
@@ -75,6 +75,6 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
     void createPaperEntries();
     void insertPaperEntries();
 
-    double size( QLineEdit *le );
-    void setSize( QLineEdit *le, double v );
+    double size( QDoubleSpinBox *spin );
+    void setSize( QDoubleSpinBox *spin, double v );
 };
diff --git a/src/ui/qgscompositionwidgetbase.ui b/src/ui/qgscompositionwidgetbase.ui

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )`
`43`	`43`	`if ( mComposition )`
`44`	`44`	`{`
`45`	`45`	`//read printout resolution from composition`
`46`		`- mResolutionLineEdit->setText( QString::number( mComposition->printResolution() ) );`
	`46`	`+ mResolutionSpinBox->setValue( mComposition->printResolution() );`
`47`	`47`
`48`	`48`	`//print as raster`
`49`	`49`	`if ( mComposition->printAsRaster() )`
`@@ -64,7 +64,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )`
`64`	`64`	`{`
`65`	`65`	`mSnapToGridCheckBox->setCheckState( Qt::Unchecked );`
`66`	`66`	`}`
`67`		`- mResolutionSpinBox->setValue( mComposition->snapGridResolution() );`
	`67`	`+ mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );`
`68`	`68`	`mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );`
`69`	`69`	`mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );`
`70`	`70`
`@@ -154,20 +154,21 @@ void QgsCompositionWidget::createPaperEntries()`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`mPaperSizeComboBox->blockSignals( false );`
	`157`	`+ mPaperSizeComboBox->setCurrentIndex( 2 ); //A4`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`void QgsCompositionWidget::on_mPaperSizeComboBox_currentIndexChanged( const QString& text )`
`160`	`161`	`{`
`161`	`162`	`if ( mPaperSizeComboBox->currentText() == tr( "Custom" ) )`
`162`	`163`	`{`
`163`		`- mPaperWidthLineEdit->setEnabled( true );`
`164`		`- mPaperHeightLineEdit->setEnabled( true );`
	`164`	`+ mPaperWidthDoubleSpinBox->setEnabled( true );`
	`165`	`+ mPaperHeightDoubleSpinBox->setEnabled( true );`
`165`	`166`	`mPaperUnitsComboBox->setEnabled( true );`
`166`	`167`	`}`
`167`	`168`	`else`
`168`	`169`	`{`
`169`		`- mPaperWidthLineEdit->setEnabled( false );`
`170`		`- mPaperHeightLineEdit->setEnabled( false );`
	`170`	`+ mPaperWidthDoubleSpinBox->setEnabled( false );`
	`171`	`+ mPaperHeightDoubleSpinBox->setEnabled( false );`
`171`	`172`	`mPaperUnitsComboBox->setEnabled( false );`
`172`	`173`	`}`
`173`	`174`	`applyCurrentPaperSettings();`
`@@ -189,8 +190,8 @@ void QgsCompositionWidget::on_mPaperOrientationComboBox_currentIndexChanged( con`
`189`	`190`
`190`	`191`	`void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QString& text )`
`191`	`192`	`{`
`192`		`- double width = size( mPaperWidthLineEdit );`
`193`		`- double height = size( mPaperHeightLineEdit );`
	`193`	`+ double width = size( mPaperWidthDoubleSpinBox );`
	`194`	`+ double height = size( mPaperHeightDoubleSpinBox );`
`194`	`195`
`195`	`196`	`if ( mPaperUnitsComboBox->currentIndex() == 0 )`
`196`	`197`	`{`
`@@ -205,8 +206,8 @@ void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QSt`
`205`	`206`	`height /= 25.4;`
`206`	`207`	`}`
`207`	`208`
`208`		`- setSize( mPaperWidthLineEdit, width );`
`209`		`- setSize( mPaperHeightLineEdit, height );`
	`209`	`+ setSize( mPaperWidthDoubleSpinBox, width );`
	`210`	`+ setSize( mPaperHeightDoubleSpinBox, height );`
`210`	`211`
`211`	`212`	`if ( mPaperSizeComboBox->currentText() == tr( "Custom" ) )`
`212`	`213`	`{`
`@@ -222,8 +223,8 @@ void QgsCompositionWidget::on_mPaperUnitsComboBox_currentIndexChanged( const QSt`
`222`	`223`
`223`	`224`	`void QgsCompositionWidget::adjustOrientation()`
`224`	`225`	`{`
`225`		`- double width = size( mPaperWidthLineEdit );`
`226`		`- double height = size( mPaperHeightLineEdit );`
	`226`	`+ double width = size( mPaperWidthDoubleSpinBox );`
	`227`	`+ double height = size( mPaperHeightDoubleSpinBox );`
`227`	`228`
`228`	`229`	`if ( width < 0 \|\| height < 0 )`
`229`	`230`	`{`
`@@ -237,45 +238,41 @@ void QgsCompositionWidget::adjustOrientation()`
`237`	`238`	`height = tmp;`
`238`	`239`	`}`
`239`	`240`
`240`		`- bool lineEditsEnabled = mPaperWidthLineEdit->isEnabled();`
	`241`	`+ bool lineEditsEnabled = mPaperWidthDoubleSpinBox->isEnabled();`
`241`	`242`
`242`		`- mPaperWidthLineEdit->setEnabled( true );`
`243`		`- mPaperHeightLineEdit->setEnabled( true );`
	`243`	`+ mPaperWidthDoubleSpinBox->setEnabled( true );`
	`244`	`+ mPaperHeightDoubleSpinBox->setEnabled( true );`
`244`	`245`	`if ( mPaperOrientationComboBox->currentText() == tr( "Landscape" ) )`
`245`	`246`	`{`
`246`		`- setSize( mPaperWidthLineEdit, width );`
`247`		`- setSize( mPaperHeightLineEdit, height );`
	`247`	`+ setSize( mPaperWidthDoubleSpinBox, width );`
	`248`	`+ setSize( mPaperHeightDoubleSpinBox, height );`
`248`	`249`	`}`
`249`	`250`	`else`
`250`	`251`	`{`
`251`		`- setSize( mPaperWidthLineEdit, height );`
`252`		`- setSize( mPaperHeightLineEdit, width );`
	`252`	`+ setSize( mPaperWidthDoubleSpinBox, height );`
	`253`	`+ setSize( mPaperHeightDoubleSpinBox, width );`
`253`	`254`	`}`
`254`		`- mPaperWidthLineEdit->setEnabled( lineEditsEnabled );`
`255`		`- mPaperHeightLineEdit->setEnabled( lineEditsEnabled );`
	`255`	`+ mPaperWidthDoubleSpinBox->setEnabled( lineEditsEnabled );`
	`256`	`+ mPaperHeightDoubleSpinBox->setEnabled( lineEditsEnabled );`
`256`	`257`	`}`
`257`	`258`
`258`		`-void QgsCompositionWidget::setSize( QLineEdit *le, double v )`
	`259`	`+void QgsCompositionWidget::setSize( QDoubleSpinBox *spin, double v )`
`259`	`260`	`{`
`260`	`261`	`if ( mPaperUnitsComboBox->currentIndex() == 0 )`
`261`	`262`	`{`
`262`	`263`	`// mm`
`263`		`- le->setText( QString( "%1" ).arg( v ) );`
	`264`	`+ spin->setValue( v );`
`264`	`265`	`}`
`265`	`266`	`else`
`266`	`267`	`{`
`267`	`268`	`// inch (show width in inch)`
`268`		`- le->setText( QString( "%1" ).arg( v / 25.4 ) );`
	`269`	`+ spin->setValue( v / 25.4 );`
`269`	`270`	`}`
`270`	`271`	`}`
`271`	`272`
`272`		`-double QgsCompositionWidget::size( QLineEdit *le )`
	`273`	`+double QgsCompositionWidget::size( QDoubleSpinBox *spin )`
`273`	`274`	`{`
`274`		`- bool conversionSuccess;`
`275`		`-`
`276`		`- double size = le->text().toDouble( &conversionSuccess );`
`277`		`- if ( !conversionSuccess )`
`278`		`- return -1.0;`
	`275`	`+ double size = spin->value();`
`279`	`276`
`280`	`277`	`if ( mPaperUnitsComboBox->currentIndex() == 0 )`
`281`	`278`	`{`
`@@ -300,12 +297,12 @@ void QgsCompositionWidget::applyCurrentPaperSettings()`
`300`	`297`	`return;`
`301`	`298`	`}`
`302`	`299`
`303`		`- mPaperWidthLineEdit->setEnabled( true );`
`304`		`- mPaperHeightLineEdit->setEnabled( true );`
`305`		`- setSize( mPaperWidthLineEdit, it->mWidth );`
`306`		`- setSize( mPaperHeightLineEdit, it->mHeight );`
`307`		`- mPaperWidthLineEdit->setEnabled( false );`
`308`		`- mPaperHeightLineEdit->setEnabled( false );`
	`300`	`+ mPaperWidthDoubleSpinBox->setEnabled( true );`
	`301`	`+ mPaperHeightDoubleSpinBox->setEnabled( true );`
	`302`	`+ setSize( mPaperWidthDoubleSpinBox, it->mWidth );`
	`303`	`+ setSize( mPaperHeightDoubleSpinBox, it->mHeight );`
	`304`	`+ mPaperWidthDoubleSpinBox->setEnabled( false );`
	`305`	`+ mPaperHeightDoubleSpinBox->setEnabled( false );`
`309`	`306`
`310`	`307`	`adjustOrientation();`
`311`	`308`	`applyWidthHeight();`
`@@ -314,21 +311,21 @@ void QgsCompositionWidget::applyCurrentPaperSettings()`
`314`	`311`
`315`	`312`	`void QgsCompositionWidget::applyWidthHeight()`
`316`	`313`	`{`
`317`		`- double width = size( mPaperWidthLineEdit );`
`318`		`- double height = size( mPaperHeightLineEdit );`
	`314`	`+ double width = size( mPaperWidthDoubleSpinBox );`
	`315`	`+ double height = size( mPaperHeightDoubleSpinBox );`
`319`	`316`
`320`	`317`	`if ( width < 0 \|\| height < 0 )`
`321`	`318`	`return;`
`322`	`319`
`323`	`320`	`mComposition->setPaperSize( width, height );`
`324`	`321`	`}`
`325`	`322`
`326`		`-void QgsCompositionWidget::on_mPaperWidthLineEdit_editingFinished()`
	`323`	`+void QgsCompositionWidget::on_mPaperWidthDoubleSpinBox_editingFinished()`
`327`	`324`	`{`
`328`	`325`	`applyWidthHeight();`
`329`	`326`	`}`
`330`	`327`
`331`		`-void QgsCompositionWidget::on_mPaperHeightLineEdit_editingFinished()`
	`328`	`+void QgsCompositionWidget::on_mPaperHeightDoubleSpinBox_editingFinished()`
`332`	`329`	`{`
`333`	`330`	`applyWidthHeight();`
`334`	`331`	`}`
`@@ -343,16 +340,16 @@ void QgsCompositionWidget::displayCompositionWidthHeight()`
`343`	`340`	`//block all signals to avoid infinite recursion`
`344`	`341`	`mPaperSizeComboBox->blockSignals( true );`
`345`	`342`	`mPaperUnitsComboBox->blockSignals( true );`
`346`		`- mPaperWidthLineEdit->blockSignals( true );`
`347`		`- mPaperHeightLineEdit->blockSignals( true );`
	`343`	`+ mPaperWidthDoubleSpinBox->blockSignals( true );`
	`344`	`+ mPaperHeightDoubleSpinBox->blockSignals( true );`
`348`	`345`	`mPaperOrientationComboBox->blockSignals( true );`
`349`		`- mResolutionLineEdit->blockSignals( true );`
	`346`	`+ mResolutionSpinBox->blockSignals( true );`
`350`	`347`
`351`	`348`	`double paperWidth = mComposition->paperWidth();`
`352`		`- setSize( mPaperWidthLineEdit, paperWidth );`
	`349`	`+ setSize( mPaperWidthDoubleSpinBox, paperWidth );`
`353`	`350`
`354`	`351`	`double paperHeight = mComposition->paperHeight();`
`355`		`- setSize( mPaperHeightLineEdit, paperHeight );`
	`352`	`+ setSize( mPaperHeightDoubleSpinBox, paperHeight );`
`356`	`353`
`357`	`354`	`//set orientation`
`358`	`355`	`if ( paperWidth > paperHeight )`
`@@ -389,10 +386,10 @@ void QgsCompositionWidget::displayCompositionWidthHeight()`
`389`	`386`
`390`	`387`	`mPaperSizeComboBox->blockSignals( false );`
`391`	`388`	`mPaperUnitsComboBox->blockSignals( false );`
`392`		`- mPaperWidthLineEdit->blockSignals( false );`
`393`		`- mPaperHeightLineEdit->blockSignals( false );`
	`389`	`+ mPaperWidthDoubleSpinBox->blockSignals( false );`
	`390`	`+ mPaperHeightDoubleSpinBox->blockSignals( false );`
`394`	`391`	`mPaperOrientationComboBox->blockSignals( false );`
`395`		`- mResolutionLineEdit->blockSignals( false );`
	`392`	`+ mResolutionSpinBox->blockSignals( false );`
`396`	`393`	`}`
`397`	`394`
`398`	`395`	`void QgsCompositionWidget::displaySnapingSettings()`
`@@ -403,7 +400,7 @@ void QgsCompositionWidget::displaySnapingSettings()`
`403`	`400`	`}`
`404`	`401`
`405`	`402`	`mSnapToGridCheckBox->blockSignals( true );`
`406`		`- mResolutionSpinBox->blockSignals( true );`
	`403`	`+ mGridResolutionSpinBox->blockSignals( true );`
`407`	`404`	`mOffsetXSpinBox->blockSignals( true );`
`408`	`405`	`mOffsetYSpinBox->blockSignals( true );`
`409`	`406`
`@@ -416,30 +413,19 @@ void QgsCompositionWidget::displaySnapingSettings()`
`416`	`413`	`mSnapToGridCheckBox->setCheckState( Qt::Unchecked );`
`417`	`414`	`}`
`418`	`415`
`419`		`- mResolutionSpinBox->setValue( mComposition->snapGridResolution() );`
	`416`	`+ mGridResolutionSpinBox->setValue( mComposition->snapGridResolution() );`
`420`	`417`	`mOffsetXSpinBox->setValue( mComposition->snapGridOffsetX() );`
`421`	`418`	`mOffsetYSpinBox->setValue( mComposition->snapGridOffsetY() );`
`422`	`419`
`423`	`420`	`mSnapToGridCheckBox->blockSignals( false );`
`424`		`- mResolutionSpinBox->blockSignals( false );`
	`421`	`+ mGridResolutionSpinBox->blockSignals( false );`
`425`	`422`	`mOffsetXSpinBox->blockSignals( false );`
`426`	`423`	`mOffsetYSpinBox->blockSignals( false );`
`427`	`424`	`}`
`428`	`425`
`429`		`-void QgsCompositionWidget::on_mResolutionLineEdit_textChanged( const QString& text )`
	`426`	`+void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( const int value )`
`430`	`427`	`{`
`431`		`- bool conversionOk;`
`432`		`- int resolution = text.toInt( &conversionOk );`
`433`		`- if ( conversionOk && mComposition )`
`434`		`- {`
`435`		`- mComposition->setPrintResolution( resolution );`
`436`		`- }`
`437`		`- else if ( mComposition )`
`438`		`- {`
`439`		`- //set screen resolution per default`
`440`		`- QPrinter resolutionInfo( QPrinter::ScreenResolution );`
`441`		`- mComposition->setPrintResolution( resolutionInfo.resolution() );`
`442`		`- }`
	`428`	`+ mComposition->setPrintResolution( value );`
`443`	`429`	`}`
`444`	`430`
`445`	`431`	`void QgsCompositionWidget::on_mPrintAsRasterCheckBox_stateChanged( int state )`
`@@ -474,7 +460,7 @@ void QgsCompositionWidget::on_mSnapToGridCheckBox_stateChanged( int state )`
`474`	`460`	`}`
`475`	`461`	`}`
`476`	`462`
`477`		`-void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged( double d )`
	`463`	`+void QgsCompositionWidget::on_mGridResolutionSpinBox_valueChanged( double d )`
`478`	`464`	`{`
`479`	`465`	`if ( mComposition )`
`480`	`466`	`{`