Update frame widgets if the multiframe object has changed

qgis · Jul 30, 2012 · eb08414 · eb08414
1 parent 2e6ecbc
commit eb08414
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp
@@ -7,8 +7,17 @@
 QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml* html, QgsComposerFrame* frame ): mHtml( html ), mFrame( frame )
 {
   setupUi( this );
+
+  blockSignals( true );
   mResizeModeComboBox->addItem( tr( "Use existing frames" ), QgsComposerMultiFrame::UseExistingFrames );
   mResizeModeComboBox->addItem( tr( "Extend to next page" ), QgsComposerMultiFrame::ExtendToNextPage );
+  blockSignals( false );
+  setGuiElementValues();
+
+  if ( mHtml )
+  {
+    QObject::connect( mHtml, SIGNAL( changed() ), this, SLOT( setGuiElementValues() ) );
+  }
 
   //embed widget for general options
   if ( mFrame )

diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -65,6 +65,7 @@ void QgsComposerHtml::setUrl( const QUrl& url )
   mSize.setWidth( contentsSize.width() / mHtmlUnitsToMM );
   mSize.setHeight( contentsSize.height() / mHtmlUnitsToMM );
   recalculateFrameSizes();
+  emit changed();
 }
 
 void QgsComposerHtml::frameLoaded( bool ok )
@@ -111,6 +112,7 @@ void QgsComposerHtml::addFrame( QgsComposerFrame* frame )
   if ( mComposition )
   {
     mComposition->addComposerHtmlFrame( this, frame );
+    mComposition->pushAddRemoveCommand( frame, tr( "HTML frame added" ) );
   }
 }
 

diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -35,6 +35,7 @@ void QgsComposerMultiFrame::setResizeMode( ResizeMode mode )
   {
     mResizeMode = mode;
     recalculateFrameSizes();
+    emit changed();
   }
 }
 

diff --git a/src/core/composer/qgscomposermultiframe.h b/src/core/composer/qgscomposermultiframe.h
@@ -70,6 +70,9 @@ class QgsComposerMultiFrame: public QObject
 
   private:
     QgsComposerMultiFrame(); //forbidden
+
+  signals:
+    void changed();
 };
 
 #endif // QGSCOMPOSERMULTIFRAME_H
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -324,12 +324,10 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
       {
         QgsComposerHtml* composerHtml = new QgsComposerHtml( composition(), mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(),
             mRubberBandItem->rect().width(), mRubberBandItem->rect().height() );
-        //composition()->addComposerHtml( composerHtml );
         scene()->removeItem( mRubberBandItem );
         delete mRubberBandItem;
         mRubberBandItem = 0;
         emit actionFinished();
-        //composition()->pushAddRemoveCommand...
       }
     default:
       break;