[QGIS Commit] r9085 - in branches/advanced_printing_branch/src: app/composer ui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-08-20 05:39:06 -0400 (Wed, 20 Aug 2008)
New Revision: 9085

Modified:
   branches/advanced_printing_branch/src/app/composer/qgscomposerpicture.cpp
   branches/advanced_printing_branch/src/app/composer/qgscomposerpicturewidget.cpp
   branches/advanced_printing_branch/src/ui/qgscomposerpicturewidgetbase.ui
Log:
Changed composer picture widget to embed composer item widget

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerpicture.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerpicture.cpp	2008-08-20 09:10:41 UTC (rev 9084)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerpicture.cpp	2008-08-20 09:39:06 UTC (rev 9085)
@@ -63,6 +63,7 @@
 
   painter->save();
   painter->rotate(mRotation);
+  drawBackground(painter); 
 
   if(mMode != UNKNOWN)
     {

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerpicturewidget.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerpicturewidget.cpp	2008-08-20 09:10:41 UTC (rev 9084)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerpicturewidget.cpp	2008-08-20 09:39:06 UTC (rev 9085)
@@ -17,6 +17,7 @@
 
 #include "qgscomposerpicturewidget.h"
 #include "qgscomposerpicture.h"
+#include "qgscomposeritemwidget.h"
 #include <QDoubleValidator>
 #include <QFileDialog>
 #include <QFileInfo>
@@ -26,6 +27,10 @@
 {
   setupUi(this);
 
+  //add widget for general composer item properties
+  QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget(this, picture);
+  gridLayout->addWidget(itemPropertiesWidget, 4, 0, 1, 1);
+
   mWidthLineEdit->setValidator(new QDoubleValidator(this));
   mHeightLineEdit->setValidator(new QDoubleValidator(this));
 
@@ -146,7 +151,6 @@
       mWidthLineEdit->blockSignals(true);
       mHeightLineEdit->blockSignals(true);
       mRotationSpinBox->blockSignals(true);
-      mFrameCheckBox->blockSignals(true);
       mPictureLineEdit->blockSignals(true);
   
       mPictureLineEdit->setText(mPicture->pictureFile());
@@ -154,19 +158,10 @@
       mWidthLineEdit->setText(QString::number(pictureRect.width()));
       mHeightLineEdit->setText(QString::number(pictureRect.height()));
       mRotationSpinBox->setValue(mPicture->rotation());
-      if(mPicture->frame())
-	{
-	  mFrameCheckBox->setCheckState(Qt::Checked);
-	}
-      else
-	{
-	  mFrameCheckBox->setCheckState(Qt::Unchecked);
-	}
       
       mWidthLineEdit->blockSignals(false);
       mHeightLineEdit->blockSignals(false);
       mRotationSpinBox->blockSignals(false);
-      mFrameCheckBox->blockSignals(false);
       mPictureLineEdit->blockSignals(false);
     }
 }

Modified: branches/advanced_printing_branch/src/ui/qgscomposerpicturewidgetbase.ui
===================================================================
--- branches/advanced_printing_branch/src/ui/qgscomposerpicturewidgetbase.ui	2008-08-20 09:10:41 UTC (rev 9084)
+++ branches/advanced_printing_branch/src/ui/qgscomposerpicturewidgetbase.ui	2008-08-20 09:39:06 UTC (rev 9085)
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>274</width>
-    <height>419</height>
+    <height>183</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -122,24 +122,14 @@
     </layout>
    </item>
    <item row="2" column="0" >
-    <widget class="QCheckBox" name="mFrameCheckBox" >
-     <property name="text" >
-      <string>Frame</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
      <property name="sizeHint" >
       <size>
-       <width>22</width>
-       <height>73</height>
+       <width>20</width>
+       <height>21</height>
       </size>
      </property>
     </spacer>
@@ -150,7 +140,6 @@
  <tabstops>
   <tabstop>mPictureBrowseButton</tabstop>
   <tabstop>mPictureLineEdit</tabstop>
-  <tabstop>mFrameCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>