[QGIS Commit] r11995 - in trunk/qgis/src: app/ogr ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 7 19:28:20 EST 2009
Author: macho
Date: 2009-11-07 19:28:19 -0500 (Sat, 07 Nov 2009)
New Revision: 11995
Modified:
trunk/qgis/src/app/ogr/qgsnewogrconnection.cpp
trunk/qgis/src/app/ogr/qgsnewogrconnection.h
trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
ui cleanup in newogrconnection to buttonbox
Modified: trunk/qgis/src/app/ogr/qgsnewogrconnection.cpp
===================================================================
--- trunk/qgis/src/app/ogr/qgsnewogrconnection.cpp 2009-11-07 23:42:46 UTC (rev 11994)
+++ trunk/qgis/src/app/ogr/qgsnewogrconnection.cpp 2009-11-08 00:28:19 UTC (rev 11995)
@@ -34,6 +34,7 @@
: QDialog( parent, fl )
{
setupUi( this );
+ connect( buttonBox, SIGNAL( helpRequested() ),this,SLOT( help() ) );
//add database drivers
QStringList dbDrivers = QgsProviderRegistry::instance()->databaseDrivers().split( ";" );
for ( int i = 0;i < dbDrivers.count();i++ )
@@ -105,21 +106,16 @@
settings.setValue( baseKey + "/username", txtUsername->text() );
settings.setValue( baseKey + "/password", chkStorePassword->isChecked() ? txtPassword->text() : "" );
settings.setValue( baseKey + "/save", chkStorePassword->isChecked() ? "true" : "false" );
- accept();
}
-void QgsNewOgrConnection::helpInfo()
-{
- QgsContextHelp::run( context_id );
-}
-
/** Autoconnected SLOTS **/
-void QgsNewOgrConnection::on_btnOk_clicked()
+void QgsNewOgrConnection::accept()
{
saveConnection();
+ QDialog::accept();
}
-void QgsNewOgrConnection::on_btnHelp_clicked()
+void QgsNewOgrConnection::help()
{
helpInfo();
}
@@ -129,10 +125,11 @@
testConnection();
}
-void QgsNewOgrConnection::on_btnCancel_clicked()
+void QgsNewOgrConnection::helpInfo()
{
- reject();
+ QgsContextHelp::run( context_id );
}
+
/** end Autoconnected SLOTS **/
Modified: trunk/qgis/src/app/ogr/qgsnewogrconnection.h
===================================================================
--- trunk/qgis/src/app/ogr/qgsnewogrconnection.h 2009-11-07 23:42:46 UTC (rev 11994)
+++ trunk/qgis/src/app/ogr/qgsnewogrconnection.h 2009-11-08 00:28:19 UTC (rev 11995)
@@ -40,9 +40,8 @@
//! Display the context help
void helpInfo();
public slots:
- void on_btnOk_clicked();
- void on_btnCancel_clicked();
- void on_btnHelp_clicked();
+ void accept();
+ void help();
void on_btnConnect_clicked();
private:
static const int context_id = 63428984;
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2009-11-07 23:42:46 UTC (rev 11994)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2009-11-08 00:28:19 UTC (rev 11995)
@@ -1,63 +1,64 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsOptionsBase</class>
- <widget class="QDialog" name="QgsOptionsBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsOptionsBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>807</width>
- <height>594</height>
+ <width>733</width>
+ <height>549</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Options</string>
</property>
- <property name="sizeGripEnabled" >
+ <property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <property name="modal" >
+ <property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <item row="1" column="0" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <layout class="QGridLayout">
+ <item row="1" column="0">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
+ <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QTabWidget" name="tabWidget" >
- <property name="currentIndex" >
+ <item row="0" column="0">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="tabGeneral" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabGeneral">
+ <attribute name="title">
<string>&General</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="groupBox_11" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox_11">
+ <property name="title">
<string>Project files</string>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
+ <layout class="QVBoxLayout">
+ <property name="margin">
<number>11</number>
</property>
<item>
- <widget class="QCheckBox" name="chbAskToSaveProjectChanges" >
- <property name="text" >
+ <widget class="QCheckBox" name="chbAskToSaveProjectChanges">
+ <property name="text">
<string>Prompt to save project changes when required</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="chbWarnOldProjectVersion" >
- <property name="text" >
+ <widget class="QCheckBox" name="chbWarnOldProjectVersion">
+ <property name="text">
<string>Warn when opening a project file saved with an older version of QGIS</string>
</property>
</widget>
@@ -65,64 +66,51 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupBox_9" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_9">
+ <property name="title">
<string>Default Map Appearance (overridden by project properties)</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1_9" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_9">
+ <property name="text">
<string>Selection color</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>pbnMeasureColour</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0" >
+ <item row="0" column="3">
+ <widget class="QgsColorButton" name="pbnSelectionColour">
+ <property name="minimumSize">
<size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="3" >
- <widget class="QgsColorButton" name="pbnSelectionColour" >
- <property name="minimumSize" >
- <size>
<width>100</width>
<height>0</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Background color</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>pbnCanvasColor</cstring>
</property>
</widget>
</item>
- <item row="1" column="2" >
+ <item row="1" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -130,65 +118,78 @@
</property>
</spacer>
</item>
- <item row="1" column="3" >
- <widget class="QgsColorButton" name="pbnCanvasColor" >
- <property name="minimumSize" >
+ <item row="1" column="3">
+ <widget class="QgsColorButton" name="pbnCanvasColor">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</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>&Application</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1_4" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Icon theme</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>cmbTheme</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cmbTheme" >
- <property name="duplicatesEnabled" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cmbTheme">
+ <property name="duplicatesEnabled">
<bool>false</bool>
</property>
<item>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</item>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
+ <item row="1" column="0" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
@@ -196,44 +197,44 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QCheckBox" name="capitaliseCheckBox" >
- <property name="text" >
+ <item row="2" column="0" colspan="2">
+ <widget class="QCheckBox" name="capitaliseCheckBox">
+ <property name="text">
<string>Capitalise layer names in legend</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
- <widget class="QCheckBox" name="cbxLegendClassifiers" >
- <property name="text" >
+ <item row="3" column="0" colspan="2">
+ <widget class="QCheckBox" name="cbxLegendClassifiers">
+ <property name="text">
<string>Display classification attribute names in legend</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="2" >
- <widget class="QCheckBox" name="cbxHideSplash" >
- <property name="text" >
+ <item row="4" column="0" colspan="2">
+ <widget class="QCheckBox" name="cbxHideSplash">
+ <property name="text">
<string>Hide splash screen at startup</string>
</property>
</widget>
</item>
- <item row="5" column="0" >
- <widget class="QCheckBox" name="cbxIdentifyResultsDocked" >
- <property name="text" >
+ <item row="5" column="0">
+ <widget class="QCheckBox" name="cbxIdentifyResultsDocked">
+ <property name="text">
<string>Open identify results in a dock window (QGIS restart required)</string>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="2" >
- <widget class="QCheckBox" name="cbxAttributeTableDocked" >
- <property name="text" >
+ <item row="6" column="0" colspan="2">
+ <widget class="QCheckBox" name="cbxAttributeTableDocked">
+ <property name="text">
<string>Open attribute table in a dock window</string>
</property>
</widget>
</item>
- <item row="7" column="0" colspan="2" >
- <widget class="QCheckBox" name="cbxAddPostgisDC" >
- <property name="text" >
+ <item row="7" column="0" colspan="2">
+ <widget class="QCheckBox" name="cbxAddPostgisDC">
+ <property name="text">
<string>Add PostGIS layers with double click and select in extended mode</string>
</property>
</widget>
@@ -243,57 +244,57 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabRendering" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabRendering">
+ <attribute name="title">
<string>&Rendering and SVG</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="groupBox_5" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox_5">
+ <property name="title">
<string>Rendering behavior</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QCheckBox" name="chkAddedVisibility" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkAddedVisibility">
+ <property name="text">
<string>By default new la&yers added to the map should be displayed</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1_6" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_6">
+ <property name="text">
<string>Number of features to draw before updating the display</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>spinBoxUpdateThreshold</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QSpinBox" name="spinBoxUpdateThreshold" >
- <property name="toolTip" >
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spinBoxUpdateThreshold">
+ <property name="toolTip">
<string>Map display will be updated (drawn) after this many features have been read from the data source</string>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>1000000</number>
</property>
- <property name="value" >
+ <property name="value">
<number>1000</number>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
- <string><b>Note:</b> Use zero to prevent display updates until all features have been rendered</string>
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
+ <string><b>Note:</b> Use zero to prevent display updates until all features have been rendered</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
- <widget class="QCheckBox" name="chkUseRenderCaching" >
- <property name="text" >
+ <item row="3" column="0" colspan="2">
+ <widget class="QCheckBox" name="chkUseRenderCaching">
+ <property name="text">
<string>Use render caching where possible to speed up redraws</string>
</property>
</widget>
@@ -301,28 +302,28 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupBox_8" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_8">
+ <property name="title">
<string>Rendering quality</string>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
+ <layout class="QVBoxLayout">
+ <property name="margin">
<number>11</number>
</property>
<item>
- <widget class="QCheckBox" name="chkAntiAliasing" >
- <property name="text" >
+ <widget class="QCheckBox" name="chkAntiAliasing">
+ <property name="text">
<string>Make lines appear less jagged at the expense of some drawing performance</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="chkUseQPixmap" >
- <property name="toolTip" >
+ <widget class="QCheckBox" name="chkUseQPixmap">
+ <property name="toolTip">
<string>Selecting this will unselect the 'make lines less' jagged toggle</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Fix problems with incorrectly filled polygons</string>
</property>
</widget>
@@ -330,25 +331,25 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
<string>SVG paths</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="mSVGLabel" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mSVGLabel">
+ <property name="text">
<string>Path(s) to search for Scalable Vector Graphic (SVG) symbols</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
+ <item row="0" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>31</width>
<height>20</height>
@@ -356,92 +357,92 @@
</property>
</spacer>
</item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="mBtnAddSVGPath" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QPushButton" name="mBtnAddSVGPath">
+ <property name="text">
<string>Add</string>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QPushButton" name="mBtnRemoveSVGPath" >
- <property name="text" >
+ <item row="0" column="3">
+ <widget class="QPushButton" name="mBtnRemoveSVGPath">
+ <property name="text">
<string>Remove</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="4" >
- <widget class="QListWidget" name="mListSVGPaths" />
+ <item row="1" column="0" colspan="4">
+ <widget class="QListWidget" name="mListSVGPaths"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabMap" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabMap">
+ <attribute name="title">
<string>&Map tools</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="groupBox_10" >
- <property name="title" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="groupBox_10">
+ <property name="title">
<string>Panning and zooming</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cmbWheelAction" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cmbWheelAction">
<item>
- <property name="text" >
+ <property name="text">
<string>Zoom</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Zoom and recenter</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Zoom to mouse cursor</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Nothing</string>
</property>
</item>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>Zoom factor</string>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Mouse wheel action</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QDoubleSpinBox" name="spinZoomFactor" >
- <property name="decimals" >
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinZoomFactor">
+ <property name="decimals">
<number>1</number>
</property>
- <property name="minimum" >
+ <property name="minimum">
<double>1.100000000000000</double>
</property>
- <property name="value" >
+ <property name="value">
<double>2.000000000000000</double>
</property>
</widget>
@@ -449,21 +450,21 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupBox_6" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_6">
+ <property name="title">
<string>Measure tool</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="1" column="2" >
+ <item row="1" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>191</width>
<height>20</height>
@@ -471,59 +472,59 @@
</property>
</spacer>
</item>
- <item row="1" column="1" >
- <widget class="QgsColorButton" name="pbnMeasureColour" >
- <property name="minimumSize" >
+ <item row="1" column="1">
+ <widget class="QgsColorButton" name="pbnMeasureColour">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2" >
- <widget class="QComboBox" name="cmbEllipsoid" />
+ <item row="0" column="1" colspan="2">
+ <widget class="QComboBox" name="cmbEllipsoid"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1_10" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_10">
+ <property name="text">
<string>Rubberband color</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>cmbEllipsoid</cstring>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1_8" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_8">
+ <property name="text">
<string>Ellipsoid for distance calculations</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>cmbEllipsoid</cstring>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel1_11" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel1_11">
+ <property name="text">
<string>Preferred measurements units</string>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QRadioButton" name="radMeters" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="QRadioButton" name="radMeters">
+ <property name="text">
<string>Meters</string>
</property>
</widget>
</item>
- <item row="2" column="2" >
- <widget class="QRadioButton" name="radFeet" >
- <property name="text" >
+ <item row="2" column="2">
+ <widget class="QRadioButton" name="radFeet">
+ <property name="text">
<string>Feet</string>
</property>
</widget>
@@ -531,57 +532,57 @@
</layout>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="groupBox_7" >
- <property name="title" >
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox_7">
+ <property name="title">
<string>Identify</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="2" column="0" colspan="2" >
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
- <string><b>Note:</b> Specify the search radius as a percentage of the map width</string>
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
+ <string><b>Note:</b> Specify the search radius as a percentage of the map width</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1_3" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel1_3">
+ <property name="text">
<string>Search radius for identifying features and displaying map tips</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>spinBoxIdentifyValue</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QDoubleSpinBox" name="spinBoxIdentifyValue" >
- <property name="suffix" >
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinBoxIdentifyValue">
+ <property name="suffix">
<string>%</string>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>100.000000000000000</double>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<double>0.010000000000000</double>
</property>
- <property name="value" >
+ <property name="value">
<double>5.000000000000000</double>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cmbIdentifyMode" />
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cmbIdentifyMode"/>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_4" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
<string>Mode</string>
</property>
</widget>
@@ -589,12 +590,12 @@
</layout>
</widget>
</item>
- <item row="3" column="0" >
+ <item row="3" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -604,36 +605,36 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="mOverlayTab" >
- <attribute name="title" >
+ <widget class="QWidget" name="mOverlayTab">
+ <attribute name="title">
<string>Overlay</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="mPositionGroupBox" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="mPositionGroupBox">
+ <property name="title">
<string>Position</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="mAlgorithmLabel" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mAlgorithmLabel">
+ <property name="text">
<string>Placement algorithm:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mOverlayAlgorithmComboBox</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="mOverlayAlgorithmComboBox" />
+ <item row="0" column="1">
+ <widget class="QComboBox" name="mOverlayAlgorithmComboBox"/>
</item>
- <item row="0" column="2" >
+ <item row="0" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>221</width>
<height>20</height>
@@ -644,12 +645,12 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
+ <item row="1" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -659,56 +660,56 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabDigitizing" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabDigitizing">
+ <attribute name="title">
<string>Digitizing</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="mRubberBandGroupBox" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="mRubberBandGroupBox">
+ <property name="title">
<string>Rubberband</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="mLineWidthTextLabel" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mLineWidthTextLabel">
+ <property name="text">
<string>Line width</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mLineWidthSpinBox</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QSpinBox" name="mLineWidthSpinBox" >
- <property name="toolTip" >
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="mLineWidthSpinBox">
+ <property name="toolTip">
<string>Line width in pixels</string>
</property>
- <property name="minimum" >
+ <property name="minimum">
<number>1</number>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="mLineColourTextLabel" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="mLineColourTextLabel">
+ <property name="text">
<string>Line colour</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mLineColourToolButton</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QgsColorButton" name="mLineColourToolButton" >
- <property name="minimumSize" >
+ <item row="1" column="1">
+ <widget class="QgsColorButton" name="mLineColourToolButton">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
@@ -716,28 +717,28 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="mSnappingGroupBox" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="mSnappingGroupBox">
+ <property name="title">
<string>Snapping</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="mDefaultSnapModeLabel" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mDefaultSnapModeLabel">
+ <property name="text">
<string>Default snap mode</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mDefaultSnapModeComboBox</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" colspan="3" >
+ <item row="0" column="1" colspan="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>311</width>
<height>20</height>
@@ -745,32 +746,32 @@
</property>
</spacer>
</item>
- <item row="0" column="4" colspan="2" >
- <widget class="QComboBox" name="mDefaultSnapModeComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="0" column="4" colspan="2">
+ <widget class="QComboBox" name="mDefaultSnapModeComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QLabel" name="mDefaultSnappingToleranceTextLabel" >
- <property name="text" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QLabel" name="mDefaultSnappingToleranceTextLabel">
+ <property name="text">
<string>Default snapping tolerance</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mDefaultSnappingToleranceSpinBox</cstring>
</property>
</widget>
</item>
- <item row="1" column="2" colspan="2" >
+ <item row="1" column="2" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>241</width>
<height>20</height>
@@ -778,32 +779,32 @@
</property>
</spacer>
</item>
- <item row="1" column="4" >
- <widget class="QDoubleSpinBox" name="mDefaultSnappingToleranceSpinBox" >
- <property name="decimals" >
+ <item row="1" column="4">
+ <widget class="QDoubleSpinBox" name="mDefaultSnappingToleranceSpinBox">
+ <property name="decimals">
<number>5</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>99999999.989999994635582</double>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3" >
- <widget class="QLabel" name="mVertexSearchRadiusVertexEditLabel" >
- <property name="text" >
+ <item row="2" column="0" colspan="3">
+ <widget class="QLabel" name="mVertexSearchRadiusVertexEditLabel">
+ <property name="text">
<string>Search radius for vertex edits</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mSearchRadiusVertexEditSpinBox</cstring>
</property>
</widget>
</item>
- <item row="2" column="3" >
+ <item row="2" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>61</width>
<height>20</height>
@@ -811,45 +812,45 @@
</property>
</spacer>
</item>
- <item row="2" column="4" >
- <widget class="QDoubleSpinBox" name="mSearchRadiusVertexEditSpinBox" >
- <property name="decimals" >
+ <item row="2" column="4">
+ <widget class="QDoubleSpinBox" name="mSearchRadiusVertexEditSpinBox">
+ <property name="decimals">
<number>5</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<double>99999999.989999994635582</double>
</property>
</widget>
</item>
- <item row="1" column="5" >
- <widget class="QComboBox" name="mDefaultSnappingToleranceComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="1" column="5">
+ <widget class="QComboBox" name="mDefaultSnappingToleranceComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
- <property name="text" >
+ <property name="text">
<string>map units</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>pixels</string>
</property>
</item>
</widget>
</item>
- <item row="2" column="5" >
- <widget class="QComboBox" name="mSearchRadiusVertexEditComboBox" >
+ <item row="2" column="5">
+ <widget class="QComboBox" name="mSearchRadiusVertexEditComboBox">
<item>
- <property name="text" >
+ <property name="text">
<string>map units</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>pixels</string>
</property>
</item>
@@ -858,35 +859,35 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="mVertexMarkerGroupBox" >
- <property name="title" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="mVertexMarkerGroupBox">
+ <property name="title">
<string>Vertex markers</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QCheckBox" name="mMarkersOnlyForSelectedCheckBox" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="mMarkersOnlyForSelectedCheckBox">
+ <property name="text">
<string>Show markers only for selected features</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="mMarkerStyleLabel" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="mMarkerStyleLabel">
+ <property name="text">
<string>Marker style</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mMarkerStyleComboBox</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
+ <item row="1" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>281</width>
<height>20</height>
@@ -894,45 +895,45 @@
</property>
</spacer>
</item>
- <item row="1" column="2" >
- <widget class="QComboBox" name="mMarkerStyleComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="1" column="2">
+ <widget class="QComboBox" name="mMarkerStyleComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="2" column="2" >
- <widget class="QSpinBox" name="mMarkerSizeSpinBox" >
- <property name="layoutDirection" >
+ <item row="2" column="2">
+ <widget class="QSpinBox" name="mMarkerSizeSpinBox">
+ <property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
- <property name="minimum" >
+ <property name="minimum">
<number>3</number>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<number>2</number>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_6" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
<string>Marker size</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mMarkerSizeSpinBox</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" >
+ <item row="2" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -943,18 +944,18 @@
</layout>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QGroupBox" name="mEnterAttributeValuesGroupBox" >
- <property name="title" >
+ <item row="3" column="0">
+ <widget class="QGroupBox" name="mEnterAttributeValuesGroupBox">
+ <property name="title">
<string>Enter attribute values</string>
</property>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QCheckBox" name="chkDisableAttributeValuesDlg" >
- <property name="text" >
+ <widget class="QCheckBox" name="chkDisableAttributeValuesDlg">
+ <property name="text">
<string>Suppress attributes pop-up windows after each created feature</string>
</property>
- <property name="tristate" >
+ <property name="tristate">
<bool>false</bool>
</property>
</widget>
@@ -962,12 +963,12 @@
</layout>
</widget>
</item>
- <item row="4" column="0" >
+ <item row="4" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>547</width>
<height>71</height>
@@ -977,20 +978,20 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabCRS" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabCRS">
+ <attribute name="title">
<string>CRS</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <item row="3" column="0" >
+ <item row="3" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>51</width>
<height>31</height>
@@ -998,42 +999,42 @@
</property>
</spacer>
</item>
- <item row="2" column="0" >
- <widget class="QPushButton" name="pbnSelectProjection" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QPushButton" name="pbnSelectProjection">
+ <property name="text">
<string>Select Global Default ...</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QTextBrowser" name="txtGlobalWkt" />
+ <item row="1" column="0">
+ <widget class="QTextBrowser" name="txtGlobalWkt"/>
</item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="grpProjectionBehaviour" >
- <property name="title" >
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="grpProjectionBehaviour">
+ <property name="title">
<string>When a new layer is created, or when a layer is loaded that has no coordinate reference system (CRS)</string>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
+ <layout class="QVBoxLayout">
+ <property name="margin">
<number>11</number>
</property>
<item>
- <widget class="QRadioButton" name="radPromptForProjection" >
- <property name="text" >
+ <widget class="QRadioButton" name="radPromptForProjection">
+ <property name="text">
<string>Prompt for CRS</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="radUseProjectProjection" >
- <property name="text" >
+ <widget class="QRadioButton" name="radUseProjectProjection">
+ <property name="text">
<string>Project wide default CRS will be used</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="radUseGlobalProjection" >
- <property name="text" >
+ <widget class="QRadioButton" name="radUseGlobalProjection">
+ <property name="text">
<string>Global default CRS displa&yed below will be used</string>
</property>
</widget>
@@ -1043,39 +1044,39 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabLocale" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabLocale">
+ <attribute name="title">
<string>Locale</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QGroupBox" name="grpLocale" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="grpLocale">
+ <property name="title">
<string>Override system locale</string>
</property>
- <property name="checkable" >
+ <property name="checkable">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label_5" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
<string>Locale to use instead</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>cboLocale</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cboLocale" />
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cboLocale"/>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QLabel" name="label_7" >
- <property name="text" >
- <string><b>Note:</b> Enabling / changing overide on local requires an application restart</string>
+ <item row="1" column="0" colspan="2">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string><b>Note:</b> Enabling / changing overide on local requires an application restart</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
@@ -1083,12 +1084,12 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
+ <item row="2" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>501</width>
<height>51</height>
@@ -1096,15 +1097,15 @@
</property>
</spacer>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupBox_12" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox_12">
+ <property name="title">
<string>Additional Info</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="lblSystemLocale" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="lblSystemLocale">
+ <property name="text">
<string>Detected active locale on your system:</string>
</property>
</widget>
@@ -1114,120 +1115,120 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
<string>Network and Proxy</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout_2" >
- <item row="0" column="0" >
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLabel" name="mNetworkTimeoutLabel" >
- <property name="text" >
+ <widget class="QLabel" name="mNetworkTimeoutLabel">
+ <property name="text">
<string>Timeout for network requests (ms):</string>
</property>
</widget>
</item>
<item>
- <widget class="QSpinBox" name="mNetworkTimeoutSpinBox" >
- <property name="maximum" >
+ <widget class="QSpinBox" name="mNetworkTimeoutSpinBox">
+ <property name="maximum">
<number>100000000</number>
</property>
</widget>
</item>
</layout>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="grpProxy" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="grpProxy">
+ <property name="title">
<string>Use proxy for web access</string>
</property>
- <property name="flat" >
+ <property name="flat">
<bool>false</bool>
</property>
- <property name="checkable" >
+ <property name="checkable">
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="lblProxyHost" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="lblProxyHost">
+ <property name="text">
<string>Host</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>leProxyHost</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" colspan="5" >
- <widget class="QLineEdit" name="leProxyHost" />
+ <item row="0" column="1" colspan="5">
+ <widget class="QLineEdit" name="leProxyHost"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="lblProxyPort" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="lblProxyPort">
+ <property name="text">
<string>Port</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>leProxyPort</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="5" >
- <widget class="QLineEdit" name="leProxyPort" />
+ <item row="1" column="1" colspan="5">
+ <widget class="QLineEdit" name="leProxyPort"/>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="lblUser" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="lblUser">
+ <property name="text">
<string>User</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>leProxyUser</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" colspan="5" >
- <widget class="QLineEdit" name="leProxyUser" >
- <property name="toolTip" >
+ <item row="2" column="1" colspan="5">
+ <widget class="QLineEdit" name="leProxyUser">
+ <property name="toolTip">
<string>Leave this blank if no proxy username / password are required</string>
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="lblPassword" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="lblPassword">
+ <property name="text">
<string>Password</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>leProxyPassword</cstring>
</property>
</widget>
</item>
- <item row="3" column="1" colspan="5" >
- <widget class="QLineEdit" name="leProxyPassword" >
- <property name="toolTip" >
+ <item row="3" column="1" colspan="5">
+ <widget class="QLineEdit" name="leProxyPassword">
+ <property name="toolTip">
<string>Leave this blank if no proxy username / password are required</string>
</property>
- <property name="echoMode" >
+ <property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
- <item row="4" column="0" >
- <widget class="QLabel" name="mTypeLabel" >
- <property name="text" >
+ <item row="4" column="0">
+ <widget class="QLabel" name="mTypeLabel">
+ <property name="text">
<string>Proxy type</string>
</property>
</widget>
</item>
- <item row="4" column="1" colspan="2" >
- <widget class="QComboBox" name="mProxyTypeComboBox" />
+ <item row="4" column="1" colspan="2">
+ <widget class="QComboBox" name="mProxyTypeComboBox"/>
</item>
- <item row="4" column="3" colspan="3" >
+ <item row="4" column="3" colspan="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>241</width>
<height>20</height>
@@ -1235,33 +1236,33 @@
</property>
</spacer>
</item>
- <item row="5" column="0" colspan="2" >
- <widget class="QLabel" name="mExcludeUrlsLabel" >
- <property name="text" >
+ <item row="5" column="0" colspan="2">
+ <widget class="QLabel" name="mExcludeUrlsLabel">
+ <property name="text">
<string>Exclude URLs (starting with):</string>
</property>
</widget>
</item>
- <item row="5" column="2" colspan="2" >
- <widget class="QPushButton" name="mAddUrlPushButton" >
- <property name="text" >
+ <item row="5" column="2" colspan="2">
+ <widget class="QPushButton" name="mAddUrlPushButton">
+ <property name="text">
<string>Add</string>
</property>
</widget>
</item>
- <item row="5" column="4" >
- <widget class="QPushButton" name="mRemoveUrlPushButton" >
- <property name="text" >
+ <item row="5" column="4">
+ <widget class="QPushButton" name="mRemoveUrlPushButton">
+ <property name="text">
<string>Remove</string>
</property>
</widget>
</item>
- <item row="5" column="5" >
+ <item row="5" column="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>391</width>
<height>20</height>
@@ -1269,8 +1270,8 @@
</property>
</spacer>
</item>
- <item row="6" column="0" colspan="6" >
- <widget class="QListWidget" name="mExcludeUrlListWidget" />
+ <item row="6" column="0" colspan="6">
+ <widget class="QListWidget" name="mExcludeUrlListWidget"/>
</item>
</layout>
</widget>
@@ -1281,7 +1282,7 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
More information about the QGIS-commit
mailing list