[QGIS Commit] r11820 - in trunk/qgis/src: app/composer core/composer ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Oct 17 14:12:44 EDT 2009


Author: mhugent
Date: 2009-10-17 14:12:38 -0400 (Sat, 17 Oct 2009)
New Revision: 11820

Modified:
   trunk/qgis/src/app/composer/qgscomposermapwidget.cpp
   trunk/qgis/src/app/composer/qgscomposermapwidget.h
   trunk/qgis/src/core/composer/qgscomposermap.cpp
   trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
Log:
Fix for first part of bug #2008

Modified: trunk/qgis/src/app/composer/qgscomposermapwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposermapwidget.cpp	2009-10-16 23:56:30 UTC (rev 11819)
+++ trunk/qgis/src/app/composer/qgscomposermapwidget.cpp	2009-10-17 18:12:38 UTC (rev 11820)
@@ -474,46 +474,46 @@
   mComposerMap->update();
 }
 
-void QgsComposerMapWidget::on_mIntervalXSpinBox_valueChanged( double d )
+void QgsComposerMapWidget::on_mIntervalXSpinBox_editingFinished()
 {
   if ( !mComposerMap )
   {
     return;
   }
-  mComposerMap->setGridIntervalX( d );
+  mComposerMap->setGridIntervalX( mIntervalXSpinBox->value() );
   mComposerMap->updateBoundingRect();
   mComposerMap->update();
 }
 
-void QgsComposerMapWidget::on_mIntervalYSpinBox_valueChanged( double d )
+void QgsComposerMapWidget::on_mIntervalYSpinBox_editingFinished()
 {
   if ( !mComposerMap )
   {
     return;
   }
-  mComposerMap->setGridIntervalY( d );
+  mComposerMap->setGridIntervalY( mIntervalYSpinBox->value() );
   mComposerMap->updateBoundingRect();
   mComposerMap->update();
 }
 
-void QgsComposerMapWidget::on_mOffsetXSpinBox_valueChanged( double d )
+void QgsComposerMapWidget::on_mOffsetXSpinBox_editingFinished()
 {
   if ( !mComposerMap )
   {
     return;
   }
-  mComposerMap->setGridOffsetX( d );
+  mComposerMap->setGridOffsetX( mOffsetXSpinBox->value() );
   mComposerMap->updateBoundingRect();
   mComposerMap->update();
 }
 
-void QgsComposerMapWidget::on_mOffsetYSpinBox_valueChanged( double d )
+void QgsComposerMapWidget::on_mOffsetYSpinBox_editingFinished()
 {
   if ( !mComposerMap )
   {
     return;
   }
-  mComposerMap->setGridOffsetY( d );
+  mComposerMap->setGridOffsetY( mOffsetYSpinBox->value() );
   mComposerMap->updateBoundingRect();
   mComposerMap->update();
 }

Modified: trunk/qgis/src/app/composer/qgscomposermapwidget.h
===================================================================
--- trunk/qgis/src/app/composer/qgscomposermapwidget.h	2009-10-16 23:56:30 UTC (rev 11819)
+++ trunk/qgis/src/app/composer/qgscomposermapwidget.h	2009-10-17 18:12:38 UTC (rev 11820)
@@ -49,10 +49,10 @@
     void on_mYMaxLineEdit_editingFinished();
 
     void on_mGridCheckBox_stateChanged( int state );
-    void on_mIntervalXSpinBox_valueChanged( double d );
-    void on_mIntervalYSpinBox_valueChanged( double d );
-    void on_mOffsetXSpinBox_valueChanged( double d );
-    void on_mOffsetYSpinBox_valueChanged( double d );
+    void on_mIntervalXSpinBox_editingFinished();
+    void on_mIntervalYSpinBox_editingFinished();
+    void on_mOffsetXSpinBox_editingFinished();
+    void on_mOffsetYSpinBox_editingFinished();
     void on_mLineWidthSpinBox_valueChanged( double d );
     void on_mLineColorButton_clicked();
     void on_mGridTypeComboBox_currentIndexChanged( const QString& text );

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-10-16 23:56:30 UTC (rev 11819)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-10-17 18:12:38 UTC (rev 11820)
@@ -568,7 +568,7 @@
   annotationElem.setAttribute( "frameDistance", mAnnotationFrameDistance );
   annotationElem.setAttribute( "direction", mGridAnnotationDirection );
   annotationElem.setAttribute( "font", mGridAnnotationFont.toString() );
-  annotationElem.setAttribute( "type", mGridAnnotationType);
+  annotationElem.setAttribute( "type", mGridAnnotationType );
 
   gridElem.appendChild( annotationElem );
   composerMapElem.appendChild( gridElem );
@@ -1051,7 +1051,7 @@
 
 double QgsComposerMap::maxExtensionXDirection() const
 {
-  if ( mGridAnnotationPosition != OutsideMapFrame )
+  if ( !mGridEnabled || !mShowGridAnnotation || mGridAnnotationPosition != OutsideMapFrame )
   {
     return 0;
   }
@@ -1090,7 +1090,7 @@
 
 double QgsComposerMap::maxExtensionYDirection() const
 {
-  if ( mGridAnnotationPosition != OutsideMapFrame )
+  if ( !mGridEnabled || !mShowGridAnnotation || mGridAnnotationPosition != OutsideMapFrame )
   {
     return 0;
   }

Modified: trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposermapwidgetbase.ui	2009-10-16 23:56:30 UTC (rev 11819)
+++ trunk/qgis/src/ui/qgscomposermapwidgetbase.ui	2009-10-17 18:12:38 UTC (rev 11820)
@@ -1,87 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <class>QgsComposerMapWidgetBase</class>
- <widget class="QWidget" name="QgsComposerMapWidgetBase">
-  <property name="geometry">
+ <widget class="QWidget" name="QgsComposerMapWidgetBase" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>472</width>
+    <width>506</width>
     <height>708</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string>Map options</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="mMapGroupBox">
-     <property name="title">
+  <layout class="QGridLayout" name="gridLayout_3" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="mMapGroupBox" >
+     <property name="title" >
       <string>Map</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="textLabel1">
-        <property name="text">
+     <layout class="QGridLayout" name="gridLayout_2" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="textLabel1" >
+        <property name="text" >
          <string>Width</string>
         </property>
-        <property name="wordWrap">
+        <property name="wordWrap" >
          <bool>true</bool>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>mWidthLineEdit</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="mWidthLineEdit"/>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="mWidthLineEdit" />
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
          <string>Height</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="mHeightLineEdit"/>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="mHeightLineEdit" />
       </item>
-      <item row="2" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout">
+      <item row="2" column="0" >
+       <layout class="QHBoxLayout" name="horizontalLayout" >
         <item>
-         <widget class="QLabel" name="label_2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <widget class="QLabel" name="label_2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text">
+          <property name="text" >
            <string>Scale</string>
           </property>
-          <property name="wordWrap">
+          <property name="wordWrap" >
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="label">
-          <property name="text">
+         <widget class="QLabel" name="label" >
+          <property name="text" >
            <string>1:</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="mScaleLineEdit">
-        <property name="inputMask">
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="mScaleLineEdit" >
+        <property name="inputMask" >
          <string/>
         </property>
        </widget>
@@ -89,65 +88,65 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="mMapExtentGroupBox">
-     <property name="title">
+   <item row="1" column="0" >
+    <widget class="QGroupBox" name="mMapExtentGroupBox" >
+     <property name="title" >
       <string>Map extent</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout" >
       <item>
-       <layout class="QGridLayout" name="gridLayout_4">
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="mXMinLineEdit"/>
+       <layout class="QGridLayout" name="gridLayout_4" >
+        <item row="0" column="1" >
+         <widget class="QLineEdit" name="mXMinLineEdit" />
         </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="mXMinLabel">
-          <property name="enabled">
+        <item row="0" column="0" >
+         <widget class="QLabel" name="mXMinLabel" >
+          <property name="enabled" >
            <bool>true</bool>
           </property>
-          <property name="text">
+          <property name="text" >
            <string>X min</string>
           </property>
-          <property name="buddy">
+          <property name="buddy" >
            <cstring>mXMinLineEdit</cstring>
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="mYMinLineEdit"/>
+        <item row="1" column="1" >
+         <widget class="QLineEdit" name="mYMinLineEdit" />
         </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="mYMinLabel">
-          <property name="text">
+        <item row="1" column="0" >
+         <widget class="QLabel" name="mYMinLabel" >
+          <property name="text" >
            <string>Y min</string>
           </property>
-          <property name="buddy">
+          <property name="buddy" >
            <cstring>mYMinLineEdit</cstring>
           </property>
          </widget>
         </item>
-        <item row="0" column="3">
-         <widget class="QLineEdit" name="mXMaxLineEdit"/>
+        <item row="0" column="3" >
+         <widget class="QLineEdit" name="mXMaxLineEdit" />
         </item>
-        <item row="1" column="3">
-         <widget class="QLineEdit" name="mYMaxLineEdit"/>
+        <item row="1" column="3" >
+         <widget class="QLineEdit" name="mYMaxLineEdit" />
         </item>
-        <item row="0" column="2">
-         <widget class="QLabel" name="mXMaxLabel">
-          <property name="text">
+        <item row="0" column="2" >
+         <widget class="QLabel" name="mXMaxLabel" >
+          <property name="text" >
            <string>X max</string>
           </property>
-          <property name="buddy">
+          <property name="buddy" >
            <cstring>mXMaxLineEdit</cstring>
           </property>
          </widget>
         </item>
-        <item row="1" column="2">
-         <widget class="QLabel" name="mYMaxLabel">
-          <property name="text">
+        <item row="1" column="2" >
+         <widget class="QLabel" name="mYMaxLabel" >
+          <property name="text" >
            <string>Y max</string>
           </property>
-          <property name="buddy">
+          <property name="buddy" >
            <cstring>mYMaxLineEdit</cstring>
           </property>
          </widget>
@@ -155,13 +154,13 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <layout class="QHBoxLayout" name="horizontalLayout_5" >
         <item>
          <spacer>
-          <property name="orientation">
+          <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0">
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>311</width>
             <height>20</height>
@@ -170,14 +169,14 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="mSetToMapCanvasExtentButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <widget class="QPushButton" name="mSetToMapCanvasExtentButton" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text">
+          <property name="text" >
            <string>Set to map canvas extent</string>
           </property>
          </widget>
@@ -187,25 +186,25 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <item row="2" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2" >
      <item>
-      <widget class="QLabel" name="mPreviewModeLabel">
-       <property name="text">
+      <widget class="QLabel" name="mPreviewModeLabel" >
+       <property name="text" >
         <string>Preview</string>
        </property>
-       <property name="wordWrap">
+       <property name="wordWrap" >
         <bool>true</bool>
        </property>
-       <property name="buddy">
+       <property name="buddy" >
         <cstring>mPreviewModeComboBox</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="mPreviewModeComboBox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+      <widget class="QComboBox" name="mPreviewModeComboBox" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -213,197 +212,197 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="mUpdatePreviewButton">
-       <property name="text">
+      <widget class="QPushButton" name="mUpdatePreviewButton" >
+       <property name="text" >
         <string>Update preview</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
-    <widget class="QCheckBox" name="mKeepLayerListCheckBox">
-     <property name="text">
+   <item row="3" column="0" >
+    <widget class="QCheckBox" name="mKeepLayerListCheckBox" >
+     <property name="text" >
       <string>Keep layer list</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QCheckBox" name="mShowGridDialogCheckBox">
-     <property name="text">
+   <item row="4" column="0" >
+    <widget class="QCheckBox" name="mShowGridDialogCheckBox" >
+     <property name="text" >
       <string>Show composer grid widget</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QDockWidget" name="mGridDockWidget">
-     <property name="floating">
+   <item row="5" column="0" >
+    <widget class="QDockWidget" name="mGridDockWidget" >
+     <property name="floating" >
       <bool>true</bool>
      </property>
-     <property name="features">
+     <property name="features" >
       <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
      </property>
-     <property name="windowTitle">
+     <property name="windowTitle" >
       <string>Grid</string>
      </property>
-     <widget class="QWidget" name="dockWidgetContents">
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="mGridCheckBox">
-         <property name="text">
+     <widget class="QWidget" name="dockWidgetContents" >
+      <layout class="QGridLayout" name="gridLayout" >
+       <item row="0" column="0" >
+        <widget class="QCheckBox" name="mGridCheckBox" >
+         <property name="text" >
           <string>Show grid</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="mGridTypeLabel">
-         <property name="text">
+       <item row="1" column="0" >
+        <widget class="QLabel" name="mGridTypeLabel" >
+         <property name="text" >
           <string>Grid type:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QComboBox" name="mGridTypeComboBox"/>
+       <item row="1" column="1" colspan="2" >
+        <widget class="QComboBox" name="mGridTypeComboBox" />
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="mIntervalXLabel">
-         <property name="text">
+       <item row="2" column="0" >
+        <widget class="QLabel" name="mIntervalXLabel" >
+         <property name="text" >
           <string>Interval X:</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" colspan="2">
-        <widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
-         <property name="maximum">
-          <double>999999.000000000000000</double>
+       <item row="2" column="1" colspan="2" >
+        <widget class="QDoubleSpinBox" name="mIntervalXSpinBox" >
+         <property name="maximum" >
+          <double>99999999.000000000000000</double>
          </property>
         </widget>
        </item>
-       <item row="2" column="3">
-        <widget class="QLabel" name="mIntervalYLabel">
-         <property name="text">
+       <item row="2" column="3" >
+        <widget class="QLabel" name="mIntervalYLabel" >
+         <property name="text" >
           <string>Interval Y:</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="4">
-        <widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
-         <property name="maximum">
-          <double>9999999.000000000000000</double>
+       <item row="2" column="4" >
+        <widget class="QDoubleSpinBox" name="mIntervalYSpinBox" >
+         <property name="maximum" >
+          <double>99999999.000000000000000</double>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="mOffsetXLabel">
-         <property name="text">
+       <item row="3" column="0" >
+        <widget class="QLabel" name="mOffsetXLabel" >
+         <property name="text" >
           <string>Offset X:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
-        <widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
-         <property name="maximum">
+       <item row="3" column="1" colspan="2" >
+        <widget class="QDoubleSpinBox" name="mOffsetXSpinBox" >
+         <property name="maximum" >
           <double>9999999.000000000000000</double>
          </property>
         </widget>
        </item>
-       <item row="3" column="3">
-        <widget class="QLabel" name="mOffsetYLabel">
-         <property name="text">
+       <item row="3" column="3" >
+        <widget class="QLabel" name="mOffsetYLabel" >
+         <property name="text" >
           <string>Offset Y:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="4">
-        <widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
-         <property name="maximum">
+       <item row="3" column="4" >
+        <widget class="QDoubleSpinBox" name="mOffsetYSpinBox" >
+         <property name="maximum" >
           <double>9999999.000000000000000</double>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="mLineWidthLabel">
-         <property name="text">
+       <item row="4" column="0" >
+        <widget class="QLabel" name="mLineWidthLabel" >
+         <property name="text" >
           <string>Line width:</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1" colspan="2">
-        <widget class="QDoubleSpinBox" name="mLineWidthSpinBox"/>
+       <item row="4" column="1" colspan="2" >
+        <widget class="QDoubleSpinBox" name="mLineWidthSpinBox" />
        </item>
-       <item row="4" column="3">
-        <widget class="QLabel" name="mLineColorLabel">
-         <property name="text">
+       <item row="4" column="3" >
+        <widget class="QLabel" name="mLineColorLabel" >
+         <property name="text" >
           <string>Line color:</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="4">
-        <widget class="QgsColorButton" name="mLineColorButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <item row="4" column="4" >
+        <widget class="QgsColorButton" name="mLineColorButton" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="text">
+         <property name="text" >
           <string/>
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="2">
-        <widget class="QCheckBox" name="mDrawAnnotationCheckBox">
-         <property name="text">
+       <item row="5" column="0" colspan="2" >
+        <widget class="QCheckBox" name="mDrawAnnotationCheckBox" >
+         <property name="text" >
           <string>Draw annotation</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2">
-        <widget class="QLabel" name="mAnnotationPositionLabel">
-         <property name="text">
+       <item row="6" column="0" colspan="2" >
+        <widget class="QLabel" name="mAnnotationPositionLabel" >
+         <property name="text" >
           <string>Annotation position:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="2">
-        <widget class="QComboBox" name="mAnnotationPositionComboBox"/>
+       <item row="6" column="2" >
+        <widget class="QComboBox" name="mAnnotationPositionComboBox" />
        </item>
-       <item row="6" column="3">
-        <widget class="QLabel" name="mAnnotationDirectionLabel">
-         <property name="frameShape">
+       <item row="6" column="3" >
+        <widget class="QLabel" name="mAnnotationDirectionLabel" >
+         <property name="frameShape" >
           <enum>QFrame::NoFrame</enum>
          </property>
-         <property name="text">
+         <property name="text" >
           <string>Annotation direction:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="4">
-        <widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
+       <item row="6" column="4" >
+        <widget class="QComboBox" name="mAnnotationDirectionComboBox" />
        </item>
-       <item row="7" column="0" colspan="2">
-        <widget class="QLabel" name="mDistanceToFrameLabel">
-         <property name="text">
+       <item row="7" column="0" colspan="2" >
+        <widget class="QLabel" name="mDistanceToFrameLabel" >
+         <property name="text" >
           <string>Distance to map frame:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="2">
-        <widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
+       <item row="7" column="2" >
+        <widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox" />
        </item>
-       <item row="7" column="3">
-        <widget class="QLabel" name="mAnnotationTypeLabel">
-         <property name="text">
+       <item row="7" column="3" >
+        <widget class="QLabel" name="mAnnotationTypeLabel" >
+         <property name="text" >
           <string>Annotation type:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="4">
-        <widget class="QComboBox" name="mAnnotationTypeComboBox"/>
+       <item row="7" column="4" >
+        <widget class="QComboBox" name="mAnnotationTypeComboBox" />
        </item>
-       <item row="8" column="0">
-        <widget class="QPushButton" name="mAnnotationFontButton">
-         <property name="text">
+       <item row="8" column="0" >
+        <widget class="QPushButton" name="mAnnotationFontButton" >
+         <property name="text" >
           <string>Font...</string>
          </property>
         </widget>
@@ -412,12 +411,12 @@
      </widget>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="6" column="0" >
     <spacer>
-     <property name="orientation">
+     <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>458</width>
        <height>31</height>
@@ -427,7 +426,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
+ <layoutdefault spacing="6" margin="11" />
  <customwidgets>
   <customwidget>
    <class>QgsColorButton</class>



More information about the QGIS-commit mailing list