[QGIS Commit] r11825 - in trunk/qgis: python/core src/app src/core src/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Wed Oct 21 10:59:45 EDT 2009


Author: timlinux
Date: 2009-10-21 10:59:44 -0400 (Wed, 21 Oct 2009)
New Revision: 11825

Modified:
   trunk/qgis/python/core/qgspoint.sip
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgsprojectproperties.cpp
   trunk/qgis/src/core/qgis.h
   trunk/qgis/src/core/qgspoint.cpp
   trunk/qgis/src/core/qgspoint.h
   trunk/qgis/src/core/qgsscalecalculator.cpp
   trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
Log:
[FEATURE] Added option to display position as Degrees,Minutes,Seconds in the status bar

Modified: trunk/qgis/python/core/qgspoint.sip
===================================================================
--- trunk/qgis/python/core/qgspoint.sip	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/python/core/qgspoint.sip	2009-10-21 14:59:44 UTC (rev 11825)
@@ -52,6 +52,14 @@
 
   //! As above but with precision for string representaiton of a point
   QString toString(int thePrecision) const;
+    
+  /** Return a string representation as degrees minutes seconds.
+   *  Its up to the calling function to ensure that this point can
+   *  be meaningfully represented in this form.
+   *  @note added in QGIS 1.4
+   */
+  QString toDegreesMinutesSeconds( int thePrecision ) const;
+
   
   /*! Return the well known text representation for the point.
    * The wkt is created without an SRID.

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-10-21 14:59:44 UTC (rev 11825)
@@ -4593,7 +4593,14 @@
   }
   else
   {
-    mCoordsEdit->setText( p.toString( mMousePrecisionDecimalPlaces ) );
+    if ( mMapCanvas->mapUnits() == QGis::DegreesMinutesSeconds )
+    {
+      mCoordsEdit->setText( p.toDegreesMinutesSeconds( mMousePrecisionDecimalPlaces ) );
+    }
+    else
+    {
+      mCoordsEdit->setText( p.toString( mMousePrecisionDecimalPlaces ) );
+    }
     if ( mCoordsEdit->width() > mCoordsEdit->minimumWidth() )
     {
       mCoordsEdit->setMinimumWidth( mCoordsEdit->width() );

Modified: trunk/qgis/src/app/qgsprojectproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsprojectproperties.cpp	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/src/app/qgsprojectproperties.cpp	2009-10-21 14:59:44 UTC (rev 11825)
@@ -289,6 +289,10 @@
   {
     radFeet->setChecked( true );
   }
+  else if ( unit == QGis::DegreesMinutesSeconds )
+  {
+    radDMS->setChecked( true );
+  }
   else
   {
     radDecimalDegrees->setChecked( true );
@@ -326,6 +330,10 @@
   {
     mapUnit = QGis::Feet;
   }
+  else if ( radDMS->isChecked() )
+  {
+    mapUnit = QGis::DegreesMinutesSeconds;
+  }
   else
   {
     mapUnit = QGis::Degrees;

Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/src/core/qgis.h	2009-10-21 14:59:44 UTC (rev 11825)
@@ -74,13 +74,18 @@
     //! description strings for feature types
     static const char *qgisFeatureTypes[];
 
-    //! map units that qgis supports
+    /** Map units that qgis supports
+     * @note that QGIS < 1.4 api had only Meters, Feet, Degrees and UnknownUnit
+     */
     enum UnitType
     {
-      Meters,
-      Feet,
-      Degrees,
-      UnknownUnit
+      Meters = 0,
+      Feet = 1,
+      Degrees = 2, //for 1.0 api backwards compatibility
+      DecimalDegrees = 2,
+      DegreesMinutesSeconds = 4,
+      DegreesDecimalMinutes = 5,
+      UnknownUnit = 3
     } ;
 
     //! User defined event types

Modified: trunk/qgis/src/core/qgspoint.cpp
===================================================================
--- trunk/qgis/src/core/qgspoint.cpp	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/src/core/qgspoint.cpp	2009-10-21 14:59:44 UTC (rev 11825)
@@ -20,6 +20,7 @@
 #include "qgspoint.h"
 #include <cmath>
 #include <QTextStream>
+#include <QObject> // for tr()
 
 
 QgsPoint::QgsPoint( const QgsPoint& p )
@@ -44,7 +45,32 @@
   return rep;
 }
 
+QString QgsPoint::toDegreesMinutesSeconds( int thePrecision ) const
+{
+  int myDegreesX = int( std::abs( m_x ) );
+  float myFloatMinutesX = float( ( std::abs( m_x ) - myDegreesX ) * 60 );
+  int myIntMinutesX = int( myFloatMinutesX );
+  float mySecondsX = float ( myFloatMinutesX - myIntMinutesX ) * 60;
 
+  int myDegreesY = int( std::abs( m_y ) );
+  float myFloatMinutesY = float( ( std::abs( m_y ) - myDegreesY ) * 60 );
+  int myIntMinutesY = int( myFloatMinutesY );
+  float mySecondsY = float ( myFloatMinutesY - myIntMinutesY ) * 60;
+
+  QString myXHemisphere = m_x < 0 ? QObject::tr("W") : QObject::tr("E");
+  QString myYHemisphere = m_y < 0 ? QObject::tr("S") : QObject::tr("N");
+  QString rep = QString::number( myDegreesX ) + QChar(176) + 
+                QString::number( myIntMinutesX ) + QString("'") +
+                QString::number( mySecondsX, 'f', thePrecision ) + QString( "\"" ) + 
+                myXHemisphere + QString( "," ) +
+                QString::number( myDegreesY ) + QChar(176) + 
+                QString::number( myIntMinutesY ) + QString("'") +
+                QString::number( mySecondsY, 'f', thePrecision ) + QString( "\"" ) +
+                myYHemisphere;
+  return rep;
+}
+
+
 QString QgsPoint::wellKnownText() const
 {
   return QString( "POINT(%1 %2)" ).arg( QString::number( m_x, 'f', 18 ) ).arg( QString::number( m_y, 'f', 18 ) );

Modified: trunk/qgis/src/core/qgspoint.h
===================================================================
--- trunk/qgis/src/core/qgspoint.h	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/src/core/qgspoint.h	2009-10-21 14:59:44 UTC (rev 11825)
@@ -93,6 +93,14 @@
     //! As above but with precision for string representaiton of a point
     QString toString( int thePrecision ) const;
 
+    /** Return a string representation as degrees minutes seconds.
+     *  Its up to the calling function to ensure that this point can
+     *  be meaningfully represented in this form.
+     *  @note added in QGIS 1.4
+     */
+    QString toDegreesMinutesSeconds( int thePrecision ) const;
+
+
     /*! Return the well known text representation for the point.
      * The wkt is created without an SRID.
      * @return Well known text in the form POINT(x y)

Modified: trunk/qgis/src/core/qgsscalecalculator.cpp
===================================================================
--- trunk/qgis/src/core/qgsscalecalculator.cpp	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/src/core/qgsscalecalculator.cpp	2009-10-21 14:59:44 UTC (rev 11825)
@@ -68,11 +68,21 @@
       conversionFactor = 12.0;
       delta = mapExtent.xMaximum() - mapExtent.xMinimum();
       break;
-    case QGis::Degrees:
+    case QGis::DecimalDegrees:
       // degrees require conversion to meters first
       conversionFactor = 39.3700787;
       delta = calculateGeographicDistance( mapExtent );
       break;
+    case QGis::DegreesMinutesSeconds:
+      // degrees require conversion to meters first
+      conversionFactor = 39.3700787;
+      delta = calculateGeographicDistance( mapExtent );
+      break;
+    case QGis::DegreesDecimalMinutes:
+      // degrees require conversion to meters first
+      conversionFactor = 39.3700787;
+      delta = calculateGeographicDistance( mapExtent );
+      break;
     default:
       assert( "bad map units" );
       break;

Modified: trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsprojectpropertiesbase.ui	2009-10-21 11:22:09 UTC (rev 11824)
+++ trunk/qgis/src/ui/qgsprojectpropertiesbase.ui	2009-10-21 14:59:44 UTC (rev 11825)
@@ -1,87 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <class>QgsProjectPropertiesBase</class>
- <widget class="QDialog" name="QgsProjectPropertiesBase">
-  <property name="geometry">
+ <widget class="QDialog" name="QgsProjectPropertiesBase" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>451</width>
-    <height>515</height>
+    <width>492</width>
+    <height>557</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string>Project Properties</string>
   </property>
-  <property name="sizeGripEnabled">
+  <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>
-  <property name="modal">
+  <property name="modal" >
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
+  <layout class="QGridLayout" >
+   <item row="2" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab1">
-      <attribute name="title">
+     <widget class="QWidget" name="tab1" >
+      <attribute name="title" >
        <string>General</string>
       </attribute>
-      <layout class="QGridLayout">
-       <item row="0" column="0">
-        <widget class="QGroupBox" name="titleBox">
-         <property name="title">
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QGroupBox" name="titleBox" >
+         <property name="title" >
           <string>General settings</string>
          </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_2" >
+            <property name="text" >
              <string>Project title</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="3">
-           <widget class="QLineEdit" name="titleEdit">
-            <property name="toolTip">
+          <item row="0" column="1" colspan="3" >
+           <widget class="QLineEdit" name="titleEdit" >
+            <property name="toolTip" >
              <string>Descriptive project name</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>Default project title</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="textLabel1">
-            <property name="text">
+          <item row="1" column="0" >
+           <widget class="QLabel" name="textLabel1" >
+            <property name="text" >
              <string>Selection color</string>
             </property>
-            <property name="buddy">
+            <property name="buddy" >
              <cstring>pbnSelectionColour</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
+          <item row="1" column="2" >
            <spacer>
-            <property name="orientation">
+            <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType">
+            <property name="sizeType" >
              <enum>QSizePolicy::Expanding</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+            <property name="sizeHint" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -89,35 +88,35 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="3">
-           <widget class="QgsColorButton" name="pbnSelectionColour">
-            <property name="minimumSize">
+          <item row="1" column="3" >
+           <widget class="QgsColorButton" name="pbnSelectionColour" >
+            <property name="minimumSize" >
              <size>
               <width>100</width>
               <height>0</height>
              </size>
             </property>
-            <property name="text">
+            <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QLabel" name="label">
-            <property name="text">
+          <item row="2" column="0" colspan="2" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
              <string>Background color</string>
             </property>
-            <property name="buddy">
+            <property name="buddy" >
              <cstring>pbnCanvasColor</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="2">
+          <item row="2" column="2" >
            <spacer>
-            <property name="orientation">
+            <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+            <property name="sizeHint" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -125,46 +124,46 @@
             </property>
            </spacer>
           </item>
-          <item row="2" column="3">
-           <widget class="QgsColorButton" name="pbnCanvasColor">
-            <property name="minimumSize">
+          <item row="2" column="3" >
+           <widget class="QgsColorButton" name="pbnCanvasColor" >
+            <property name="minimumSize" >
              <size>
               <width>100</width>
               <height>0</height>
              </size>
             </property>
-            <property name="text">
+            <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
-          <item row="3" column="3">
-           <widget class="QComboBox" name="cbxAbsolutePath">
+          <item row="3" column="3" >
+           <widget class="QComboBox" name="cbxAbsolutePath" >
             <item>
-             <property name="text">
+             <property name="text" >
               <string>absolute</string>
              </property>
             </item>
             <item>
-             <property name="text">
+             <property name="text" >
               <string>relative</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
              <string>Save paths</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="2">
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
+          <item row="3" column="2" >
+           <spacer>
+            <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+            <property name="sizeHint" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -175,96 +174,100 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="btnGrpMapUnits">
-         <property name="title">
+       <item row="1" column="0" >
+        <widget class="QGroupBox" name="btnGrpMapUnits" >
+         <property name="title" >
           <string>Layer units (only used when CRS transformation is disabled)</string>
          </property>
-         <layout class="QHBoxLayout">
-          <property name="margin">
-           <number>11</number>
-          </property>
-          <item>
-           <widget class="QRadioButton" name="radMeters">
-            <property name="text">
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="radMeters" >
+            <property name="text" >
              <string>Meters</string>
             </property>
-            <property name="checked">
+            <property name="checked" >
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QRadioButton" name="radFeet">
-            <property name="text">
+          <item row="0" column="1" >
+           <widget class="QRadioButton" name="radFeet" >
+            <property name="text" >
              <string>Feet</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QRadioButton" name="radDecimalDegrees">
-            <property name="text">
+          <item row="0" column="2" >
+           <widget class="QRadioButton" name="radDecimalDegrees" >
+            <property name="text" >
              <string>Decimal degrees</string>
             </property>
            </widget>
           </item>
+          <item row="0" column="3" >
+           <widget class="QRadioButton" name="radDMS" >
+            <property name="text" >
+             <string>Degrees, Minutes, Seconds</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="btnGrpPrecision">
-         <property name="title">
+       <item row="2" column="0" >
+        <widget class="QGroupBox" name="btnGrpPrecision" >
+         <property name="title" >
           <string>Precision</string>
          </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="QRadioButton" name="radAutomatic">
-            <property name="toolTip">
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="radAutomatic" >
+            <property name="toolTip" >
              <string>Automatically sets the number of decimal places in the mouse position display</string>
             </property>
-            <property name="whatsThis">
+            <property name="whatsThis" >
              <string>The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>Automatic</string>
             </property>
-            <property name="checked">
+            <property name="checked" >
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QRadioButton" name="radManual">
-            <property name="toolTip">
+          <item row="0" column="1" >
+           <widget class="QRadioButton" name="radManual" >
+            <property name="toolTip" >
              <string>Sets the number of decimal places to use for the mouse position display</string>
             </property>
-            <property name="whatsThis">
+            <property name="whatsThis" >
              <string>Sets the number of decimal places to use for the mouse position display</string>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>Manual</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QSpinBox" name="spinBoxDP">
-            <property name="toolTip">
+          <item row="0" column="2" >
+           <widget class="QSpinBox" name="spinBoxDP" >
+            <property name="toolTip" >
              <string>The number of decimal places for the manual option</string>
             </property>
-            <property name="whatsThis">
+            <property name="whatsThis" >
              <string>The number of decimal places for the manual option</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <widget class="QLabel" name="textLabel3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <item row="0" column="3" >
+           <widget class="QLabel" name="textLabel3" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
+            <property name="text" >
              <string>decimal places</string>
             </property>
            </widget>
@@ -272,35 +275,35 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QGroupBox" name="grpDigitizing">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <item row="3" column="0" >
+        <widget class="QGroupBox" name="grpDigitizing" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="title">
+         <property name="title" >
           <string>Digitizing</string>
          </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="mEnableTopologicalEditingCheckBox">
-            <property name="text">
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QCheckBox" name="mEnableTopologicalEditingCheckBox" >
+            <property name="text" >
              <string>Enable topological editing</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QCheckBox" name="mAvoidIntersectionsCheckBox">
-            <property name="text">
+          <item row="1" column="0" >
+           <widget class="QCheckBox" name="mAvoidIntersectionsCheckBox" >
+            <property name="text" >
              <string>Avoid intersections of new polygons</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="mSnappingOptionsPushButton">
-            <property name="text">
+          <item row="2" column="0" >
+           <widget class="QPushButton" name="mSnappingOptionsPushButton" >
+            <property name="text" >
              <string>Snapping options...</string>
             </property>
            </widget>
@@ -310,71 +313,59 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab2">
-      <attribute name="title">
+     <widget class="QWidget" name="tab2" >
+      <attribute name="title" >
        <string>Coordinate Reference System (CRS)</string>
       </attribute>
-      <layout class="QGridLayout">
-       <property name="leftMargin">
+      <layout class="QGridLayout" >
+       <property name="leftMargin" >
         <number>3</number>
        </property>
-       <property name="topMargin">
+       <property name="topMargin" >
         <number>11</number>
        </property>
-       <property name="rightMargin">
+       <property name="rightMargin" >
         <number>3</number>
        </property>
-       <property name="bottomMargin">
+       <property name="bottomMargin" >
         <number>11</number>
        </property>
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="cbxProjectionEnabled">
-         <property name="text">
+       <item row="0" column="0" >
+        <widget class="QCheckBox" name="cbxProjectionEnabled" >
+         <property name="text" >
           <string>Enable 'on the fly' CRS transformation</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QgsProjectionSelector" name="projectionSelector" native="true"/>
+       <item row="1" column="0" >
+        <widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab3">
-      <attribute name="title">
+     <widget class="QWidget" name="tab3" >
+      <attribute name="title" >
        <string>Identifiable layers</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" >
        <item>
-        <widget class="QTableWidget" name="twIdentifyLayers">
-         <property name="sortingEnabled">
+        <widget class="QTableWidget" name="twIdentifyLayers" >
+         <property name="sortingEnabled" >
           <bool>true</bool>
          </property>
-         <attribute name="horizontalHeaderVisible">
-          <bool>false</bool>
-         </attribute>
-         <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-          <bool>false</bool>
-         </attribute>
-         <attribute name="horizontalHeaderStretchLastSection">
-          <bool>true</bool>
-         </attribute>
          <column>
-          <property name="text">
+          <property name="text" >
            <string>Layer</string>
           </property>
          </column>
          <column>
-          <property name="text">
+          <property name="text" >
            <string>Type</string>
           </property>
          </column>
          <column>
-          <property name="text">
+          <property name="text" >
            <string>Identifiable</string>
           </property>
-          <property name="textAlignment">
-           <set>AlignHCenter|AlignVCenter|AlignCenter</set>
-          </property>
          </column>
         </widget>
        </item>
@@ -384,7 +375,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
+ <layoutdefault spacing="6" margin="11" />
  <customwidgets>
   <customwidget>
    <class>QgsColorButton</class>
@@ -402,18 +393,21 @@
   <tabstop>titleEdit</tabstop>
   <tabstop>pbnSelectionColour</tabstop>
   <tabstop>pbnCanvasColor</tabstop>
+  <tabstop>cbxAbsolutePath</tabstop>
   <tabstop>radMeters</tabstop>
   <tabstop>radFeet</tabstop>
   <tabstop>radDecimalDegrees</tabstop>
+  <tabstop>radDMS</tabstop>
   <tabstop>radAutomatic</tabstop>
   <tabstop>radManual</tabstop>
   <tabstop>spinBoxDP</tabstop>
   <tabstop>mEnableTopologicalEditingCheckBox</tabstop>
   <tabstop>mAvoidIntersectionsCheckBox</tabstop>
   <tabstop>mSnappingOptionsPushButton</tabstop>
+  <tabstop>buttonBox</tabstop>
   <tabstop>cbxProjectionEnabled</tabstop>
+  <tabstop>twIdentifyLayers</tabstop>
   <tabstop>tabWidget</tabstop>
-  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -423,11 +417,11 @@
    <receiver>spinBoxDP</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel">
+    <hint type="sourcelabel" >
      <x>229</x>
      <y>280</y>
     </hint>
-    <hint type="destinationlabel">
+    <hint type="destinationlabel" >
      <x>416</x>
      <y>286</y>
     </hint>
@@ -439,11 +433,11 @@
    <receiver>textLabel3</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel">
+    <hint type="sourcelabel" >
      <x>240</x>
      <y>281</y>
     </hint>
-    <hint type="destinationlabel">
+    <hint type="destinationlabel" >
      <x>583</x>
      <y>290</y>
     </hint>
@@ -455,11 +449,11 @@
    <receiver>spinBoxDP</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel">
+    <hint type="sourcelabel" >
      <x>100</x>
      <y>290</y>
     </hint>
-    <hint type="destinationlabel">
+    <hint type="destinationlabel" >
      <x>395</x>
      <y>285</y>
     </hint>
@@ -471,11 +465,11 @@
    <receiver>textLabel3</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel">
+    <hint type="sourcelabel" >
      <x>87</x>
      <y>284</y>
     </hint>
-    <hint type="destinationlabel">
+    <hint type="destinationlabel" >
      <x>589</x>
      <y>285</y>
     </hint>



More information about the QGIS-commit mailing list