Skip to content

Commit 7de1303

Browse files
author
borysiasty
committedMar 6, 2011
FEATURE: Select default CRS for new projects. Fixes #363
git-svn-id: http://svn.osgeo.org/qgis/trunk@15374 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 54e4a9f commit 7de1303

File tree

4 files changed

+218
-131
lines changed

4 files changed

+218
-131
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3282,27 +3282,29 @@ void QgisApp::fileNew( bool thePromptToSaveFlag )
32823282
mMapCanvas->refresh();
32833283
mMapCanvas->clearExtentHistory();
32843284

3285+
// set project CRS
3286+
QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
3287+
QString projString = settings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
3288+
QgsCoordinateReferenceSystem srs;
3289+
srs.createFromProj4( projString );
3290+
myRenderer->setDestinationSrs( srs );
3291+
// write the projections _proj string_ to project settings
3292+
prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
3293+
prj->dirty( false );
3294+
if ( srs.mapUnits() != QGis::UnknownUnit )
3295+
{
3296+
myRenderer->setMapUnits( srs.mapUnits() );
3297+
}
3298+
32853299
// enable OTF CRS transformation if necessary
32863300
if ( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() )
32873301
{
3288-
QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
3289-
QString projString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
3290-
QgsCoordinateReferenceSystem srs;
3291-
srs.createFromProj4( projString );
32923302
myRenderer->setProjectionsEnabled( true );
3293-
myRenderer->setDestinationSrs( srs );
3294-
// write the projections _proj string_ to project settings
3295-
prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
3296-
prj->dirty( false );
3297-
if ( srs.mapUnits() != QGis::UnknownUnit )
3298-
{
3299-
myRenderer->setMapUnits( srs.mapUnits() );
3300-
}
33013303
mOnTheFlyProjectionStatusButton->setIcon( getThemeIcon( "mIconProjectionEnabled.png" ) );
33023304
}
33033305
else
33043306
{
3305-
mMapCanvas->mapRenderer()->setProjectionsEnabled( false );
3307+
myRenderer->setProjectionsEnabled( false );
33063308
}
33073309

33083310
// set the initial map tool
@@ -5582,25 +5584,26 @@ void QgisApp::options()
55825584
double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
55835585
mMapCanvas->setWheelAction(( QgsMapCanvas::WheelAction ) action, zoomFactor );
55845586

5587+
// set project CRS
5588+
QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
5589+
QString projString = mySettings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
5590+
QgsCoordinateReferenceSystem srs;
5591+
srs.createFromProj4( projString );
5592+
myRenderer->setDestinationSrs( srs );
5593+
// write the projections _proj string_ to project settings
5594+
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
5595+
if ( srs.mapUnits() != QGis::UnknownUnit )
5596+
{
5597+
myRenderer->setMapUnits( srs.mapUnits() );
5598+
}
5599+
55855600
//apply OTF CRS transformation if necessary
55865601
if ( mySettings.value( "/Projections/otfTransformEnabled", 0 ).toBool() )
55875602
{
5588-
QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
5589-
QString projString = mySettings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
5590-
QgsCoordinateReferenceSystem srs;
5591-
srs.createFromProj4( projString );
55925603
myRenderer->setProjectionsEnabled( true );
5593-
myRenderer->setDestinationSrs( srs );
5594-
// write the projections _proj string_ to project settings
5595-
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
5596-
if ( srs.mapUnits() != QGis::UnknownUnit )
5597-
{
5598-
myRenderer->setMapUnits( srs.mapUnits() );
5599-
}
56005604
}
56015605
else
56025606
{
5603-
QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
56045607
myRenderer->setProjectionsEnabled( false );
56055608
}
56065609
mMapCanvas->refresh();

‎src/app/qgsoptions.cpp

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,18 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
188188
{
189189
radUseGlobalProjection->setChecked( true );
190190
}
191-
QString myGlobalCrsString = settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString();
192-
mGlobalCrs.createFromProj4( myGlobalCrsString );
191+
QString myLayerDefaultCrsString = settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString();
192+
mLayerDefaultCrs.createFromProj4( myLayerDefaultCrsString );
193193
//display the crs as friendly text rather than in wkt
194-
leGlobalCRS->setText( mGlobalCrs.authid() + " - " + mGlobalCrs.description() );
194+
leLayerGlobalCrs->setText( mLayerDefaultCrs.authid() + " - " + mLayerDefaultCrs.description() );
195195

196196
//on the fly CRS transformation settings
197-
grpOtfTransform->setChecked( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
198-
QString myDefaultCrsString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
197+
chkOtfTransform->setChecked( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
198+
199+
QString myDefaultCrsString = settings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
199200
mDefaultCrs.createFromProj4( myDefaultCrsString );
200201
//display the crs as friendly text rather than in wkt
201-
leGlobalOtfProjString->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
202+
leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
202203

203204
// populate combo box with ellipsoids
204205
getEllipsoidList();
@@ -638,11 +639,11 @@ void QgsOptions::saveOptions()
638639
settings.setValue( "/Projections/defaultBehaviour", "useGlobal" );
639640
}
640641

641-
settings.setValue( "/Projections/defaultProjectionString", mGlobalCrs.toProj4() );
642+
settings.setValue( "/Projections/defaultProjectionString", mLayerDefaultCrs.toProj4() );
642643

643644
// save 'on the fly' CRS transformation settings
644-
settings.setValue( "/Projections/otfTransformEnabled", grpOtfTransform->isChecked() );
645-
settings.setValue( "/Projections/defaultOTFProjectionString", mDefaultCrs.toProj4() );
645+
settings.setValue( "/Projections/otfTransformEnabled", chkOtfTransform->isChecked() );
646+
settings.setValue( "/Projections/projectDefaultProjectionString", mDefaultCrs.toProj4() );
646647

647648
settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
648649

@@ -751,19 +752,21 @@ void QgsOptions::on_pbnSelectProjection_clicked()
751752
{
752753
QSettings settings;
753754
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
754-
mySelector->setSelectedCrsId( mGlobalCrs.srsid() );
755+
756+
//find out crs id of current proj4 string
757+
mySelector->setSelectedCrsId( mLayerDefaultCrs.srsid() );
755758

756759
if ( mySelector->exec() )
757760
{
758-
mGlobalCrs.createFromProj4( mySelector->selectedProj4String() );
759-
leGlobalCRS->setText( mySelector->selectedProj4String() );
760-
leGlobalCRS->setText( mGlobalCrs.authid() + " - " +
761-
mGlobalCrs.description() );
762-
QgsDebugMsg( QString( "------ Global Default Projection Selection set to ----------\n%1" ).arg( leGlobalCRS->text() ) );
761+
mLayerDefaultCrs.createFromProj4( mySelector->selectedProj4String() );
762+
QgsDebugMsg( QString( "Setting default project CRS to : %1").arg( mySelector->selectedProj4String() ) );
763+
leLayerGlobalCrs->setText( mLayerDefaultCrs.authid() + " - " +
764+
mLayerDefaultCrs.description() );
765+
QgsDebugMsg( QString( "------ Global Layer Default Projection Selection set to ----------\n%1" ).arg( leLayerGlobalCrs->text() ) );
763766
}
764767
else
765768
{
766-
QgsDebugMsg( "------ Global Default Projection Selection change cancelled ----------" );
769+
QgsDebugMsg( "------ Global Layer Default Projection Selection change cancelled ----------" );
767770
QApplication::restoreOverrideCursor();
768771
}
769772

@@ -773,15 +776,17 @@ void QgsOptions::on_pbnSelectOtfProjection_clicked()
773776
{
774777
QSettings settings;
775778
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
779+
780+
//find out crs id of current proj4 string
776781
mySelector->setSelectedCrsId( mDefaultCrs.srsid() );
777782

778783
if ( mySelector->exec() )
779784
{
780785
mDefaultCrs.createFromProj4( mySelector->selectedProj4String() );
781786
QgsDebugMsg( QString( "Setting default project CRS to : %1").arg( mySelector->selectedProj4String() ) );
782-
leGlobalOtfProjString->setText( mDefaultCrs.authid() + " - " +
787+
leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " +
783788
mDefaultCrs.description() );
784-
QgsDebugMsg( QString( "------ Global OTF Projection Selection set to ----------\n%1" ).arg( leGlobalOtfProjString->text() ) );
789+
QgsDebugMsg( QString( "------ Global OTF Projection Selection set to ----------\n%1" ).arg( leProjectGlobalCrs->text() ) );
785790
}
786791
else
787792
{

‎src/app/qgsoptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
131131
private:
132132
QStringList i18nList();
133133
QgsCoordinateReferenceSystem mDefaultCrs;
134-
QgsCoordinateReferenceSystem mGlobalCrs;
134+
QgsCoordinateReferenceSystem mLayerDefaultCrs;
135135
};
136136

137137
#endif // #ifndef QGSOPTIONS_H

‎src/ui/qgsoptionsbase.ui

Lines changed: 166 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>804</width>
10-
<height>567</height>
9+
<width>825</width>
10+
<height>503</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -20,7 +20,7 @@
2020
<bool>true</bool>
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout_3">
23-
<item row="1" column="0">
23+
<item row="3" column="0">
2424
<widget class="QDialogButtonBox" name="buttonBox">
2525
<property name="orientation">
2626
<enum>Qt::Horizontal</enum>
@@ -30,10 +30,10 @@
3030
</property>
3131
</widget>
3232
</item>
33-
<item row="0" column="0">
33+
<item row="2" column="0">
3434
<widget class="QTabWidget" name="tabWidget">
3535
<property name="currentIndex">
36-
<number>5</number>
36+
<number>0</number>
3737
</property>
3838
<property name="iconSize">
3939
<size>
@@ -60,8 +60,8 @@
6060
<rect>
6161
<x>0</x>
6262
<y>0</y>
63-
<width>745</width>
64-
<height>831</height>
63+
<width>780</width>
64+
<height>755</height>
6565
</rect>
6666
</property>
6767
<layout class="QGridLayout" name="gridLayout_12">
@@ -499,8 +499,8 @@
499499
<rect>
500500
<x>0</x>
501501
<y>0</y>
502-
<width>745</width>
503-
<height>473</height>
502+
<width>780</width>
503+
<height>433</height>
504504
</rect>
505505
</property>
506506
<layout class="QGridLayout" name="gridLayout_8">
@@ -670,8 +670,8 @@
670670
<rect>
671671
<x>0</x>
672672
<y>0</y>
673-
<width>745</width>
674-
<height>473</height>
673+
<width>780</width>
674+
<height>456</height>
675675
</rect>
676676
</property>
677677
<layout class="QGridLayout" name="gridLayout_4">
@@ -950,8 +950,8 @@
950950
<rect>
951951
<x>0</x>
952952
<y>0</y>
953-
<width>762</width>
954-
<height>458</height>
953+
<width>795</width>
954+
<height>415</height>
955955
</rect>
956956
</property>
957957
<layout class="QGridLayout" name="gridLayout_10">
@@ -1025,8 +1025,8 @@
10251025
<rect>
10261026
<x>0</x>
10271027
<y>0</y>
1028-
<width>762</width>
1029-
<height>458</height>
1028+
<width>795</width>
1029+
<height>415</height>
10301030
</rect>
10311031
</property>
10321032
<layout class="QGridLayout" name="gridLayout_13">
@@ -1355,18 +1355,86 @@
13551355
<rect>
13561356
<x>0</x>
13571357
<y>0</y>
1358-
<width>762</width>
1359-
<height>458</height>
1358+
<width>795</width>
1359+
<height>415</height>
13601360
</rect>
13611361
</property>
1362-
<layout class="QGridLayout" name="gridLayout_22">
1362+
<layout class="QGridLayout" name="gridLayout_15">
13631363
<item row="0" column="0">
1364+
<widget class="QGroupBox" name="grpOtfTransform">
1365+
<property name="sizePolicy">
1366+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
1367+
<horstretch>0</horstretch>
1368+
<verstretch>0</verstretch>
1369+
</sizepolicy>
1370+
</property>
1371+
<property name="title">
1372+
<string>Default Coordinate Reference System for new projects</string>
1373+
</property>
1374+
<property name="checkable">
1375+
<bool>false</bool>
1376+
</property>
1377+
<layout class="QGridLayout" name="gridLayout_22">
1378+
<item row="1" column="0">
1379+
<widget class="QLineEdit" name="leProjectGlobalCrs">
1380+
<property name="readOnly">
1381+
<bool>true</bool>
1382+
</property>
1383+
</widget>
1384+
</item>
1385+
<item row="3" column="0">
1386+
<widget class="QCheckBox" name="chkOtfTransform">
1387+
<property name="text">
1388+
<string>Enable 'on the &amp;fly' reprojection by defaut</string>
1389+
</property>
1390+
</widget>
1391+
</item>
1392+
<item row="1" column="1">
1393+
<widget class="QPushButton" name="pbnSelectOtfProjection">
1394+
<property name="text">
1395+
<string>Select...</string>
1396+
</property>
1397+
</widget>
1398+
</item>
1399+
<item row="4" column="0" colspan="2">
1400+
<spacer name="verticalSpacer">
1401+
<property name="orientation">
1402+
<enum>Qt::Vertical</enum>
1403+
</property>
1404+
<property name="sizeHint" stdset="0">
1405+
<size>
1406+
<width>20</width>
1407+
<height>40</height>
1408+
</size>
1409+
</property>
1410+
</spacer>
1411+
</item>
1412+
<item row="0" column="0">
1413+
<widget class="QLabel" name="label_16">
1414+
<property name="text">
1415+
<string>Always start new projects with this CRS</string>
1416+
</property>
1417+
<property name="buddy">
1418+
<cstring>leProjectGlobalCrs</cstring>
1419+
</property>
1420+
</widget>
1421+
</item>
1422+
</layout>
1423+
</widget>
1424+
</item>
1425+
<item row="1" column="0">
13641426
<widget class="QGroupBox" name="grpProjectionBehaviour">
1427+
<property name="sizePolicy">
1428+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
1429+
<horstretch>0</horstretch>
1430+
<verstretch>1</verstretch>
1431+
</sizepolicy>
1432+
</property>
13651433
<property name="title">
1366-
<string>Default Coordinate Reference System</string>
1434+
<string>Coordinate Reference System for new layers</string>
13671435
</property>
13681436
<layout class="QGridLayout" name="gridLayout">
1369-
<item row="0" column="0">
1437+
<item row="0" column="0" colspan="3">
13701438
<widget class="QLabel" name="label_8">
13711439
<property name="text">
13721440
<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 @@
13791447
<item row="1" column="0">
13801448
<widget class="QRadioButton" name="radPromptForProjection">
13811449
<property name="text">
1382-
<string>Prompt for CRS</string>
1450+
<string>Prompt for &amp;CRS</string>
13831451
</property>
13841452
</widget>
13851453
</item>
13861454
<item row="2" column="0">
13871455
<widget class="QRadioButton" name="radUseProjectProjection">
13881456
<property name="text">
1389-
<string>Project wide default CRS will be used</string>
1457+
<string>Use &amp;project CRS</string>
13901458
</property>
13911459
</widget>
13921460
</item>
13931461
<item row="3" column="0">
13941462
<widget class="QRadioButton" name="radUseGlobalProjection">
13951463
<property name="text">
1396-
<string>Global default CRS displa&amp;yed below will be used</string>
1464+
<string>Use default CRS displa&amp;yed below</string>
13971465
</property>
13981466
</widget>
13991467
</item>
14001468
<item row="4" column="0">
1401-
<layout class="QHBoxLayout" name="horizontalLayout_9">
1402-
<item>
1403-
<widget class="QLineEdit" name="leGlobalCRS">
1404-
<property name="readOnly">
1405-
<bool>true</bool>
1406-
</property>
1407-
</widget>
1408-
</item>
1409-
<item>
1410-
<widget class="QPushButton" name="pbnSelectProjection">
1411-
<property name="text">
1412-
<string>Select ...</string>
1413-
</property>
1414-
</widget>
1415-
</item>
1416-
</layout>
1469+
<widget class="QLineEdit" name="leLayerGlobalCrs">
1470+
<property name="readOnly">
1471+
<bool>true</bool>
1472+
</property>
1473+
</widget>
14171474
</item>
1418-
</layout>
1419-
</widget>
1420-
</item>
1421-
<item row="1" column="0">
1422-
<widget class="QGroupBox" name="grpOtfTransform">
1423-
<property name="title">
1424-
<string>Enable 'on the fly' reprojection by defaul</string>
1425-
</property>
1426-
<property name="checkable">
1427-
<bool>true</bool>
1428-
</property>
1429-
<layout class="QGridLayout" name="gridLayout_15">
1430-
<item row="0" column="0">
1431-
<widget class="QLabel" name="label_16">
1475+
<item row="4" column="1">
1476+
<widget class="QPushButton" name="pbnSelectProjection">
14321477
<property name="text">
1433-
<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>
1434-
</property>
1435-
<property name="wordWrap">
1436-
<bool>true</bool>
1478+
<string>Select...</string>
14371479
</property>
14381480
</widget>
14391481
</item>
1440-
<item row="1" column="0">
1441-
<layout class="QHBoxLayout" name="horizontalLayout_10">
1442-
<item>
1443-
<widget class="QLineEdit" name="leGlobalOtfProjString">
1444-
<property name="readOnly">
1445-
<bool>true</bool>
1446-
</property>
1447-
</widget>
1448-
</item>
1449-
<item>
1450-
<widget class="QPushButton" name="pbnSelectOtfProjection">
1451-
<property name="text">
1452-
<string>Select ...</string>
1453-
</property>
1454-
</widget>
1455-
</item>
1456-
</layout>
1482+
<item row="5" column="1">
1483+
<spacer name="verticalSpacer_2">
1484+
<property name="orientation">
1485+
<enum>Qt::Vertical</enum>
1486+
</property>
1487+
<property name="sizeType">
1488+
<enum>QSizePolicy::Expanding</enum>
1489+
</property>
1490+
<property name="sizeHint" stdset="0">
1491+
<size>
1492+
<width>20</width>
1493+
<height>10</height>
1494+
</size>
1495+
</property>
1496+
</spacer>
14571497
</item>
14581498
</layout>
14591499
</widget>
@@ -1483,8 +1523,8 @@
14831523
<rect>
14841524
<x>0</x>
14851525
<y>0</y>
1486-
<width>745</width>
1487-
<height>542</height>
1526+
<width>780</width>
1527+
<height>527</height>
14881528
</rect>
14891529
</property>
14901530
<layout class="QGridLayout" name="gridLayout_17">
@@ -1574,8 +1614,8 @@
15741614
<rect>
15751615
<x>0</x>
15761616
<y>0</y>
1577-
<width>745</width>
1578-
<height>533</height>
1617+
<width>780</width>
1618+
<height>461</height>
15791619
</rect>
15801620
</property>
15811621
<layout class="QGridLayout" name="gridLayout_20">
@@ -1805,59 +1845,98 @@
18051845
</customwidgets>
18061846
<tabstops>
18071847
<tabstop>tabWidget</tabstop>
1848+
<tabstop>scrollArea_2</tabstop>
18081849
<tabstop>chbAskToSaveProjectChanges</tabstop>
18091850
<tabstop>chbWarnOldProjectVersion</tabstop>
18101851
<tabstop>pbnSelectionColor</tabstop>
18111852
<tabstop>pbnCanvasColor</tabstop>
18121853
<tabstop>cmbTheme</tabstop>
1854+
<tabstop>cmbSize</tabstop>
1855+
<tabstop>cmbLegendDoubleClickAction</tabstop>
18131856
<tabstop>capitaliseCheckBox</tabstop>
18141857
<tabstop>cbxLegendClassifiers</tabstop>
1858+
<tabstop>cbxCreateRasterLegendIcons</tabstop>
18151859
<tabstop>cbxHideSplash</tabstop>
1860+
<tabstop>cbxShowTips</tabstop>
18161861
<tabstop>cbxIdentifyResultsDocked</tabstop>
1862+
<tabstop>cbxSnappingOptionsDocked</tabstop>
18171863
<tabstop>cbxAttributeTableDocked</tabstop>
18181864
<tabstop>cbxAddPostgisDC</tabstop>
1865+
<tabstop>cbxAddNewLayersToCurrentGroup</tabstop>
1866+
<tabstop>cmbAttrTableBehaviour</tabstop>
1867+
<tabstop>leNullValue</tabstop>
1868+
<tabstop>mListPluginPaths</tabstop>
1869+
<tabstop>mBtnAddPluginPath</tabstop>
1870+
<tabstop>mBtnRemovePluginPath</tabstop>
1871+
<tabstop>buttonBox</tabstop>
1872+
<tabstop>scrollArea_3</tabstop>
18191873
<tabstop>chkAddedVisibility</tabstop>
18201874
<tabstop>spinBoxUpdateThreshold</tabstop>
18211875
<tabstop>chkUseRenderCaching</tabstop>
18221876
<tabstop>chkAntiAliasing</tabstop>
18231877
<tabstop>chkUseQPixmap</tabstop>
1878+
<tabstop>chkUseSymbologyNG</tabstop>
1879+
<tabstop>mListSVGPaths</tabstop>
18241880
<tabstop>mBtnAddSVGPath</tabstop>
18251881
<tabstop>mBtnRemoveSVGPath</tabstop>
1826-
<tabstop>mListSVGPaths</tabstop>
1882+
<tabstop>scrollArea</tabstop>
18271883
<tabstop>cmbIdentifyMode</tabstop>
1884+
<tabstop>cbxAutoFeatureForm</tabstop>
18281885
<tabstop>spinBoxIdentifyValue</tabstop>
18291886
<tabstop>cmbEllipsoid</tabstop>
18301887
<tabstop>pbnMeasureColor</tabstop>
1888+
<tabstop>mDecimalPlacesSpinBox</tabstop>
1889+
<tabstop>mKeepBaseUnitCheckBox</tabstop>
18311890
<tabstop>radMeters</tabstop>
18321891
<tabstop>radFeet</tabstop>
1892+
<tabstop>mDegreesRadioButton</tabstop>
1893+
<tabstop>mRadiansRadioButton</tabstop>
1894+
<tabstop>mGonRadioButton</tabstop>
18331895
<tabstop>cmbWheelAction</tabstop>
18341896
<tabstop>spinZoomFactor</tabstop>
1897+
<tabstop>scrollArea_4</tabstop>
18351898
<tabstop>mOverlayAlgorithmComboBox</tabstop>
1899+
<tabstop>scrollArea_5</tabstop>
18361900
<tabstop>mLineWidthSpinBox</tabstop>
18371901
<tabstop>mLineColorToolButton</tabstop>
18381902
<tabstop>mDefaultSnapModeComboBox</tabstop>
18391903
<tabstop>mDefaultSnappingToleranceSpinBox</tabstop>
18401904
<tabstop>mDefaultSnappingToleranceComboBox</tabstop>
18411905
<tabstop>mSearchRadiusVertexEditSpinBox</tabstop>
18421906
<tabstop>mSearchRadiusVertexEditComboBox</tabstop>
1843-
<tabstop>mMarkersOnlyForSelectedCheckBox</tabstop>
18441907
<tabstop>mMarkerStyleComboBox</tabstop>
18451908
<tabstop>mMarkerSizeSpinBox</tabstop>
1909+
<tabstop>chkReuseLastValues</tabstop>
18461910
<tabstop>chkDisableAttributeValuesDlg</tabstop>
1911+
<tabstop>scrollArea_6</tabstop>
1912+
<tabstop>pbnSelectOtfProjection</tabstop>
1913+
<tabstop>leProjectGlobalCrs</tabstop>
1914+
<tabstop>chkOtfTransform</tabstop>
18471915
<tabstop>radPromptForProjection</tabstop>
18481916
<tabstop>radUseProjectProjection</tabstop>
18491917
<tabstop>radUseGlobalProjection</tabstop>
1918+
<tabstop>leLayerGlobalCrs</tabstop>
18501919
<tabstop>pbnSelectProjection</tabstop>
1920+
<tabstop>scrollArea_7</tabstop>
18511921
<tabstop>grpLocale</tabstop>
18521922
<tabstop>cboLocale</tabstop>
1853-
<tabstop>mNetworkTimeoutSpinBox</tabstop>
1854-
<tabstop>grpProxy</tabstop>
18551923
<tabstop>leProxyHost</tabstop>
18561924
<tabstop>leProxyPort</tabstop>
18571925
<tabstop>leProxyUser</tabstop>
18581926
<tabstop>leProxyPassword</tabstop>
18591927
<tabstop>mProxyTypeComboBox</tabstop>
1860-
<tabstop>buttonBox</tabstop>
1928+
<tabstop>mExcludeUrlListWidget</tabstop>
1929+
<tabstop>mAddUrlPushButton</tabstop>
1930+
<tabstop>mRemoveUrlPushButton</tabstop>
1931+
<tabstop>mCacheDirectory</tabstop>
1932+
<tabstop>mBrowseCacheDirectory</tabstop>
1933+
<tabstop>mCacheSize</tabstop>
1934+
<tabstop>mClearCache</tabstop>
1935+
<tabstop>leWmsSearch</tabstop>
1936+
<tabstop>mNetworkTimeoutSpinBox</tabstop>
1937+
<tabstop>mMarkersOnlyForSelectedCheckBox</tabstop>
1938+
<tabstop>grpProxy</tabstop>
1939+
<tabstop>scrollArea_8</tabstop>
18611940
</tabstops>
18621941
<resources>
18631942
<include location="../../images/images.qrc"/>
@@ -1870,8 +1949,8 @@
18701949
<slot>reject()</slot>
18711950
<hints>
18721951
<hint type="sourcelabel">
1873-
<x>190</x>
1874-
<y>532</y>
1952+
<x>194</x>
1953+
<y>465</y>
18751954
</hint>
18761955
<hint type="destinationlabel">
18771956
<x>730</x>
@@ -1886,8 +1965,8 @@
18861965
<slot>accept()</slot>
18871966
<hints>
18881967
<hint type="sourcelabel">
1889-
<x>190</x>
1890-
<y>532</y>
1968+
<x>194</x>
1969+
<y>465</y>
18911970
</hint>
18921971
<hint type="destinationlabel">
18931972
<x>731</x>

0 commit comments

Comments
 (0)
Please sign in to comment.