Update composition item with signal in case the paper size has been changed

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11817 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: mhugent

src/app/composer/qgscomposer.cpp

@@ -181,6 +181,7 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow(), mFirstPaint( true )
   mView->setComposition( mComposition );
 
   QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mCompositionOptionsFrame, mComposition );
+  QObject::connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
   compositionWidget->show();
 
   mCompositionOptionsLayout = new QGridLayout( mCompositionOptionsFrame );
@@ -1097,6 +1098,7 @@ void QgsComposer::readXML( const QDomDocument& doc )
 
   //create compositionwidget
   QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mCompositionOptionsFrame, mComposition );
+  QObject::connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
   compositionWidget->show();
 
   mCompositionOptionsLayout = new QGridLayout( mCompositionOptionsFrame );

src/app/composer/qgscompositionwidget.h

@@ -55,6 +55,8 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
     void on_mGridColorButton_clicked();
     void on_mGridStyleComboBox_currentIndexChanged( const QString& text );
     void on_mPenWidthSpinBox_valueChanged( double d );
+    /**Sets GUI elements to width/height from composition*/
+    void displayCompositionWidthHeight();
 
   private:
     QgsComposition* mComposition;
@@ -67,8 +69,6 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
     void applyWidthHeight();
     /**Makes sure width/height values for custom paper matches the current orientation*/
     void adjustOrientation();
-    /**Sets GUI elements to width/height from composition*/
-    void displayCompositionWidthHeight();
     /**Sets GUI elements to snaping distances of composition*/
     void displaySnapingSettings();
 

src/core/CMakeLists.txt

@@ -181,6 +181,7 @@ composer/qgscomposermap.h
 composer/qgscomposerpicture.h
 composer/qgscomposerscalebar.h
 composer/qgscomposeritemgroup.h
+composer/qgscomposition.h
 composer/qgslegendmodel.h
 symbology/qgsmarkercatalogue.h
 raster/qgsrasterlayer.h

src/core/composer/qgscomposition.cpp

@@ -59,6 +59,7 @@ void QgsComposition::setPaperSize( double width, double height )
   if ( mPaperItem )
   {
     mPaperItem->setRect( QRectF( 0, 0, width, height ) );
+    emit paperSizeChanged();
   }
 }
 

src/core/composer/qgscomposition.h

@@ -36,6 +36,7 @@ class QDomElement;
  * */
 class CORE_EXPORT QgsComposition: public QGraphicsScene
 {
+    Q_OBJECT
   public:
 
     /** \brief Plot type */
@@ -187,6 +188,9 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
 
     void loadGridAppearanceSettings();
     void saveGridAppearanceSettings();
+
+  signals:
+    void paperSizeChanged();
 };
 
 #endif