[QGIS Commit] r15374 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Mar 6 15:38:36 EST 2011
Author: borysiasty
Date: 2011-03-06 12:38:36 -0800 (Sun, 06 Mar 2011)
New Revision: 15374
Modified:
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgsoptions.cpp
trunk/qgis/src/app/qgsoptions.h
trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
FEATURE: Select default CRS for new projects. Fixes #363
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2011-03-06 19:57:01 UTC (rev 15373)
+++ trunk/qgis/src/app/qgisapp.cpp 2011-03-06 20:38:36 UTC (rev 15374)
@@ -3282,27 +3282,29 @@
mMapCanvas->refresh();
mMapCanvas->clearExtentHistory();
+ // set project CRS
+ QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
+ QString projString = settings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
+ QgsCoordinateReferenceSystem srs;
+ srs.createFromProj4( projString );
+ myRenderer->setDestinationSrs( srs );
+ // write the projections _proj string_ to project settings
+ prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
+ prj->dirty( false );
+ if ( srs.mapUnits() != QGis::UnknownUnit )
+ {
+ myRenderer->setMapUnits( srs.mapUnits() );
+ }
+
// enable OTF CRS transformation if necessary
if ( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() )
{
- QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
- QString projString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
- QgsCoordinateReferenceSystem srs;
- srs.createFromProj4( projString );
myRenderer->setProjectionsEnabled( true );
- myRenderer->setDestinationSrs( srs );
- // write the projections _proj string_ to project settings
- prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
- prj->dirty( false );
- if ( srs.mapUnits() != QGis::UnknownUnit )
- {
- myRenderer->setMapUnits( srs.mapUnits() );
- }
mOnTheFlyProjectionStatusButton->setIcon( getThemeIcon( "mIconProjectionEnabled.png" ) );
}
else
{
- mMapCanvas->mapRenderer()->setProjectionsEnabled( false );
+ myRenderer->setProjectionsEnabled( false );
}
// set the initial map tool
@@ -5582,25 +5584,26 @@
double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
mMapCanvas->setWheelAction(( QgsMapCanvas::WheelAction ) action, zoomFactor );
+ // set project CRS
+ QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
+ QString projString = mySettings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
+ QgsCoordinateReferenceSystem srs;
+ srs.createFromProj4( projString );
+ myRenderer->setDestinationSrs( srs );
+ // write the projections _proj string_ to project settings
+ QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
+ if ( srs.mapUnits() != QGis::UnknownUnit )
+ {
+ myRenderer->setMapUnits( srs.mapUnits() );
+ }
+
//apply OTF CRS transformation if necessary
if ( mySettings.value( "/Projections/otfTransformEnabled", 0 ).toBool() )
{
- QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
- QString projString = mySettings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
- QgsCoordinateReferenceSystem srs;
- srs.createFromProj4( projString );
myRenderer->setProjectionsEnabled( true );
- myRenderer->setDestinationSrs( srs );
- // write the projections _proj string_ to project settings
- QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
- if ( srs.mapUnits() != QGis::UnknownUnit )
- {
- myRenderer->setMapUnits( srs.mapUnits() );
- }
}
else
{
- QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
myRenderer->setProjectionsEnabled( false );
}
mMapCanvas->refresh();
Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp 2011-03-06 19:57:01 UTC (rev 15373)
+++ trunk/qgis/src/app/qgsoptions.cpp 2011-03-06 20:38:36 UTC (rev 15374)
@@ -188,17 +188,18 @@
{
radUseGlobalProjection->setChecked( true );
}
- QString myGlobalCrsString = settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString();
- mGlobalCrs.createFromProj4( myGlobalCrsString );
+ QString myLayerDefaultCrsString = settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString();
+ mLayerDefaultCrs.createFromProj4( myLayerDefaultCrsString );
//display the crs as friendly text rather than in wkt
- leGlobalCRS->setText( mGlobalCrs.authid() + " - " + mGlobalCrs.description() );
+ leLayerGlobalCrs->setText( mLayerDefaultCrs.authid() + " - " + mLayerDefaultCrs.description() );
//on the fly CRS transformation settings
- grpOtfTransform->setChecked( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
- QString myDefaultCrsString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
+ chkOtfTransform->setChecked( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
+
+ QString myDefaultCrsString = settings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
mDefaultCrs.createFromProj4( myDefaultCrsString );
//display the crs as friendly text rather than in wkt
- leGlobalOtfProjString->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
+ leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
// populate combo box with ellipsoids
getEllipsoidList();
@@ -638,11 +639,11 @@
settings.setValue( "/Projections/defaultBehaviour", "useGlobal" );
}
- settings.setValue( "/Projections/defaultProjectionString", mGlobalCrs.toProj4() );
+ settings.setValue( "/Projections/defaultProjectionString", mLayerDefaultCrs.toProj4() );
// save 'on the fly' CRS transformation settings
- settings.setValue( "/Projections/otfTransformEnabled", grpOtfTransform->isChecked() );
- settings.setValue( "/Projections/defaultOTFProjectionString", mDefaultCrs.toProj4() );
+ settings.setValue( "/Projections/otfTransformEnabled", chkOtfTransform->isChecked() );
+ settings.setValue( "/Projections/projectDefaultProjectionString", mDefaultCrs.toProj4() );
settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
@@ -751,19 +752,21 @@
{
QSettings settings;
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
- mySelector->setSelectedCrsId( mGlobalCrs.srsid() );
+ //find out crs id of current proj4 string
+ mySelector->setSelectedCrsId( mLayerDefaultCrs.srsid() );
+
if ( mySelector->exec() )
{
- mGlobalCrs.createFromProj4( mySelector->selectedProj4String() );
- leGlobalCRS->setText( mySelector->selectedProj4String() );
- leGlobalCRS->setText( mGlobalCrs.authid() + " - " +
- mGlobalCrs.description() );
- QgsDebugMsg( QString( "------ Global Default Projection Selection set to ----------\n%1" ).arg( leGlobalCRS->text() ) );
+ mLayerDefaultCrs.createFromProj4( mySelector->selectedProj4String() );
+ QgsDebugMsg( QString( "Setting default project CRS to : %1").arg( mySelector->selectedProj4String() ) );
+ leLayerGlobalCrs->setText( mLayerDefaultCrs.authid() + " - " +
+ mLayerDefaultCrs.description() );
+ QgsDebugMsg( QString( "------ Global Layer Default Projection Selection set to ----------\n%1" ).arg( leLayerGlobalCrs->text() ) );
}
else
{
- QgsDebugMsg( "------ Global Default Projection Selection change cancelled ----------" );
+ QgsDebugMsg( "------ Global Layer Default Projection Selection change cancelled ----------" );
QApplication::restoreOverrideCursor();
}
@@ -773,15 +776,17 @@
{
QSettings settings;
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
+
+ //find out crs id of current proj4 string
mySelector->setSelectedCrsId( mDefaultCrs.srsid() );
if ( mySelector->exec() )
{
mDefaultCrs.createFromProj4( mySelector->selectedProj4String() );
QgsDebugMsg( QString( "Setting default project CRS to : %1").arg( mySelector->selectedProj4String() ) );
- leGlobalOtfProjString->setText( mDefaultCrs.authid() + " - " +
+ leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " +
mDefaultCrs.description() );
- QgsDebugMsg( QString( "------ Global OTF Projection Selection set to ----------\n%1" ).arg( leGlobalOtfProjString->text() ) );
+ QgsDebugMsg( QString( "------ Global OTF Projection Selection set to ----------\n%1" ).arg( leProjectGlobalCrs->text() ) );
}
else
{
Modified: trunk/qgis/src/app/qgsoptions.h
===================================================================
--- trunk/qgis/src/app/qgsoptions.h 2011-03-06 19:57:01 UTC (rev 15373)
+++ trunk/qgis/src/app/qgsoptions.h 2011-03-06 20:38:36 UTC (rev 15374)
@@ -131,7 +131,7 @@
private:
QStringList i18nList();
QgsCoordinateReferenceSystem mDefaultCrs;
- QgsCoordinateReferenceSystem mGlobalCrs;
+ QgsCoordinateReferenceSystem mLayerDefaultCrs;
};
#endif // #ifndef QGSOPTIONS_H
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2011-03-06 19:57:01 UTC (rev 15373)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2011-03-06 20:38:36 UTC (rev 15374)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>804</width>
- <height>567</height>
+ <width>825</width>
+ <height>503</height>
</rect>
</property>
<property name="windowTitle">
@@ -20,7 +20,7 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="0">
+ <item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -30,10 +30,10 @@
</property>
</widget>
</item>
- <item row="0" column="0">
+ <item row="2" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>5</number>
+ <number>0</number>
</property>
<property name="iconSize">
<size>
@@ -60,8 +60,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>745</width>
- <height>831</height>
+ <width>780</width>
+ <height>755</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
@@ -499,8 +499,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>745</width>
- <height>473</height>
+ <width>780</width>
+ <height>433</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
@@ -670,8 +670,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>745</width>
- <height>473</height>
+ <width>780</width>
+ <height>456</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4">
@@ -950,8 +950,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>762</width>
- <height>458</height>
+ <width>795</width>
+ <height>415</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_10">
@@ -1025,8 +1025,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>762</width>
- <height>458</height>
+ <width>795</width>
+ <height>415</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_13">
@@ -1355,18 +1355,86 @@
<rect>
<x>0</x>
<y>0</y>
- <width>762</width>
- <height>458</height>
+ <width>795</width>
+ <height>415</height>
</rect>
</property>
- <layout class="QGridLayout" name="gridLayout_22">
+ <layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="0">
+ <widget class="QGroupBox" name="grpOtfTransform">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Default Coordinate Reference System for new projects</string>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_22">
+ <item row="1" column="0">
+ <widget class="QLineEdit" name="leProjectGlobalCrs">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="chkOtfTransform">
+ <property name="text">
+ <string>Enable 'on the &fly' reprojection by defaut</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="pbnSelectOtfProjection">
+ <property name="text">
+ <string>Select...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_16">
+ <property name="text">
+ <string>Always start new projects with this CRS</string>
+ </property>
+ <property name="buddy">
+ <cstring>leProjectGlobalCrs</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
<widget class="QGroupBox" name="grpProjectionBehaviour">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
<property name="title">
- <string>Default Coordinate Reference System</string>
+ <string>Coordinate Reference System for new layers</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
+ <item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_8">
<property name="text">
<string>When a new layer is created, or when a layer is loaded that has no Coordinate Reference System (CRS)</string>
@@ -1379,81 +1447,53 @@
<item row="1" column="0">
<widget class="QRadioButton" name="radPromptForProjection">
<property name="text">
- <string>Prompt for CRS</string>
+ <string>Prompt for &CRS</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="radUseProjectProjection">
<property name="text">
- <string>Project wide default CRS will be used</string>
+ <string>Use &project CRS</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QRadioButton" name="radUseGlobalProjection">
<property name="text">
- <string>Global default CRS displa&yed below will be used</string>
+ <string>Use default CRS displa&yed below</string>
</property>
</widget>
</item>
<item row="4" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <item>
- <widget class="QLineEdit" name="leGlobalCRS">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnSelectProjection">
- <property name="text">
- <string>Select ...</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLineEdit" name="leLayerGlobalCrs">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QGroupBox" name="grpOtfTransform">
- <property name="title">
- <string>Enable 'on the fly' reprojection by defaul</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_15">
- <item row="0" column="0">
- <widget class="QLabel" name="label_16">
+ <item row="4" column="1">
+ <widget class="QPushButton" name="pbnSelectProjection">
<property name="text">
- <string>When this option is enabled, any new project you create will have 'on the fly' projection enabled by default and the CRS below will be used for the project.</string>
+ <string>Select...</string>
</property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
</widget>
</item>
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_10">
- <item>
- <widget class="QLineEdit" name="leGlobalOtfProjString">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnSelectOtfProjection">
- <property name="text">
- <string>Select ...</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="5" column="1">
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>10</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</widget>
@@ -1483,8 +1523,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>745</width>
- <height>542</height>
+ <width>780</width>
+ <height>527</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_17">
@@ -1574,8 +1614,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>745</width>
- <height>533</height>
+ <width>780</width>
+ <height>461</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_20">
@@ -1805,34 +1845,58 @@
</customwidgets>
<tabstops>
<tabstop>tabWidget</tabstop>
+ <tabstop>scrollArea_2</tabstop>
<tabstop>chbAskToSaveProjectChanges</tabstop>
<tabstop>chbWarnOldProjectVersion</tabstop>
<tabstop>pbnSelectionColor</tabstop>
<tabstop>pbnCanvasColor</tabstop>
<tabstop>cmbTheme</tabstop>
+ <tabstop>cmbSize</tabstop>
+ <tabstop>cmbLegendDoubleClickAction</tabstop>
<tabstop>capitaliseCheckBox</tabstop>
<tabstop>cbxLegendClassifiers</tabstop>
+ <tabstop>cbxCreateRasterLegendIcons</tabstop>
<tabstop>cbxHideSplash</tabstop>
+ <tabstop>cbxShowTips</tabstop>
<tabstop>cbxIdentifyResultsDocked</tabstop>
+ <tabstop>cbxSnappingOptionsDocked</tabstop>
<tabstop>cbxAttributeTableDocked</tabstop>
<tabstop>cbxAddPostgisDC</tabstop>
+ <tabstop>cbxAddNewLayersToCurrentGroup</tabstop>
+ <tabstop>cmbAttrTableBehaviour</tabstop>
+ <tabstop>leNullValue</tabstop>
+ <tabstop>mListPluginPaths</tabstop>
+ <tabstop>mBtnAddPluginPath</tabstop>
+ <tabstop>mBtnRemovePluginPath</tabstop>
+ <tabstop>buttonBox</tabstop>
+ <tabstop>scrollArea_3</tabstop>
<tabstop>chkAddedVisibility</tabstop>
<tabstop>spinBoxUpdateThreshold</tabstop>
<tabstop>chkUseRenderCaching</tabstop>
<tabstop>chkAntiAliasing</tabstop>
<tabstop>chkUseQPixmap</tabstop>
+ <tabstop>chkUseSymbologyNG</tabstop>
+ <tabstop>mListSVGPaths</tabstop>
<tabstop>mBtnAddSVGPath</tabstop>
<tabstop>mBtnRemoveSVGPath</tabstop>
- <tabstop>mListSVGPaths</tabstop>
+ <tabstop>scrollArea</tabstop>
<tabstop>cmbIdentifyMode</tabstop>
+ <tabstop>cbxAutoFeatureForm</tabstop>
<tabstop>spinBoxIdentifyValue</tabstop>
<tabstop>cmbEllipsoid</tabstop>
<tabstop>pbnMeasureColor</tabstop>
+ <tabstop>mDecimalPlacesSpinBox</tabstop>
+ <tabstop>mKeepBaseUnitCheckBox</tabstop>
<tabstop>radMeters</tabstop>
<tabstop>radFeet</tabstop>
+ <tabstop>mDegreesRadioButton</tabstop>
+ <tabstop>mRadiansRadioButton</tabstop>
+ <tabstop>mGonRadioButton</tabstop>
<tabstop>cmbWheelAction</tabstop>
<tabstop>spinZoomFactor</tabstop>
+ <tabstop>scrollArea_4</tabstop>
<tabstop>mOverlayAlgorithmComboBox</tabstop>
+ <tabstop>scrollArea_5</tabstop>
<tabstop>mLineWidthSpinBox</tabstop>
<tabstop>mLineColorToolButton</tabstop>
<tabstop>mDefaultSnapModeComboBox</tabstop>
@@ -1840,24 +1904,39 @@
<tabstop>mDefaultSnappingToleranceComboBox</tabstop>
<tabstop>mSearchRadiusVertexEditSpinBox</tabstop>
<tabstop>mSearchRadiusVertexEditComboBox</tabstop>
- <tabstop>mMarkersOnlyForSelectedCheckBox</tabstop>
<tabstop>mMarkerStyleComboBox</tabstop>
<tabstop>mMarkerSizeSpinBox</tabstop>
+ <tabstop>chkReuseLastValues</tabstop>
<tabstop>chkDisableAttributeValuesDlg</tabstop>
+ <tabstop>scrollArea_6</tabstop>
+ <tabstop>pbnSelectOtfProjection</tabstop>
+ <tabstop>leProjectGlobalCrs</tabstop>
+ <tabstop>chkOtfTransform</tabstop>
<tabstop>radPromptForProjection</tabstop>
<tabstop>radUseProjectProjection</tabstop>
<tabstop>radUseGlobalProjection</tabstop>
+ <tabstop>leLayerGlobalCrs</tabstop>
<tabstop>pbnSelectProjection</tabstop>
+ <tabstop>scrollArea_7</tabstop>
<tabstop>grpLocale</tabstop>
<tabstop>cboLocale</tabstop>
- <tabstop>mNetworkTimeoutSpinBox</tabstop>
- <tabstop>grpProxy</tabstop>
<tabstop>leProxyHost</tabstop>
<tabstop>leProxyPort</tabstop>
<tabstop>leProxyUser</tabstop>
<tabstop>leProxyPassword</tabstop>
<tabstop>mProxyTypeComboBox</tabstop>
- <tabstop>buttonBox</tabstop>
+ <tabstop>mExcludeUrlListWidget</tabstop>
+ <tabstop>mAddUrlPushButton</tabstop>
+ <tabstop>mRemoveUrlPushButton</tabstop>
+ <tabstop>mCacheDirectory</tabstop>
+ <tabstop>mBrowseCacheDirectory</tabstop>
+ <tabstop>mCacheSize</tabstop>
+ <tabstop>mClearCache</tabstop>
+ <tabstop>leWmsSearch</tabstop>
+ <tabstop>mNetworkTimeoutSpinBox</tabstop>
+ <tabstop>mMarkersOnlyForSelectedCheckBox</tabstop>
+ <tabstop>grpProxy</tabstop>
+ <tabstop>scrollArea_8</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
@@ -1870,8 +1949,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>190</x>
- <y>532</y>
+ <x>194</x>
+ <y>465</y>
</hint>
<hint type="destinationlabel">
<x>730</x>
@@ -1886,8 +1965,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>190</x>
- <y>532</y>
+ <x>194</x>
+ <y>465</y>
</hint>
<hint type="destinationlabel">
<x>731</x>
More information about the QGIS-commit
mailing list