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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-08-20 06:02:19 -0400 (Wed, 20 Aug 2008)
New Revision: 9087

Modified:
   branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp
   branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp
   branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h
   branches/advanced_printing_branch/src/ui/qgscomposermapwidgetbase.ui
Log:
Changed composer map widget to embed composer item widget

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp	2008-08-20 09:52:32 UTC (rev 9086)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermap.cpp	2008-08-20 10:02:19 UTC (rev 9087)
@@ -166,7 +166,7 @@
       return;
     }
 
-  if(!mComposition)
+  if(!mComposition || !painter)
     {
       return;
     }
@@ -177,6 +177,9 @@
   painter->save();
   painter->setClipRect (thisPaintRect);
 
+  drawBackground(painter);
+
+
   double currentScaleFactorX = horizontalViewScaleFactor();
     
   if ( mComposition->plotStyle() == QgsComposition::Preview && mPreviewMode != Rectangle) 

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp	2008-08-20 09:52:32 UTC (rev 9086)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.cpp	2008-08-20 10:02:19 UTC (rev 9087)
@@ -16,12 +16,18 @@
  ***************************************************************************/
 
 #include "qgscomposermapwidget.h"
+#include "qgscomposeritemwidget.h"
 #include "qgscomposermap.h"
 #include "qgsmapcanvas.h"
 
 QgsComposerMapWidget::QgsComposerMapWidget(QgsComposerMap* composerMap): QWidget(), mComposerMap(composerMap)
 {
   setupUi(this);
+
+  //add widget for general composer item properties
+  QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget(this, composerMap);
+  gridLayout->addWidget(itemPropertiesWidget, 9, 0, 1, 4);
+
   mWidthLineEdit->setValidator(new QDoubleValidator(0));
   mHeightLineEdit->setValidator(new QDoubleValidator(0));
   mScaleLineEdit->setValidator(new QDoubleValidator(0));
@@ -36,8 +42,6 @@
   //mPreviewModeComboBox->insertItem(1, tr("Render"));
   mPreviewModeComboBox->insertItem(2, tr("Rectangle"));
 
-  mFrameCheckBox->setCheckState(Qt::Checked);
-
   if(composerMap)
     {
       connect(composerMap, SIGNAL(extentChanged()), this, SLOT(updateSettingsNoSignals()));
@@ -115,32 +119,6 @@
   mComposerMap->update();
 }
 
-void QgsComposerMapWidget::on_mFrameCheckBox_stateChanged(int state)
-{
-  if(!mComposerMap)
-    {
-      return;
-    }
-
-  if(state == Qt::Checked)
-    {
-      if(mComposerMap->frame())
-	{
-	  return;
-	}
-      mComposerMap->setFrame(true);
-    }
-  else
-    {
-      if(!mComposerMap->frame())
-	{
-	  return;
-	}
-      mComposerMap->setFrame(false);
-    }
-  mComposerMap->update();
-}
-
 void QgsComposerMapWidget::on_mScaleLineEdit_editingFinished()
 {
   if(!mComposerMap)

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h	2008-08-20 09:52:32 UTC (rev 9086)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposermapwidget.h	2008-08-20 10:02:19 UTC (rev 9087)
@@ -38,7 +38,6 @@
   void on_mWidthLineEdit_editingFinished();
   void on_mHeightLineEdit_editingFinished();
   void on_mPreviewModeComboBox_activated(int i);
-  void on_mFrameCheckBox_stateChanged(int state);
   void on_mScaleLineEdit_editingFinished();
   void on_mSetToMapCanvasExtentButton_clicked();
   void on_mUpdatePreviewButton_clicked();

Modified: branches/advanced_printing_branch/src/ui/qgscomposermapwidgetbase.ui
===================================================================
--- branches/advanced_printing_branch/src/ui/qgscomposermapwidgetbase.ui	2008-08-20 09:52:32 UTC (rev 9086)
+++ branches/advanced_printing_branch/src/ui/qgscomposermapwidgetbase.ui	2008-08-20 10:02:19 UTC (rev 9087)
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>546</width>
-    <height>488</height>
+    <height>374</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -191,14 +191,7 @@
      </layout>
     </widget>
    </item>
-   <item row="6" column="0" colspan="4" >
-    <widget class="QCheckBox" name="mFrameCheckBox" >
-     <property name="text" >
-      <string>Frame</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2" >
+   <item row="6" column="0" colspan="2" >
     <widget class="QLabel" name="mPreviewModeLabel" >
      <property name="text" >
       <string>Preview</string>
@@ -211,7 +204,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="2" >
+   <item row="6" column="2" >
     <widget class="QComboBox" name="mPreviewModeComboBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -221,22 +214,22 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="3" >
+   <item row="6" column="3" >
     <widget class="QPushButton" name="mUpdatePreviewButton" >
      <property name="text" >
       <string>Update preview</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="2" colspan="2" >
+   <item row="7" column="2" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>438</width>
-       <height>61</height>
+       <width>458</width>
+       <height>31</height>
       </size>
      </property>
     </spacer>
@@ -247,7 +240,6 @@
  <tabstops>
   <tabstop>mWidthLineEdit</tabstop>
   <tabstop>mHeightLineEdit</tabstop>
-  <tabstop>mFrameCheckBox</tabstop>
   <tabstop>mPreviewModeComboBox</tabstop>
  </tabstops>
  <resources/>