[QGIS Commit] r12374 - trunk/qgis/src/plugins/gps_importer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Dec 8 15:42:55 EST 2009
Author: borysiasty
Date: 2009-12-08 15:42:54 -0500 (Tue, 08 Dec 2009)
New Revision: 12374
Modified:
trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui
Log:
fix #2212
Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui 2009-12-08 11:22:49 UTC (rev 12373)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsdevicedialogbase.ui 2009-12-08 20:42:54 UTC (rev 12374)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>542</width>
- <height>461</height>
+ <width>700</width>
+ <height>450</height>
</rect>
</property>
<property name="sizePolicy">
@@ -22,292 +22,274 @@
<property name="modal">
<bool>true</bool>
</property>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="geometry">
- <rect>
- <x>9</x>
- <y>426</y>
- <width>521</width>
- <height>25</height>
- </rect>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Close</set>
- </property>
- </widget>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="geometry">
- <rect>
- <x>9</x>
- <y>9</y>
- <width>171</width>
- <height>411</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Devices</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="1">
- <widget class="QPushButton" name="pbnDeleteDevice">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Delete</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QPushButton" name="pbnNewDevice">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>New</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QPushButton" name="pbnUpdateDevice">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Update</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="3">
- <widget class="QListWidget" name="lbDeviceList">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="">
- <property name="geometry">
- <rect>
- <x>190</x>
- <y>10</y>
- <width>341</width>
- <height>412</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel3">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Devices</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="1" column="1">
+ <widget class="QPushButton" name="pbnDeleteDevice">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
- <string>Device name</string>
+ <string>Delete</string>
</property>
- <property name="buddy">
- <cstring>leDeviceName</cstring>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QPushButton" name="pbnNewDevice">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
+ <property name="text">
+ <string>New</string>
+ </property>
</widget>
</item>
- <item>
- <widget class="QLineEdit" name="leDeviceName">
+ <item row="1" column="2">
+ <widget class="QPushButton" name="pbnUpdateDevice">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>2</horstretch>
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="toolTip">
- <string>This is the name of the device as it will appear in the lists</string>
+ <property name="text">
+ <string>Update</string>
</property>
</widget>
</item>
+ <item row="0" column="0" colspan="3">
+ <widget class="QListWidget" name="lbDeviceList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
</layout>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Commands</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>9</number>
- </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
- <item row="4" column="0">
- <widget class="QLabel" name="textLabel1_2_5">
- <property name="text">
- <string>Track download</string>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="buddy">
- <cstring>leTrkDown</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel1_2_4">
<property name="text">
- <string>Route upload</string>
+ <string>Device name</string>
</property>
<property name="buddy">
- <cstring>leRteUp</cstring>
+ <cstring>leDeviceName</cstring>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1_2">
- <property name="text">
- <string>Waypoint download</string>
+ <item>
+ <widget class="QLineEdit" name="leDeviceName">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="buddy">
- <cstring>leWptDown</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="leRteDown">
<property name="toolTip">
- <string>The command that is used to download routes from the device</string>
+ <string>This is the name of the device as it will appear in the lists</string>
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel1_2_3">
- <property name="text">
- <string>Route download</string>
- </property>
- <property name="buddy">
- <cstring>leRteDown</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="leWptUp">
- <property name="toolTip">
- <string>The command that is used to upload waypoints to the device</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="textLabel1_2_5_2">
- <property name="text">
- <string>Track upload</string>
- </property>
- <property name="buddy">
- <cstring>leTrkUp</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="leTrkDown">
- <property name="toolTip">
- <string>The command that is used to download tracks from the device</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="leRteUp">
- <property name="toolTip">
- <string>The command that is used to upload routes to the device</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="leWptDown">
- <property name="toolTip">
- <string>The command that is used to download waypoints from the device</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QLineEdit" name="leTrkUp">
- <property name="toolTip">
- <string>The command that is used to upload tracks to the device</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel1_2_2">
- <property name="text">
- <string>Waypoint upload</string>
- </property>
- <property name="buddy">
- <cstring>leWptUp</cstring>
- </property>
- </widget>
- </item>
</layout>
- </widget>
- </item>
- <item>
- <widget class="QTextEdit" name="textEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="acceptDrops">
- <bool>false</bool>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="html">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Commands</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <item row="4" column="0">
+ <widget class="QLabel" name="textLabel1_2_5">
+ <property name="text">
+ <string>Track download</string>
+ </property>
+ <property name="buddy">
+ <cstring>leTrkDown</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel1_2_4">
+ <property name="text">
+ <string>Route upload</string>
+ </property>
+ <property name="buddy">
+ <cstring>leRteUp</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="text">
+ <string>Waypoint download</string>
+ </property>
+ <property name="buddy">
+ <cstring>leWptDown</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="leRteDown">
+ <property name="toolTip">
+ <string>The command that is used to download routes from the device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel1_2_3">
+ <property name="text">
+ <string>Route download</string>
+ </property>
+ <property name="buddy">
+ <cstring>leRteDown</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="leWptUp">
+ <property name="toolTip">
+ <string>The command that is used to upload waypoints to the device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="textLabel1_2_5_2">
+ <property name="text">
+ <string>Track upload</string>
+ </property>
+ <property name="buddy">
+ <cstring>leTrkUp</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="leTrkDown">
+ <property name="toolTip">
+ <string>The command that is used to download tracks from the device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="leRteUp">
+ <property name="toolTip">
+ <string>The command that is used to upload routes to the device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="leWptDown">
+ <property name="toolTip">
+ <string>The command that is used to download waypoints from the device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="leTrkUp">
+ <property name="toolTip">
+ <string>The command that is used to upload tracks to the device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_2_2">
+ <property name="text">
+ <string>Waypoint upload</string>
+ </property>
+ <property name="buddy">
+ <cstring>leWptUp</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextEdit" name="textEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="acceptDrops">
+ <bool>false</bool>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="html">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;">
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" 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:</span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%babel</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the path to GPSBabel<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%in</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the GPX filename when uploading or the port when downloading<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%out</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the port when uploading or the GPX filename when downloading</span></p></body></html></string>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::NoTextInteraction</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
@@ -334,8 +316,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>462</x>
- <y>451</y>
+ <x>460</x>
+ <y>442</y>
</hint>
<hint type="destinationlabel">
<x>498</x>
More information about the QGIS-commit
mailing list