[QGIS Commit] r8916 - trunk/qgis/src/plugins/gps_importer

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Jul 26 05:29:38 EDT 2008


Author: timlinux
Date: 2008-07-26 05:29:38 -0400 (Sat, 26 Jul 2008)
New Revision: 8916

Modified:
   trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui
   trunk/qgis/src/plugins/gps_importer/qgsgpsplugingui.cpp
   trunk/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui
Log:
Added refresh button so when plugging in a gps device after dialog is opened, it can be selectd from the ports list. Use button box for gps add device dialog

Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui	2008-07-26 09:25:41 UTC (rev 8915)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui	2008-07-26 09:29:38 UTC (rev 8916)
@@ -10,9 +10,7 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
+   <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -23,32 +21,33 @@
   <property name="modal" >
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
     <widget class="QSplitter" name="splitter" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
      <widget class="QWidget" name="layoutWidget_2" >
       <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>0</number>
+       </property>
        <item>
         <widget class="QListWidget" name="lbDeviceList" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>5</vsizetype>
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -58,9 +57,7 @@
        <item>
         <widget class="QPushButton" name="pbnNewDevice" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>1</hsizetype>
-           <vsizetype>0</vsizetype>
+          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -73,9 +70,7 @@
        <item>
         <widget class="QPushButton" name="pbnDeleteDevice" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>1</hsizetype>
-           <vsizetype>0</vsizetype>
+          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -88,9 +83,7 @@
        <item>
         <widget class="QPushButton" name="pbnUpdateDevice" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>1</hsizetype>
-           <vsizetype>0</vsizetype>
+          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -104,41 +97,55 @@
      </widget>
      <widget class="QWidget" name="layoutWidget_3" >
       <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>0</number>
+       </property>
        <item>
         <layout class="QHBoxLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
          <property name="spacing" >
           <number>6</number>
          </property>
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
          <item>
           <widget class="QLabel" name="textLabel3" >
            <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>1</hsizetype>
-             <vsizetype>5</vsizetype>
+            <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text" >
-            <string>Device name:</string>
+            <string>Device name</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="leDeviceName" >
            <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>0</vsizetype>
+            <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
              <horstretch>2</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -159,12 +166,24 @@
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <layout class="QGridLayout" >
-          <property name="margin" >
+          <property name="leftMargin" >
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="topMargin" >
+           <number>9</number>
+          </property>
+          <property name="rightMargin" >
+           <number>9</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>9</number>
+          </property>
+          <property name="horizontalSpacing" >
            <number>6</number>
           </property>
+          <property name="verticalSpacing" >
+           <number>6</number>
+          </property>
           <item row="4" column="0" >
            <widget class="QLabel" name="textLabel1_2_5" >
             <property name="text" >
@@ -255,15 +274,16 @@
        <item>
         <widget class="QTextEdit" name="textEdit" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>5</vsizetype>
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="html" >
-          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:&lt;span style=" font-style:italic;">%babel&lt;/span> - the path to GPSBabel&lt;br />&lt;span style=" font-style:italic;">%in&lt;/span> - the GPX filename when uploading or the port when downloading&lt;br />&lt;span style=" font-style:italic;">%out&lt;/span> - the port when uploading or the GPX filename when downloading&lt;/p>&lt;/body>&lt;/html></string>
+          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:&lt;span style=" font-style:italic;">%babel&lt;/span> - the path to GPSBabel&lt;br />&lt;span style=" font-style:italic;">%in&lt;/span> - the GPX filename when uploading or the port when downloading&lt;br />&lt;span style=" font-style:italic;">%out&lt;/span> - the port when uploading or the GPX filename when downloading&lt;/p>&lt;/body>&lt;/html></string>
          </property>
         </widget>
        </item>
@@ -271,42 +291,33 @@
      </widget>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="1" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Close</set>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>381</width>
-         <height>21</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pbnClose" >
-       <property name="text" >
-        <string>Close</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>clicked(QAbstractButton*)</signal>
+   <receiver>QgsGPSDeviceDialogBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>453</x>
+     <y>418</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>498</x>
+     <y>403</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugingui.cpp	2008-07-26 09:25:41 UTC (rev 8915)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugingui.cpp	2008-07-26 09:29:38 UTC (rev 8916)
@@ -285,9 +285,14 @@
     leIMPOutput->setText(myFileNameQString);
 }
 
+void QgsGPSPluginGui::on_pbnRefresh_clicked()
+{
+  populatePortComboBoxes();
+}
 
 void QgsGPSPluginGui::populatePortComboBoxes() {
   
+  cmbDLPort->clear();
 #ifdef linux
   // look for linux serial devices
   QString linuxDev("/dev/ttyS%1");

Modified: trunk/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui	2008-07-26 09:25:41 UTC (rev 8915)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui	2008-07-26 09:29:38 UTC (rev 8916)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>930</width>
-    <height>406</height>
+    <width>987</width>
+    <height>428</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -16,12 +16,24 @@
    <iconset/>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
+   <property name="leftMargin" >
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin" >
+    <number>9</number>
+   </property>
+   <property name="rightMargin" >
+    <number>9</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>9</number>
+   </property>
+   <property name="horizontalSpacing" >
     <number>6</number>
    </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
    <item row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
@@ -51,25 +63,35 @@
    <item row="0" column="2" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab1" >
       <attribute name="title" >
        <string>Load GPX file</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
         <number>6</number>
        </property>
+       <property name="verticalSpacing" >
+        <number>6</number>
+       </property>
        <item row="0" column="0" colspan="2" >
         <widget class="QTextEdit" name="teLoadDescription" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>7</vsizetype>
+          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -83,8 +105,8 @@
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
          </property>
         </widget>
        </item>
@@ -158,12 +180,24 @@
        <string>Import other file</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
         <number>6</number>
        </property>
+       <property name="verticalSpacing" >
+        <number>6</number>
+       </property>
        <item row="0" column="0" colspan="4" >
         <widget class="QTextEdit" name="teIMPDescription" >
          <property name="readOnly" >
@@ -172,8 +206,8 @@
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
          </property>
         </widget>
        </item>
@@ -272,13 +306,7 @@
        <string>Download from GPS</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item row="0" column="0" colspan="5" >
+       <item row="0" column="0" colspan="9" >
         <widget class="QTextEdit" name="teDLDescription" >
          <property name="readOnly" >
           <bool>true</bool>
@@ -286,81 +314,36 @@
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
          </property>
         </widget>
        </item>
-       <item row="1" column="4" >
-        <widget class="QComboBox" name="cmbDLPort" >
-         <property name="minimumSize" >
-          <size>
-           <width>90</width>
-           <height>0</height>
-          </size>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="textLabel1" >
+         <property name="text" >
+          <string>GPS device:</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="4" >
-        <widget class="QComboBox" name="cmbDLFeatureType" >
+       <item row="1" column="1" >
+        <widget class="QComboBox" name="cmbDLDevice" >
          <property name="minimumSize" >
           <size>
-           <width>100</width>
+           <width>120</width>
            <height>0</height>
           </size>
          </property>
-         <item>
-          <property name="text" >
-           <string>Waypoints</string>
-          </property>
-         </item>
-         <item>
-          <property name="text" >
-           <string>Routes</string>
-          </property>
-         </item>
-         <item>
-          <property name="text" >
-           <string>Tracks</string>
-          </property>
-         </item>
         </widget>
        </item>
-       <item row="1" column="3" >
-        <widget class="QLabel" name="textLabel2_5" >
+       <item row="1" column="2" >
+        <widget class="QPushButton" name="pbDLEditDevices" >
          <property name="text" >
-          <string>Port:</string>
+          <string>Edit devices...</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="3" >
-        <widget class="QLabel" name="textLabel1_3" >
-         <property name="text" >
-          <string>Feature type:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1" colspan="3" >
-        <widget class="QLineEdit" name="leDLBasename" />
-       </item>
-       <item row="4" column="0" >
-        <widget class="QLabel" name="textLabel1_2" >
-         <property name="text" >
-          <string>Layer name:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" >
-        <widget class="QLabel" name="textLabel2" >
-         <property name="text" >
-          <string>Output file:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1" colspan="3" >
-        <widget class="QLineEdit" name="leDLOutput" />
-       </item>
-       <item row="1" column="2" >
+       <item row="1" column="3" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
@@ -370,13 +353,37 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>80</width>
-           <height>20</height>
+           <width>121</width>
+           <height>24</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="2" column="2" >
+       <item row="1" column="4" colspan="2" >
+        <widget class="QLabel" name="textLabel2_5" >
+         <property name="text" >
+          <string>Port:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="6" colspan="2" >
+        <widget class="QComboBox" name="cmbDLPort" >
+         <property name="minimumSize" >
+          <size>
+           <width>90</width>
+           <height>0</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="8" >
+        <widget class="QPushButton" name="pbnRefresh" >
+         <property name="text" >
+          <string>Refresh</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2" colspan="3" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
@@ -392,37 +399,65 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="textLabel1" >
+       <item row="2" column="5" colspan="2" >
+        <widget class="QLabel" name="textLabel1_3" >
          <property name="text" >
-          <string>GPS device:</string>
+          <string>Feature type:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" >
-        <widget class="QComboBox" name="cmbDLDevice" >
+       <item row="2" column="7" colspan="2" >
+        <widget class="QComboBox" name="cmbDLFeatureType" >
          <property name="minimumSize" >
           <size>
-           <width>120</width>
+           <width>100</width>
            <height>0</height>
           </size>
          </property>
+         <item>
+          <property name="text" >
+           <string>Waypoints</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Routes</string>
+          </property>
+         </item>
+         <item>
+          <property name="text" >
+           <string>Tracks</string>
+          </property>
+         </item>
         </widget>
        </item>
-       <item row="2" column="1" >
-        <widget class="QPushButton" name="pbDLEditDevices" >
+       <item row="3" column="0" >
+        <widget class="QLabel" name="textLabel2" >
          <property name="text" >
-          <string>Edit devices</string>
+          <string>Output file:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="4" >
+       <item row="3" column="1" colspan="6" >
+        <widget class="QLineEdit" name="leDLOutput" />
+       </item>
+       <item row="3" column="7" colspan="2" >
         <widget class="QPushButton" name="pbnDLOutput" >
          <property name="text" >
           <string>Save As...</string>
          </property>
         </widget>
        </item>
+       <item row="4" column="0" >
+        <widget class="QLabel" name="textLabel1_2" >
+         <property name="text" >
+          <string>Layer name:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1" colspan="6" >
+        <widget class="QLineEdit" name="leDLBasename" />
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab4" >
@@ -430,12 +465,24 @@
        <string>Upload to GPS</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
         <number>6</number>
        </property>
+       <property name="verticalSpacing" >
+        <number>6</number>
+       </property>
        <item row="1" column="2" >
         <spacer>
          <property name="orientation" >
@@ -460,8 +507,8 @@
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
          </property>
         </widget>
        </item>
@@ -530,12 +577,24 @@
        <string>GPX Conversions</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
         <number>6</number>
        </property>
+       <property name="verticalSpacing" >
+        <number>6</number>
+       </property>
        <item row="0" column="0" colspan="4" >
         <widget class="QTextEdit" name="teCONVDescription" >
          <property name="readOnly" >
@@ -544,8 +603,8 @@
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
          </property>
         </widget>
        </item>



More information about the QGIS-commit mailing list