[QGIS Commit] r12564 - trunk/qgis/src/plugins/evis/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Dec 21 10:21:09 EST 2009


Author: ersts
Date: 2009-12-21 10:21:09 -0500 (Mon, 21 Dec 2009)
New Revision: 12564

Modified:
   trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
Log:
-Fixed layout bug in the eVis event browser and tidied up the options tab, no strings added or deleted
-Closes ticket 2215

Modified: trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
===================================================================
--- trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui	2009-12-21 15:13:01 UTC (rev 12563)
+++ trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui	2009-12-21 15:21:09 UTC (rev 12564)
@@ -1,59 +1,52 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>eVisGenericEventBrowserGuiBase</class>
- <widget class="QDialog" name="eVisGenericEventBrowserGuiBase" >
-  <property name="geometry" >
+ <widget class="QDialog" name="eVisGenericEventBrowserGuiBase">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>676</width>
-    <height>637</height>
+    <width>766</width>
+    <height>654</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../resources/evis.qrc" >:/evis/eVisEventBrowser.png</iconset>
+  <property name="windowIcon">
+   <iconset resource="../resources/evis.qrc">
+    <normaloff>:/evis/eVisEventBrowser.png</normaloff>:/evis/eVisEventBrowser.png</iconset>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="leftMargin" >
+  <layout class="QVBoxLayout">
+   <property name="margin">
     <number>2</number>
    </property>
-   <property name="topMargin" >
-    <number>2</number>
-   </property>
-   <property name="rightMargin" >
-    <number>2</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>2</number>
-   </property>
    <item>
-    <widget class="QTabWidget" name="displayArea" >
-     <property name="toolTip" >
+    <widget class="QTabWidget" name="displayArea">
+     <property name="toolTip">
       <string/>
      </property>
-     <property name="currentIndex" >
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="Display" >
-      <attribute name="title" >
+     <widget class="QWidget" name="Display">
+      <attribute name="title">
        <string>Display</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QLabel" name="labelCompassOffsetWarning" >
-         <property name="text" >
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="0" column="0" rowspan="2" colspan="2">
+        <widget class="QLabel" name="labelCompassOffsetWarning">
+         <property name="text">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
+       <item row="1" column="1">
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>351</width>
            <height>20</height>
@@ -61,156 +54,184 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="2" >
-        <widget class="QPushButton" name="pbtnPrevious" >
-         <property name="toolTip" >
+       <item row="0" column="2" rowspan="2">
+        <widget class="QPushButton" name="pbtnPrevious">
+         <property name="toolTip">
           <string/>
          </property>
-         <property name="whatsThis" >
+         <property name="whatsThis">
           <string>Use the Previous button to display the previous photo when more than one photo is available for display.</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Previous</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="3" >
-        <widget class="QPushButton" name="pbtnNext" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+       <item row="0" column="3" rowspan="2">
+        <widget class="QPushButton" name="pbtnNext">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="toolTip" >
+         <property name="toolTip">
           <string/>
          </property>
-         <property name="whatsThis" >
+         <property name="whatsThis">
           <string>Use the Next button to display the next photo when more than one photo is available for display.</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Next</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="4" >
-        <widget class="QTreeWidget" name="treeEventData" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Ignored" hsizetype="Expanding" >
+       <item row="2" column="0" colspan="4">
+        <widget class="QTreeWidget" name="treeEventData">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="toolTip" >
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>125</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>125</height>
+          </size>
+         </property>
+         <property name="toolTip">
           <string/>
          </property>
-         <property name="whatsThis" >
+         <property name="whatsThis">
           <string>All of the attribute information for the point associated with the photo being viewed is displayed here. If the file type being referenced in the displayed record is not an image but is of a file type defined in the “Configure External Applications” tab then when you double-click on the value of the field containing the path to the file the application to open the file will be launched to view or hear the contents of the file. If the file extension is recognized the attribute data will be displayed in green.</string>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>1</string>
           </property>
          </column>
         </widget>
        </item>
-       <item row="2" column="0" colspan="4" >
-        <widget class="eVisImageDisplayWidget" native="1" name="imageDisplayArea" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+       <item row="3" column="0" colspan="4">
+        <widget class="eVisImageDisplayWidget" name="imageDisplayArea" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="toolTip" >
+         <property name="toolTip">
           <string>Image display area</string>
          </property>
-         <property name="whatsThis" >
+         <property name="whatsThis">
           <string>Display area for the image.</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="4" >
-        <widget class="QDialogButtonBox" name="buttonBox" >
-         <property name="orientation" >
+       <item row="4" column="0" colspan="3">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="standardButtons" >
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>628</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="4" column="3">
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
           <set>QDialogButtonBox::Close</set>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="Options" >
-      <attribute name="title" >
+     <widget class="QWidget" name="Options">
+      <attribute name="title">
        <string>Options</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QGroupBox" name="groupBox_2" >
-         <property name="title" >
+      <layout class="QGridLayout">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
           <string>File path</string>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" colspan="2" >
-           <widget class="QLabel" name="label" >
-            <property name="text" >
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="0" column="0" colspan="2">
+           <widget class="QLabel" name="label">
+            <property name="text">
              <string>Attribute containing path to file</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2" colspan="2" >
-           <widget class="QComboBox" name="cboxEventImagePathField" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <item row="0" column="2">
+           <widget class="QComboBox" name="cboxEventImagePathField">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="minimumSize">
+             <size>
+              <width>150</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Use the drop-down list to select the field containing a directory path to the image. This can be an absolute or relative path.</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QCheckBox" name="chkboxEventImagePathRelative" >
-            <property name="toolTip" >
-             <string/>
+          <item row="0" column="3" colspan="3">
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-            <property name="whatsThis" >
-             <string>If checked the path to the image will be defined appending the attribute in the field selected from the “Attribute Containing Path to Image” drop-down list to the “Base Path” defined below.</string>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>288</width>
+              <height>20</height>
+             </size>
             </property>
-            <property name="text" >
-             <string>Path is relative</string>
-            </property>
-           </widget>
+           </spacer>
           </item>
-          <item row="1" column="1" >
-           <widget class="QCheckBox" name="chkboxSaveEventImagePathData" >
-            <property name="toolTip" >
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="chkboxEventImagePathRelative">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
-             <string>If checked, the relative path values will be saved for the next session.</string>
+            <property name="whatsThis">
+             <string>If checked the path to the image will be defined appending the attribute in the field selected from the “Attribute Containing Path to Image” drop-down list to the “Base Path” defined below.</string>
             </property>
-            <property name="layoutDirection" >
-             <enum>Qt::LeftToRight</enum>
+            <property name="text">
+             <string>Path is relative</string>
             </property>
-            <property name="text" >
-             <string>Remember this</string>
-            </property>
            </widget>
           </item>
-          <item row="1" column="2" >
+          <item row="1" column="1" colspan="3">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>251</width>
               <height>20</height>
@@ -218,30 +239,47 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="3" >
-           <widget class="QPushButton" name="pbtnResetEventImagePathData" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <item row="1" column="4">
+           <widget class="QCheckBox" name="chkboxSaveEventImagePathData">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="whatsThis">
+             <string>If checked, the relative path values will be saved for the next session.</string>
+            </property>
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
+            <property name="text">
+             <string>Remember this</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="5">
+           <widget class="QPushButton" name="pbtnResetEventImagePathData">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Reset to default</string>
             </property>
-            <property name="statusTip" >
-             <string comment="Comment???" />
+            <property name="statusTip">
+             <string comment="Comment???"/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Resets the values on this line to the default setting.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Reset</string>
             </property>
-            <property name="icon" >
-             <iconset>../../../images/themes/default/mActionDraw.png</iconset>
+            <property name="icon">
+             <iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
             </property>
-            <property name="iconSize" >
+            <property name="iconSize">
              <size>
               <width>16</width>
               <height>16</height>
@@ -252,70 +290,73 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QGroupBox" name="groupBox_3" >
-         <property name="title" >
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
           <string>Compass bearing</string>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" colspan="2" >
-           <widget class="QLabel" name="label_5" >
-            <property name="text" >
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
              <string>Attribute containing compass bearing</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2" colspan="2" >
-           <widget class="QComboBox" name="cboxCompassBearingField" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <item row="0" column="1">
+           <widget class="QComboBox" name="cboxCompassBearingField">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="minimumSize">
+             <size>
+              <width>150</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Use the drop-down list to select the field containing the compass bearing for the image. This bearing usually references the direction the camera was pointing when the image was acquired. </string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QCheckBox" name="chkboxDisplayCompassBearing" >
-            <property name="toolTip" >
-             <string/>
+          <item row="0" column="2" colspan="3">
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-            <property name="whatsThis" >
-             <string>If checked an arrow pointing in the direction defined by the attribute in the field selected from the drop-down list to the right will be displayed in the QGIS window on top of the point for this image.</string>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>268</width>
+              <height>24</height>
+             </size>
             </property>
-            <property name="text" >
-             <string>Display compass bearing</string>
-            </property>
-           </widget>
+           </spacer>
           </item>
-          <item row="1" column="1" >
-           <widget class="QCheckBox" name="chkboxSaveCompassBearingData" >
-            <property name="toolTip" >
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="chkboxDisplayCompassBearing">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
-             <string>If checked, the Display Compass Bearing values will be saved for the next session.</string>
+            <property name="whatsThis">
+             <string>If checked an arrow pointing in the direction defined by the attribute in the field selected from the drop-down list to the right will be displayed in the QGIS window on top of the point for this image.</string>
             </property>
-            <property name="layoutDirection" >
-             <enum>Qt::LeftToRight</enum>
+            <property name="text">
+             <string>Display compass bearing</string>
             </property>
-            <property name="text" >
-             <string>Remember this</string>
-            </property>
            </widget>
           </item>
-          <item row="1" column="2" >
+          <item row="1" column="1" colspan="2">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>121</width>
               <height>20</height>
@@ -323,27 +364,44 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="3" >
-           <widget class="QPushButton" name="pbtnResetCompassBearingData" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <item row="1" column="3">
+           <widget class="QCheckBox" name="chkboxSaveCompassBearingData">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="whatsThis">
+             <string>If checked, the Display Compass Bearing values will be saved for the next session.</string>
+            </property>
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
+            <property name="text">
+             <string>Remember this</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="4">
+           <widget class="QPushButton" name="pbtnResetCompassBearingData">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Reset to default</string>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Resets the values on this line to the default setting.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Reset</string>
             </property>
-            <property name="icon" >
-             <iconset>../../../images/themes/default/mActionDraw.png</iconset>
+            <property name="icon">
+             <iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
             </property>
-            <property name="iconSize" >
+            <property name="iconSize">
              <size>
               <width>16</width>
               <height>16</height>
@@ -354,104 +412,120 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
+       <item row="2" column="0">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
           <string>Compass offset</string>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="rbtnManualCompassOffset" >
-            <property name="toolTip" >
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="rbtnManualCompassOffset">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Define the compass offset manually.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Manual</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2" >
-           <widget class="QDoubleSpinBox" name="dsboxCompassOffset" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <item row="0" column="1">
+           <widget class="QDoubleSpinBox" name="dsboxCompassOffset">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>A value to be added to the compass bearing. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. </string>
             </property>
-            <property name="decimals" >
+            <property name="decimals">
              <number>1</number>
             </property>
-            <property name="minimum" >
+            <property name="minimum">
              <double>-180.000000000000000</double>
             </property>
-            <property name="maximum" >
+            <property name="maximum">
              <double>180.000000000000000</double>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <double>1.000000000000000</double>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="rbtnAttributeCompassOffset" >
-            <property name="toolTip" >
+          <item row="0" column="2" colspan="4">
+           <spacer name="horizontalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>430</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="rbtnAttributeCompassOffset">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Define the compass offset using a field from the vector layer attribute table.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string> From Attribute</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" colspan="2" >
-           <widget class="QComboBox" name="cboxCompassOffsetField" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <item row="1" column="1" colspan="2">
+           <widget class="QComboBox" name="cboxCompassOffsetField">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="minimumSize">
+             <size>
+              <width>150</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Use the drop-down list to select the field containing the compass bearing offset. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. </string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QCheckBox" name="chkboxSaveCompassOffsetData" >
-            <property name="toolTip" >
-             <string/>
+          <item row="1" column="3" colspan="3">
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-            <property name="whatsThis" >
-             <string>If checked, the compass offset values will be saved for the next session.</string>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>424</width>
+              <height>20</height>
+             </size>
             </property>
-            <property name="layoutDirection" >
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="text" >
-             <string>Remember this</string>
-            </property>
-           </widget>
+           </spacer>
           </item>
-          <item row="2" column="1" >
+          <item row="2" column="3">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>281</width>
               <height>20</height>
@@ -459,27 +533,44 @@
             </property>
            </spacer>
           </item>
-          <item row="2" column="2" >
-           <widget class="QPushButton" name="pbtnResetCompassOffsetData" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <item row="2" column="4">
+           <widget class="QCheckBox" name="chkboxSaveCompassOffsetData">
+            <property name="toolTip">
+             <string/>
+            </property>
+            <property name="whatsThis">
+             <string>If checked, the compass offset values will be saved for the next session.</string>
+            </property>
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
+            <property name="text">
+             <string>Remember this</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="5">
+           <widget class="QPushButton" name="pbtnResetCompassOffsetData">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Reset to default</string>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Resets the compass offset values to the default settings.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Reset</string>
             </property>
-            <property name="icon" >
-             <iconset>../../../images/themes/default/mActionDraw.png</iconset>
+            <property name="icon">
+             <iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
             </property>
-            <property name="iconSize" >
+            <property name="iconSize">
              <size>
               <width>16</width>
               <height>16</height>
@@ -490,25 +581,25 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0" >
-        <widget class="QGroupBox" name="groupBox_4" >
-         <property name="title" >
+       <item row="3" column="0">
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
           <string>Relative paths</string>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" colspan="3" >
-           <widget class="QLabel" name="label_4" >
-            <property name="text" >
+         <layout class="QGridLayout">
+          <item row="0" column="0" colspan="3">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
              <string>The base path or url from which images and documents can be “relative”</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="3" colspan="2" >
+          <item row="0" column="3" colspan="2">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>131</width>
               <height>20</height>
@@ -516,66 +607,67 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_2" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
              <string>Base Path</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="leBasePath" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="leBasePath">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>10</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Base Path</string>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>The Base Path onto which the relative path defined above will be appended.</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="2" colspan="2" >
-           <widget class="QCheckBox" name="chkboxSaveBasePathData" >
-            <property name="toolTip" >
+          <item row="1" column="2" colspan="2">
+           <widget class="QCheckBox" name="chkboxSaveBasePathData">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>If checked, the Base Path will be saved for the next session.</string>
             </property>
-            <property name="layoutDirection" >
+            <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Remember this</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="4" >
-           <widget class="QPushButton" name="pbtnResetBasePathData" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <item row="1" column="4">
+           <widget class="QPushButton" name="pbtnResetBasePathData">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Reset to default</string>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Enters the default “Base Path” which is the path to the directory of the vector layer containing the image information.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Reset</string>
             </property>
-            <property name="icon" >
-             <iconset>../../../images/themes/default/mActionDraw.png</iconset>
+            <property name="icon">
+             <iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
             </property>
-            <property name="iconSize" >
+            <property name="iconSize">
              <size>
               <width>16</width>
               <height>16</height>
@@ -583,63 +675,64 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2" >
-           <widget class="QCheckBox" name="chkboxUseOnlyFilename" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="chkboxUseOnlyFilename">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>If checked, the Base Path will append only the file name instead of the entire relative path (defined above) to create the full directory path to the file. </string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Replace entire path/url stored in image path attribute with user defined
 Base Path (i.e. keep only filename from attribute)</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="2" colspan="2" >
-           <widget class="QCheckBox" name="chkboxSaveUseOnlyFilenameData" >
-            <property name="toolTip" >
+          <item row="2" column="2" colspan="2">
+           <widget class="QCheckBox" name="chkboxSaveUseOnlyFilenameData">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>If checked, the  current check-box setting will be saved for the next session.</string>
             </property>
-            <property name="layoutDirection" >
+            <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Remember this</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="4" >
-           <widget class="QPushButton" name="pbtnResetUseOnlyFilenameData" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <item row="2" column="4">
+           <widget class="QPushButton" name="pbtnResetUseOnlyFilenameData">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Reset to default</string>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Clears the check-box on this line.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Reset</string>
             </property>
-            <property name="icon" >
-             <iconset>../../../images/themes/default/mActionDraw.png</iconset>
+            <property name="icon">
+             <iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
             </property>
-            <property name="iconSize" >
+            <property name="iconSize">
              <size>
               <width>16</width>
               <height>16</height>
@@ -647,62 +740,63 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0" colspan="2" >
-           <widget class="QCheckBox" name="chkboxApplyPathRulesToDocs" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+          <item row="3" column="0" colspan="2">
+           <widget class="QCheckBox" name="chkboxApplyPathRulesToDocs">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>If checked, the same path rules that are defined for images will be used for non-image documents such as movies, text documents, and sound files. If not checked the path rules will only apply to images and other documents will ignore the Base Path parameter.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Apply Path to Image rules when loading docs in external applications</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="2" colspan="2" >
-           <widget class="QCheckBox" name="chkboxSaveApplyPathRulesToDocs" >
-            <property name="toolTip" >
+          <item row="3" column="2" colspan="2">
+           <widget class="QCheckBox" name="chkboxSaveApplyPathRulesToDocs">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>If checked, the  current check-box setting will be saved for the next session.</string>
             </property>
-            <property name="layoutDirection" >
+            <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Remember this</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="4" >
-           <widget class="QPushButton" name="pbtnResetApplyPathRulesToDocs" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <item row="3" column="4">
+           <widget class="QPushButton" name="pbtnResetApplyPathRulesToDocs">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Reset to default</string>
             </property>
-            <property name="whatsThis" >
+            <property name="whatsThis">
              <string>Clears the check-box on this line.</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Reset</string>
             </property>
-            <property name="icon" >
-             <iconset>../../../images/themes/default/mActionDraw.png</iconset>
+            <property name="icon">
+             <iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
             </property>
-            <property name="iconSize" >
+            <property name="iconSize">
              <size>
               <width>16</width>
               <height>16</height>
@@ -713,41 +807,41 @@
          </layout>
         </widget>
        </item>
-       <item row="4" column="0" >
-        <widget class="Line" name="line" >
-         <property name="orientation" >
+       <item row="4" column="0">
+        <widget class="Line" name="line">
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="5" column="0" >
-        <widget class="QDialogButtonBox" name="buttonboxOptions" >
-         <property name="toolTip" >
+       <item row="5" column="0">
+        <widget class="QDialogButtonBox" name="buttonboxOptions">
+         <property name="toolTip">
           <string/>
          </property>
-         <property name="whatsThis" >
+         <property name="whatsThis">
           <string>Clicking on Save will save the settings without closing the Options pane. Clicking on Restore Defaults will reset all of the fields to their default settings. It has the same effect as clicking all of the “Reset to default” buttons. </string>
          </property>
-         <property name="standardButtons" >
-          <set>QDialogButtonBox::NoButton|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="ConfigureExternalApplications" >
-      <attribute name="title" >
+     <widget class="QWidget" name="ConfigureExternalApplications">
+      <attribute name="title">
        <string>Configure External Applications</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" colspan="2" >
-        <layout class="QHBoxLayout" >
+      <layout class="QGridLayout">
+       <item row="0" column="0" colspan="2">
+        <layout class="QHBoxLayout">
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
@@ -756,18 +850,18 @@
           </spacer>
          </item>
          <item>
-          <widget class="QLabel" name="label_3" >
-           <property name="text" >
+          <widget class="QLabel" name="label_3">
+           <property name="text">
             <string>File extension and external application in which to load a document of that type</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
@@ -777,66 +871,68 @@
          </item>
         </layout>
        </item>
-       <item row="2" column="0" >
-        <widget class="QTableWidget" name="tableFileTypeAssociations" >
-         <property name="toolTip" >
+       <item row="2" column="0">
+        <widget class="QTableWidget" name="tableFileTypeAssociations">
+         <property name="toolTip">
           <string/>
          </property>
-         <property name="whatsThis" >
+         <property name="whatsThis">
           <string>A table containing file types that can be opened using eVis. Each file type needs a file extension and the path to an application that can open that type of file. This provides the capability of opening a broad range of files such as movies, sound recording, and text documents instead of only images. </string>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Extension</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Application</string>
           </property>
          </column>
         </widget>
        </item>
-       <item row="2" column="1" >
-        <layout class="QVBoxLayout" >
+       <item row="2" column="1">
+        <layout class="QVBoxLayout">
          <item>
-          <widget class="QPushButton" name="pbtnAddFileType" >
-           <property name="toolTip" >
+          <widget class="QPushButton" name="pbtnAddFileType">
+           <property name="toolTip">
             <string>Add new file type</string>
            </property>
-           <property name="whatsThis" >
+           <property name="whatsThis">
             <string>Add a new file type with a unique extension and the path for the application that can open the file.</string>
            </property>
-           <property name="text" >
+           <property name="text">
             <string/>
            </property>
-           <property name="icon" >
-            <iconset>../../../../raster_transparency_branch/images/themes/default/mActionNewAttribute.png</iconset>
+           <property name="icon">
+            <iconset>
+             <normaloff>../../../../raster_transparency_branch/images/themes/default/mActionNewAttribute.png</normaloff>../../../../raster_transparency_branch/images/themes/default/mActionNewAttribute.png</iconset>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="pbtnDeleteFileType" >
-           <property name="toolTip" >
+          <widget class="QPushButton" name="pbtnDeleteFileType">
+           <property name="toolTip">
             <string>Delete current row</string>
            </property>
-           <property name="whatsThis" >
+           <property name="whatsThis">
             <string>Delete the file type highlighted in the table and defined by a file extension and a path to an associated application.</string>
            </property>
-           <property name="text" >
+           <property name="text">
             <string/>
            </property>
-           <property name="icon" >
-            <iconset>../../../../raster_transparency_branch/images/themes/default/mActionDeleteAttribute.png</iconset>
+           <property name="icon">
+            <iconset>
+             <normaloff>../../../../raster_transparency_branch/images/themes/default/mActionDeleteAttribute.png</normaloff>../../../../raster_transparency_branch/images/themes/default/mActionDeleteAttribute.png</iconset>
            </property>
           </widget>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>491</height>
@@ -894,7 +990,7 @@
   <tabstop>buttonboxOptions</tabstop>
  </tabstops>
  <resources>
-  <include location="../resources/evis.qrc" />
+  <include location="../resources/evis.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -903,11 +999,11 @@
    <receiver>eVisGenericEventBrowserGuiBase</receiver>
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>310</x>
      <y>652</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
@@ -919,11 +1015,11 @@
    <receiver>eVisGenericEventBrowserGuiBase</receiver>
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>525</x>
      <y>664</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>403</x>
      <y>273</y>
     </hint>



More information about the QGIS-commit mailing list