Skip to content

Commit 1a46c40

Browse files
nyalldawsonnyalldawson
committedJan 6, 2015
Port a bunch of CRS selectors across to QgsProjectionSelectionWidget
·
ltr-3_40archive/master_2
1 parent 7933847 commit 1a46c40

20 files changed

+400
-433
lines changed
 

‎python/gui/qgsnewmemorylayerdialog.sip

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ class QgsNewMemoryLayerDialog : QDialog
1818
/**Returns the selected geometry type*/
1919
QGis::WkbType selectedType() const;
2020

21-
/**Returns the selected crs id*/
22-
QString selectedCrsId() const;
21+
/**Returns the selected crs*/
22+
QgsCoordinateReferenceSystem crs() const;
2323

2424
/**Returns the layer name*/
2525
QString layerName() const;
2626

27-
protected slots:
28-
29-
void on_mChangeSrsButton_clicked();
3027
};

‎python/gui/qgsnewvectorlayerdialog.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class QgsNewVectorLayerDialog : QDialog
2727
void on_mAddAttributeButton_clicked();
2828
void on_mRemoveAttributeButton_clicked();
2929
void on_mTypeBox_currentIndexChanged( int index );
30-
void on_pbnChangeSpatialRefSys_clicked();
3130
void on_buttonBox_helpRequested();
3231
void nameChanged( QString );
3332
void selectionChanged();

‎python/gui/qgsprojectionselectionwidget.sip

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ class QgsProjectionSelectionWidget : QWidget
1414

1515
explicit QgsProjectionSelectionWidget( QWidget *parent /TransferThis/ = 0 );
1616

17+
/* Returns a pointer to the projection selector dialog used by the widget. Can be used
18+
* to modify how the projection selector dialog behaves.
19+
* @returns projection selector dialog
20+
*/
21+
QgsGenericProjectionSelector* dialog();
22+
23+
/* Returns a pointer to the line edit used by the widget
24+
* @returns CRS line edit
25+
*/
26+
QLineEdit* lineEdit();
27+
1728
/* Returns the currently selected CRS for the widget
1829
* @returns current CRS
1930
*/

‎src/app/ogr/qgsvectorlayersaveasdialog.cpp

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ void QgsVectorLayerSaveAsDialog::setup()
8181
mCRSSelection->addItems( QStringList() << tr( "Layer CRS" ) << tr( "Project CRS" ) << tr( "Selected CRS" ) );
8282

8383
QgsCoordinateReferenceSystem srs( mCRS, QgsCoordinateReferenceSystem::InternalCrsId );
84-
leCRS->setText( srs.description() );
84+
mCrsSelector->setCrs( srs );
85+
mCrsSelector->dialog()->setMessage( tr( "Select the coordinate reference system for the vector file. "
86+
"The data points will be transformed from the layer coordinate reference system." ) );
8587

8688
mEncodingComboBox->setCurrentIndex( idx );
8789
on_mFormatComboBox_currentIndexChanged( mFormatComboBox->currentIndex() );
@@ -186,7 +188,7 @@ void QgsVectorLayerSaveAsDialog::accept()
186188

187189
void QgsVectorLayerSaveAsDialog::on_mCRSSelection_currentIndexChanged( int idx )
188190
{
189-
leCRS->setEnabled( idx == 2 );
191+
mCrsSelector->lineEdit()->setEnabled( idx == 2 );
190192

191193
QgsCoordinateReferenceSystem crs;
192194
if ( mCRSSelection->currentIndex() == 0 )
@@ -302,25 +304,11 @@ void QgsVectorLayerSaveAsDialog::on_browseFilename_clicked()
302304
}
303305
}
304306

305-
void QgsVectorLayerSaveAsDialog::on_browseCRS_clicked()
307+
void QgsVectorLayerSaveAsDialog::on_mCrsSelector_crsChanged( QgsCoordinateReferenceSystem crs )
306308
{
307-
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector();
308-
if ( mCRS >= 0 )
309-
mySelector->setSelectedCrsId( mCRS );
310-
mySelector->setMessage( tr( "Select the coordinate reference system for the vector file. "
311-
"The data points will be transformed from the layer coordinate reference system." ) );
312-
313-
if ( mySelector->exec() )
314-
{
315-
QgsCoordinateReferenceSystem srs( mySelector->selectedCrsId(), QgsCoordinateReferenceSystem::InternalCrsId );
316-
mCRS = srs.srsid();
317-
leCRS->setText( srs.description() );
318-
mCRSSelection->setCurrentIndex( 2 );
319-
320-
mExtentGroupBox->setOutputCrs( srs );
321-
}
322-
323-
delete mySelector;
309+
mCRS = crs.srsid();
310+
mCRSSelection->setCurrentIndex( 2 );
311+
mExtentGroupBox->setOutputCrs( crs );
324312
}
325313

326314
QString QgsVectorLayerSaveAsDialog::filename() const

‎src/app/ogr/qgsvectorlayersaveasdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSav
7070
void on_leFilename_textChanged( const QString& text );
7171
void on_mCRSSelection_currentIndexChanged( int idx );
7272
void on_browseFilename_clicked();
73-
void on_browseCRS_clicked();
73+
void on_mCrsSelector_crsChanged( QgsCoordinateReferenceSystem crs );
7474
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
7575
void on_mSymbologyExportComboBox_currentIndexChanged( const QString& text );
7676
void accept();

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
198198

199199
QgsDebugMsg( "Setting crs to " + mRasterLayer->crs().toWkt() );
200200
QgsDebugMsg( "Setting crs to " + mRasterLayer->crs().authid() + " - " + mRasterLayer->crs().description() );
201-
leSpatialRefSys->setText( mRasterLayer->crs().authid() + " - " + mRasterLayer->crs().description() );
202-
leSpatialRefSys->setCursorPosition( 0 );
201+
mCrsSelector->setCrs( mRasterLayer->crs() );
203202

204203
// Set text for pyramid info box
205204
QString pyramidFormat( "<h2>%1</h2><p>%2 %3 %4</p><b><font color='red'><p>%5</p><p>%6</p>" );
@@ -1086,24 +1085,9 @@ void QgsRasterLayerProperties::on_pbnAddValuesManually_clicked()
10861085
tableTransparency->resizeRowsToContents();
10871086
}
10881087

1089-
void QgsRasterLayerProperties::on_pbnChangeSpatialRefSys_clicked()
1088+
void QgsRasterLayerProperties::on_mCrsSelector_crsChanged( QgsCoordinateReferenceSystem crs )
10901089
{
1091-
1092-
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
1093-
mySelector->setSelectedCrsId( mRasterLayer->crs().srsid() );
1094-
if ( mySelector->exec() )
1095-
{
1096-
QgsCoordinateReferenceSystem srs( mySelector->selectedCrsId(), QgsCoordinateReferenceSystem::InternalCrsId );
1097-
mRasterLayer->setCrs( srs );
1098-
}
1099-
else
1100-
{
1101-
QApplication::restoreOverrideCursor();
1102-
}
1103-
delete mySelector;
1104-
1105-
leSpatialRefSys->setText( mRasterLayer->crs().authid() + " - " + mRasterLayer->crs().description() );
1106-
leSpatialRefSys->setCursorPosition( 0 );
1090+
mRasterLayer->setCrs( crs );
11071091
}
11081092

11091093
void QgsRasterLayerProperties::on_pbnDefaultValues_clicked()

‎src/app/qgsrasterlayerproperties.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class APP_EXPORT QgsRasterLayerProperties : public QgsOptionsDialogBase, private
6565
void on_pbnAddValuesFromDisplay_clicked();
6666
/** \brief slot executed when user presses "Add Values Manually" button on the transparency page */
6767
void on_pbnAddValuesManually_clicked();
68-
/** Override the CRS specified when the layer was loaded */
69-
void on_pbnChangeSpatialRefSys_clicked();
68+
/** \brief slot executed when user changes the layer's CRS */
69+
void on_mCrsSelector_crsChanged( QgsCoordinateReferenceSystem crs );
7070
/** \brief slot executed when user wishes to reset noNoDataValue and transparencyTable to default value */
7171
void on_pbnDefaultValues_clicked();
7272
/** \brief slot executed when user wishes to export transparency values */

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
205205
}
206206
}
207207

208-
leSpatialRefSys->setText( layer->crs().authid() + " - " + layer->crs().description() );
209-
leSpatialRefSys->setCursorPosition( 0 );
208+
mCrsSelector->setCrs( layer->crs() );
210209

211210
//insert existing join info
212211
const QList< QgsVectorJoinInfo >& joins = layer->vectorJoins();
@@ -652,24 +651,9 @@ void QgsVectorLayerProperties::on_mLayerOrigNameLineEdit_textEdited( const QStri
652651
txtDisplayName->setText( layer->capitaliseLayerName( text ) );
653652
}
654653

655-
void QgsVectorLayerProperties::on_pbnChangeSpatialRefSys_clicked()
654+
void QgsVectorLayerProperties::on_mCrsSelector_crsChanged( QgsCoordinateReferenceSystem crs )
656655
{
657-
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
658-
mySelector->setMessage();
659-
mySelector->setSelectedCrsId( layer->crs().srsid() );
660-
if ( mySelector->exec() )
661-
{
662-
QgsCoordinateReferenceSystem srs( mySelector->selectedCrsId(), QgsCoordinateReferenceSystem::InternalCrsId );
663-
layer->setCrs( srs );
664-
}
665-
else
666-
{
667-
QApplication::restoreOverrideCursor();
668-
}
669-
delete mySelector;
670-
671-
leSpatialRefSys->setText( layer->crs().authid() + " - " + layer->crs().description() );
672-
leSpatialRefSys->setCursorPosition( 0 );
656+
layer->setCrs( crs );
673657
}
674658

675659
void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()

‎src/app/qgsvectorlayerproperties.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
103103

104104
void on_pbnQueryBuilder_clicked();
105105
void on_pbnIndex_clicked();
106-
void on_pbnChangeSpatialRefSys_clicked();
106+
void on_mCrsSelector_crsChanged( QgsCoordinateReferenceSystem crs );
107107
void on_pbnLoadDefaultStyle_clicked();
108108
void on_pbnSaveDefaultStyle_clicked();
109109
void on_pbnLoadStyle_clicked();

‎src/gui/qgsnewmemorylayerdialog.cpp

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "qgsapplication.h"
2020
#include "qgis.h"
2121
#include "qgscoordinatereferencesystem.h"
22-
#include "qgsgenericprojectionselector.h"
2322
#include "qgsproviderregistry.h"
2423
#include "qgsvectordataprovider.h"
2524

@@ -38,7 +37,7 @@ QgsVectorLayer *QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget *parent )
3837
}
3938

4039
QGis::WkbType geometrytype = dialog.selectedType();
41-
QString crsId = dialog.selectedCrsId();
40+
QString crsId = dialog.crs().authid();
4241

4342
QString geomType;
4443
switch ( geometrytype )
@@ -81,11 +80,10 @@ QgsNewMemoryLayerDialog::QgsNewMemoryLayerDialog( QWidget *parent, Qt::WindowFla
8180

8281
mPointRadioButton->setChecked( true );
8382

84-
QgsCoordinateReferenceSystem srs;
85-
srs.createFromOgcWmsCrs( settings.value( "/Projections/layerDefaultCrs", GEO_EPSG_CRS_AUTHID ).toString() );
86-
srs.validate();
87-
mCrsId = srs.authid();
88-
mSpatialRefSysEdit->setText( srs.authid() + " - " + srs.description() );
83+
QgsCoordinateReferenceSystem defaultCrs;
84+
defaultCrs.createFromOgcWmsCrs( settings.value( "/Projections/layerDefaultCrs", GEO_EPSG_CRS_AUTHID ).toString() );
85+
defaultCrs.validate();
86+
mCrsSelector->setCrs( defaultCrs );
8987

9088
mNameLineEdit->setText( tr( "New scratch layer" ) );
9189
}
@@ -125,29 +123,12 @@ QGis::WkbType QgsNewMemoryLayerDialog::selectedType() const
125123
return QGis::WKBUnknown;
126124
}
127125

128-
QString QgsNewMemoryLayerDialog::layerName() const
129-
{
130-
return mNameLineEdit->text();
131-
}
132-
133-
QString QgsNewMemoryLayerDialog::selectedCrsId() const
126+
QgsCoordinateReferenceSystem QgsNewMemoryLayerDialog::crs() const
134127
{
135-
return mCrsId;
128+
return mCrsSelector->crs();
136129
}
137130

138-
void QgsNewMemoryLayerDialog::on_mChangeSrsButton_clicked()
131+
QString QgsNewMemoryLayerDialog::layerName() const
139132
{
140-
QgsGenericProjectionSelector *selector = new QgsGenericProjectionSelector( this );
141-
selector->setMessage();
142-
selector->setSelectedAuthId( mCrsId );
143-
if ( selector->exec() )
144-
{
145-
mCrsId = selector->selectedAuthId();
146-
mSpatialRefSysEdit->setText( mCrsId );
147-
}
148-
else
149-
{
150-
QApplication::restoreOverrideCursor();
151-
}
152-
delete selector;
133+
return mNameLineEdit->text();
153134
}

‎src/gui/qgsnewmemorylayerdialog.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "qgisgui.h"
2222
#include "qgis.h"
2323
#include "qgsvectorlayer.h"
24+
#include "qgscoordinatereferencesystem.h"
2425

2526
class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemoryLayerDialogBase
2627
{
@@ -40,17 +41,14 @@ class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemo
4041
/**Returns the selected geometry type*/
4142
QGis::WkbType selectedType() const;
4243

43-
/**Returns the selected crs id*/
44-
QString selectedCrsId() const;
44+
/**Returns the selected crs*/
45+
QgsCoordinateReferenceSystem crs() const;
4546

4647
/**Returns the layer name*/
4748
QString layerName() const;
4849

49-
protected slots:
50-
51-
void on_mChangeSrsButton_clicked();
52-
5350
private:
51+
5452
QString mCrsId;
5553
};
5654

‎src/gui/qgsnewvectorlayerdialog.cpp

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "qgis.h"
2121
#include "qgslogger.h"
2222
#include "qgscoordinatereferencesystem.h"
23-
#include "qgsgenericprojectionselector.h"
2423
#include "qgsproviderregistry.h"
2524
#include "qgsvectordataprovider.h"
2625
#include "qgsvectorfilewriter.h"
@@ -85,13 +84,10 @@ QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, Qt::WindowFla
8584

8685
mAttributeView->addTopLevelItem( new QTreeWidgetItem( QStringList() << "id" << "Integer" << "10" << "" ) );
8786

88-
QgsCoordinateReferenceSystem srs;
89-
90-
srs.createFromOgcWmsCrs( settings.value( "/Projections/layerDefaultCrs", GEO_EPSG_CRS_AUTHID ).toString() );
91-
srs.validate();
92-
93-
mCrsId = srs.srsid();
94-
leSpatialRefSys->setText( srs.authid() + " - " + srs.description() );
87+
QgsCoordinateReferenceSystem defaultCrs;
88+
defaultCrs.createFromOgcWmsCrs( settings.value( "/Projections/layerDefaultCrs", GEO_EPSG_CRS_AUTHID ).toString() );
89+
defaultCrs.validate();
90+
mCrsSelector->setCrs( defaultCrs );
9591

9692
connect( mNameEdit, SIGNAL( textChanged( QString ) ), this, SLOT( nameChanged( QString ) ) );
9793
connect( mAttributeView, SIGNAL( itemSelectionChanged() ), this, SLOT( selectionChanged() ) );
@@ -166,7 +162,7 @@ QGis::WkbType QgsNewVectorLayerDialog::selectedType() const
166162

167163
int QgsNewVectorLayerDialog::selectedCrsId() const
168164
{
169-
return mCrsId;
165+
return mCrsSelector->crs().srsid();
170166
}
171167

172168
void QgsNewVectorLayerDialog::on_mAddAttributeButton_clicked()
@@ -193,25 +189,6 @@ void QgsNewVectorLayerDialog::on_mRemoveAttributeButton_clicked()
193189
}
194190
}
195191

196-
void QgsNewVectorLayerDialog::on_pbnChangeSpatialRefSys_clicked()
197-
{
198-
QgsGenericProjectionSelector *mySelector = new QgsGenericProjectionSelector( this );
199-
mySelector->setMessage();
200-
mySelector->setSelectedCrsId( mCrsId );
201-
if ( mySelector->exec() )
202-
{
203-
QgsCoordinateReferenceSystem srs;
204-
srs.createFromOgcWmsCrs( mySelector->selectedAuthId() );
205-
mCrsId = srs.srsid();
206-
leSpatialRefSys->setText( srs.authid() + " - " + srs.description() );
207-
}
208-
else
209-
{
210-
QApplication::restoreOverrideCursor();
211-
}
212-
delete mySelector;
213-
}
214-
215192
void QgsNewVectorLayerDialog::attributes( QList< QPair<QString, QString> >& at ) const
216193
{
217194
QTreeWidgetItemIterator it( mAttributeView );

‎src/gui/qgsnewvectorlayerdialog.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,12 @@ class GUI_EXPORT QgsNewVectorLayerDialog: public QDialog, private Ui::QgsNewVect
5151
void on_mRemoveAttributeButton_clicked();
5252
void on_mFileFormatComboBox_currentIndexChanged( int index );
5353
void on_mTypeBox_currentIndexChanged( int index );
54-
void on_pbnChangeSpatialRefSys_clicked();
5554
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
5655
void nameChanged( QString );
5756
void selectionChanged();
5857

5958
private:
6059
QPushButton *mOkButton;
61-
int mCrsId;
6260
};
6361

6462
#endif //qgsnewvectorlayerdialog_H

‎src/gui/qgsprojectionselectionwidget.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
QgsProjectionSelectionWidget::QgsProjectionSelectionWidget( QWidget *parent ) :
2424
QWidget( parent )
2525
{
26+
mDialog = new QgsGenericProjectionSelector( this );
27+
2628
QHBoxLayout* layout = new QHBoxLayout();
2729
layout->setContentsMargins( 0, 0, 0, 0 );
2830
layout->setSpacing( 0 );
@@ -34,6 +36,7 @@ QgsProjectionSelectionWidget::QgsProjectionSelectionWidget( QWidget *parent ) :
3436

3537
mButton = new QToolButton( this );
3638
mButton->setIcon( QgsApplication::getThemeIcon( "mActionSetProjection.svg" ) );
39+
mButton->setToolTip( tr( "Select CRS" ) );
3740
layout->addWidget( mButton );
3841

3942
setFocusPolicy( Qt::StrongFocus );
@@ -44,18 +47,16 @@ QgsProjectionSelectionWidget::QgsProjectionSelectionWidget( QWidget *parent ) :
4447

4548
void QgsProjectionSelectionWidget::selectCrs()
4649
{
47-
QgsGenericProjectionSelector* mySelector = new QgsGenericProjectionSelector( this );
48-
4950
//find out crs id of current proj4 string
5051
if ( mCrs.isValid() )
5152
{
52-
mySelector->setSelectedCrsId( mCrs.srsid() );
53+
mDialog->setSelectedCrsId( mCrs.srsid() );
5354
}
5455

55-
if ( mySelector->exec() )
56+
if ( mDialog->exec() )
5657
{
5758
QgsCoordinateReferenceSystem crs;
58-
crs.createFromOgcWmsCrs( mySelector->selectedAuthId() );
59+
crs.createFromOgcWmsCrs( mDialog->selectedAuthId() );
5960
setCrs( crs );
6061
emit crsChanged( crs );
6162
}

‎src/gui/qgsprojectionselectionwidget.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
#include "qgscoordinatereferencesystem.h"
2525

26+
class QgsGenericProjectionSelector;
27+
2628
/**
2729
* \class QgsProjectionSelectionWidget
2830
* \ingroup gui
@@ -35,6 +37,16 @@ class GUI_EXPORT QgsProjectionSelectionWidget : public QWidget
3537
public:
3638
explicit QgsProjectionSelectionWidget( QWidget *parent = 0 );
3739

40+
/* Returns a pointer to the projection selector dialog used by the widget
41+
* @returns projection selector dialog
42+
*/
43+
QgsGenericProjectionSelector* dialog() { return mDialog; }
44+
45+
/* Returns a pointer to the line edit used by the widget
46+
* @returns CRS line edit
47+
*/
48+
QLineEdit* lineEdit() { return mCrsLineEdit; }
49+
3850
/* Returns the currently selected CRS for the widget
3951
* @returns current CRS
4052
*/
@@ -61,6 +73,7 @@ class GUI_EXPORT QgsProjectionSelectionWidget : public QWidget
6173
QgsCoordinateReferenceSystem mCrs;
6274
QLineEdit* mCrsLineEdit;
6375
QToolButton* mButton;
76+
QgsGenericProjectionSelector* mDialog;
6477
};
6578

6679
#endif // QGSPROJECTIONSELECTIONWIDGET_H

‎src/ui/qgsnewmemorylayerdialogbase.ui

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>444</width>
10-
<height>255</height>
10+
<height>293</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -89,28 +89,11 @@
8989
</widget>
9090
</item>
9191
<item>
92-
<layout class="QHBoxLayout" name="horizontalLayout_3">
93-
<item>
94-
<widget class="QLineEdit" name="mSpatialRefSysEdit">
95-
<property name="readOnly">
96-
<bool>true</bool>
97-
</property>
98-
</widget>
99-
</item>
100-
<item>
101-
<widget class="QPushButton" name="mChangeSrsButton">
102-
<property name="toolTip">
103-
<string>Specify the coordinate reference system of the layer's geometry.</string>
104-
</property>
105-
<property name="whatsThis">
106-
<string>Specify the coordinate reference system of the layer's geometry.</string>
107-
</property>
108-
<property name="text">
109-
<string>Specify CRS</string>
110-
</property>
111-
</widget>
112-
</item>
113-
</layout>
92+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
93+
<property name="focusPolicy">
94+
<enum>Qt::StrongFocus</enum>
95+
</property>
96+
</widget>
11497
</item>
11598
<item>
11699
<widget class="QLabel" name="label_2">
@@ -151,6 +134,14 @@
151134
</layout>
152135
</widget>
153136
<layoutdefault spacing="6" margin="11"/>
137+
<customwidgets>
138+
<customwidget>
139+
<class>QgsProjectionSelectionWidget</class>
140+
<extends>QWidget</extends>
141+
<header location="global">qgsprojectionselectionwidget.h</header>
142+
<container>1</container>
143+
</customwidget>
144+
</customwidgets>
154145
<tabstops>
155146
<tabstop>mNameLineEdit</tabstop>
156147
<tabstop>mPointRadioButton</tabstop>
@@ -159,8 +150,7 @@
159150
<tabstop>mMultiPointRadioButton</tabstop>
160151
<tabstop>mMultiLineRadioButton</tabstop>
161152
<tabstop>mMultiPolygonRadioButton</tabstop>
162-
<tabstop>mSpatialRefSysEdit</tabstop>
163-
<tabstop>mChangeSrsButton</tabstop>
153+
<tabstop>mCrsSelector</tabstop>
164154
<tabstop>mButtonBox</tabstop>
165155
</tabstops>
166156
<resources/>

‎src/ui/qgsnewvectorlayerdialogbase.ui

Lines changed: 138 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>444</width>
10-
<height>543</height>
10+
<height>578</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -17,11 +17,51 @@
1717
<bool>true</bool>
1818
</property>
1919
<layout class="QGridLayout">
20-
<item row="9" column="0" colspan="2">
21-
<widget class="QLineEdit" name="leSpatialRefSys">
22-
<property name="readOnly">
20+
<item row="5" column="1" colspan="2">
21+
<widget class="QComboBox" name="mFileEncoding">
22+
<property name="enabled">
23+
<bool>true</bool>
24+
</property>
25+
</widget>
26+
</item>
27+
<item row="6" column="0">
28+
<widget class="QLabel" name="mFileFormatLabel">
29+
<property name="enabled">
2330
<bool>true</bool>
2431
</property>
32+
<property name="text">
33+
<string>File format</string>
34+
</property>
35+
<property name="buddy">
36+
<cstring>mFileFormatComboBox</cstring>
37+
</property>
38+
</widget>
39+
</item>
40+
<item row="6" column="1" colspan="2">
41+
<widget class="QComboBox" name="mFileFormatComboBox">
42+
<property name="enabled">
43+
<bool>true</bool>
44+
</property>
45+
</widget>
46+
</item>
47+
<item row="5" column="0">
48+
<widget class="QLabel" name="mFileFormatLabel_2">
49+
<property name="enabled">
50+
<bool>true</bool>
51+
</property>
52+
<property name="text">
53+
<string>File encoding</string>
54+
</property>
55+
<property name="buddy">
56+
<cstring>mFileFormatComboBox</cstring>
57+
</property>
58+
</widget>
59+
</item>
60+
<item row="9" column="0" colspan="3">
61+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
62+
<property name="focusPolicy">
63+
<enum>Qt::StrongFocus</enum>
64+
</property>
2565
</widget>
2666
</item>
2767
<item row="2" column="0" colspan="3">
@@ -54,90 +94,6 @@
5494
</layout>
5595
</widget>
5696
</item>
57-
<item row="12" column="0" colspan="3">
58-
<widget class="QGroupBox" name="groupBox_2">
59-
<property name="title">
60-
<string>Attributes list</string>
61-
</property>
62-
<layout class="QGridLayout">
63-
<item row="2" column="0" colspan="2">
64-
<widget class="QTreeWidget" name="mAttributeView">
65-
<property name="sizePolicy">
66-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
67-
<horstretch>0</horstretch>
68-
<verstretch>0</verstretch>
69-
</sizepolicy>
70-
</property>
71-
<property name="alternatingRowColors">
72-
<bool>true</bool>
73-
</property>
74-
<property name="rootIsDecorated">
75-
<bool>false</bool>
76-
</property>
77-
<property name="columnCount">
78-
<number>4</number>
79-
</property>
80-
<column>
81-
<property name="text">
82-
<string>Name</string>
83-
</property>
84-
</column>
85-
<column>
86-
<property name="text">
87-
<string>Type</string>
88-
</property>
89-
</column>
90-
<column>
91-
<property name="text">
92-
<string>Width</string>
93-
</property>
94-
</column>
95-
<column>
96-
<property name="text">
97-
<string>Precision</string>
98-
</property>
99-
</column>
100-
</widget>
101-
</item>
102-
<item row="3" column="0">
103-
<spacer>
104-
<property name="orientation">
105-
<enum>Qt::Horizontal</enum>
106-
</property>
107-
<property name="sizeHint" stdset="0">
108-
<size>
109-
<width>121</width>
110-
<height>20</height>
111-
</size>
112-
</property>
113-
</spacer>
114-
</item>
115-
<item row="3" column="1">
116-
<widget class="QToolButton" name="mRemoveAttributeButton">
117-
<property name="sizePolicy">
118-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
119-
<horstretch>0</horstretch>
120-
<verstretch>0</verstretch>
121-
</sizepolicy>
122-
</property>
123-
<property name="toolTip">
124-
<string>Delete selected attribute</string>
125-
</property>
126-
<property name="text">
127-
<string>Remove attribute</string>
128-
</property>
129-
<property name="icon">
130-
<iconset>
131-
<normaloff>../../images/themes/default/mActionDeleteAttribute.png</normaloff>../../images/themes/default/mActionDeleteAttribute.png</iconset>
132-
</property>
133-
<property name="toolButtonStyle">
134-
<enum>Qt::ToolButtonTextBesideIcon</enum>
135-
</property>
136-
</widget>
137-
</item>
138-
</layout>
139-
</widget>
140-
</item>
14197
<item row="14" column="0" colspan="3">
14298
<widget class="QDialogButtonBox" name="buttonBox">
14399
<property name="orientation">
@@ -148,32 +104,6 @@
148104
</property>
149105
</widget>
150106
</item>
151-
<item row="6" column="0">
152-
<widget class="QLabel" name="mFileFormatLabel">
153-
<property name="enabled">
154-
<bool>true</bool>
155-
</property>
156-
<property name="text">
157-
<string>File format</string>
158-
</property>
159-
<property name="buddy">
160-
<cstring>mFileFormatComboBox</cstring>
161-
</property>
162-
</widget>
163-
</item>
164-
<item row="5" column="0">
165-
<widget class="QLabel" name="mFileFormatLabel_2">
166-
<property name="enabled">
167-
<bool>true</bool>
168-
</property>
169-
<property name="text">
170-
<string>File encoding</string>
171-
</property>
172-
<property name="buddy">
173-
<cstring>mFileFormatComboBox</cstring>
174-
</property>
175-
</widget>
176-
</item>
177107
<item row="10" column="0" colspan="3">
178108
<widget class="QGroupBox" name="groupBox">
179109
<property name="title">
@@ -261,47 +191,115 @@
261191
</layout>
262192
</widget>
263193
</item>
264-
<item row="9" column="2">
265-
<widget class="QPushButton" name="pbnChangeSpatialRefSys">
266-
<property name="toolTip">
267-
<string>Specify the coordinate reference system of the layer's geometry.</string>
268-
</property>
269-
<property name="whatsThis">
270-
<string>Specify the coordinate reference system of the layer's geometry.</string>
271-
</property>
272-
<property name="text">
273-
<string>Specify CRS</string>
274-
</property>
275-
</widget>
276-
</item>
277-
<item row="5" column="1" colspan="2">
278-
<widget class="QComboBox" name="mFileEncoding">
279-
<property name="enabled">
280-
<bool>true</bool>
281-
</property>
282-
</widget>
283-
</item>
284-
<item row="6" column="1" colspan="2">
285-
<widget class="QComboBox" name="mFileFormatComboBox">
286-
<property name="enabled">
287-
<bool>true</bool>
194+
<item row="12" column="0" colspan="3">
195+
<widget class="QGroupBox" name="groupBox_2">
196+
<property name="title">
197+
<string>Attributes list</string>
288198
</property>
199+
<layout class="QGridLayout">
200+
<item row="2" column="0" colspan="2">
201+
<widget class="QTreeWidget" name="mAttributeView">
202+
<property name="sizePolicy">
203+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
204+
<horstretch>0</horstretch>
205+
<verstretch>0</verstretch>
206+
</sizepolicy>
207+
</property>
208+
<property name="alternatingRowColors">
209+
<bool>true</bool>
210+
</property>
211+
<property name="rootIsDecorated">
212+
<bool>false</bool>
213+
</property>
214+
<property name="columnCount">
215+
<number>4</number>
216+
</property>
217+
<column>
218+
<property name="text">
219+
<string>Name</string>
220+
</property>
221+
</column>
222+
<column>
223+
<property name="text">
224+
<string>Type</string>
225+
</property>
226+
</column>
227+
<column>
228+
<property name="text">
229+
<string>Width</string>
230+
</property>
231+
</column>
232+
<column>
233+
<property name="text">
234+
<string>Precision</string>
235+
</property>
236+
</column>
237+
</widget>
238+
</item>
239+
<item row="3" column="0">
240+
<spacer>
241+
<property name="orientation">
242+
<enum>Qt::Horizontal</enum>
243+
</property>
244+
<property name="sizeHint" stdset="0">
245+
<size>
246+
<width>121</width>
247+
<height>20</height>
248+
</size>
249+
</property>
250+
</spacer>
251+
</item>
252+
<item row="3" column="1">
253+
<widget class="QToolButton" name="mRemoveAttributeButton">
254+
<property name="sizePolicy">
255+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
256+
<horstretch>0</horstretch>
257+
<verstretch>0</verstretch>
258+
</sizepolicy>
259+
</property>
260+
<property name="toolTip">
261+
<string>Delete selected attribute</string>
262+
</property>
263+
<property name="text">
264+
<string>Remove attribute</string>
265+
</property>
266+
<property name="icon">
267+
<iconset>
268+
<normaloff>../../images/themes/default/mActionDeleteAttribute.png</normaloff>../../images/themes/default/mActionDeleteAttribute.png</iconset>
269+
</property>
270+
<property name="toolButtonStyle">
271+
<enum>Qt::ToolButtonTextBesideIcon</enum>
272+
</property>
273+
</widget>
274+
</item>
275+
</layout>
289276
</widget>
290277
</item>
291278
</layout>
292279
</widget>
293280
<layoutdefault spacing="6" margin="11"/>
281+
<customwidgets>
282+
<customwidget>
283+
<class>QgsProjectionSelectionWidget</class>
284+
<extends>QWidget</extends>
285+
<header location="global">qgsprojectionselectionwidget.h</header>
286+
<container>1</container>
287+
</customwidget>
288+
</customwidgets>
294289
<tabstops>
295290
<tabstop>mPointRadioButton</tabstop>
296291
<tabstop>mLineRadioButton</tabstop>
297292
<tabstop>mPolygonRadioButton</tabstop>
298-
<tabstop>leSpatialRefSys</tabstop>
299-
<tabstop>pbnChangeSpatialRefSys</tabstop>
293+
<tabstop>mFileEncoding</tabstop>
294+
<tabstop>mFileFormatComboBox</tabstop>
295+
<tabstop>mCrsSelector</tabstop>
300296
<tabstop>mNameEdit</tabstop>
301297
<tabstop>mTypeBox</tabstop>
302298
<tabstop>mWidth</tabstop>
303299
<tabstop>mPrecision</tabstop>
300+
<tabstop>mAddAttributeButton</tabstop>
304301
<tabstop>mAttributeView</tabstop>
302+
<tabstop>mRemoveAttributeButton</tabstop>
305303
<tabstop>buttonBox</tabstop>
306304
</tabstops>
307305
<resources/>

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 110 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
</sizepolicy>
183183
</property>
184184
<property name="currentIndex">
185-
<number>1</number>
185+
<number>0</number>
186186
</property>
187187
<widget class="QWidget" name="mOptsPage_General">
188188
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -203,7 +203,7 @@
203203
<x>0</x>
204204
<y>0</y>
205205
<width>615</width>
206-
<height>508</height>
206+
<height>509</height>
207207
</rect>
208208
</property>
209209
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -218,7 +218,7 @@
218218
<property name="title">
219219
<string>Layer info</string>
220220
</property>
221-
<property name="syncGroup">
221+
<property name="syncGroup" stdset="0">
222222
<string notr="true">rastergeneral</string>
223223
</property>
224224
<layout class="QGridLayout" name="gridLayout_4">
@@ -324,30 +324,14 @@
324324
<property name="title">
325325
<string>Coordinate reference system</string>
326326
</property>
327-
<property name="syncGroup">
327+
<property name="syncGroup" stdset="0">
328328
<string notr="true">rastergeneral</string>
329329
</property>
330-
<layout class="QGridLayout" name="_6">
331-
<property name="margin">
332-
<number>11</number>
333-
</property>
334-
<item row="0" column="1">
335-
<widget class="QPushButton" name="pbnChangeSpatialRefSys">
336-
<property name="toolTip">
337-
<string>Specify the coordinate reference system of the layer's geometry.</string>
338-
</property>
339-
<property name="whatsThis">
340-
<string>Specify the coordinate reference system of the layer's geometry.</string>
341-
</property>
342-
<property name="text">
343-
<string>Specify...</string>
344-
</property>
345-
</widget>
346-
</item>
347-
<item row="0" column="0">
348-
<widget class="QLineEdit" name="leSpatialRefSys">
349-
<property name="readOnly">
350-
<bool>true</bool>
330+
<layout class="QVBoxLayout" name="verticalLayout_13">
331+
<item>
332+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
333+
<property name="focusPolicy">
334+
<enum>Qt::StrongFocus</enum>
351335
</property>
352336
</widget>
353337
</item>
@@ -365,18 +349,18 @@
365349
<property name="checked">
366350
<bool>false</bool>
367351
</property>
368-
<property name="syncGroup">
352+
<property name="syncGroup" stdset="0">
369353
<string notr="true">rastergeneral</string>
370354
</property>
371355
<layout class="QGridLayout" name="_5">
372-
<property name="verticalSpacing">
373-
<number>6</number>
374-
</property>
375356
<property name="margin">
376357
<number>11</number>
377358
</property>
359+
<property name="verticalSpacing">
360+
<number>6</number>
361+
</property>
378362
<item row="0" column="0" colspan="2">
379-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
363+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
380364
<property name="toolTip">
381365
<string/>
382366
</property>
@@ -426,7 +410,7 @@
426410
<x>0</x>
427411
<y>0</y>
428412
<width>615</width>
429-
<height>508</height>
413+
<height>509</height>
430414
</rect>
431415
</property>
432416
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -441,7 +425,7 @@
441425
<property name="title">
442426
<string>Band rendering</string>
443427
</property>
444-
<property name="syncGroup">
428+
<property name="syncGroup" stdset="0">
445429
<string notr="true">rasterstyle</string>
446430
</property>
447431
<layout class="QVBoxLayout" name="verticalLayout_21">
@@ -529,13 +513,13 @@
529513
<property name="title">
530514
<string>Color rendering</string>
531515
</property>
532-
<property name="collapsed">
516+
<property name="collapsed" stdset="0">
533517
<bool>false</bool>
534518
</property>
535-
<property name="saveCollapsedState">
519+
<property name="saveCollapsedState" stdset="0">
536520
<bool>true</bool>
537521
</property>
538-
<property name="syncGroup">
522+
<property name="syncGroup" stdset="0">
539523
<string notr="true">rasterstyle</string>
540524
</property>
541525
<layout class="QGridLayout" name="gridLayout_2">
@@ -831,13 +815,13 @@
831815
<property name="checkable">
832816
<bool>false</bool>
833817
</property>
834-
<property name="collapsed">
818+
<property name="collapsed" stdset="0">
835819
<bool>false</bool>
836820
</property>
837-
<property name="saveCollapsedState">
821+
<property name="saveCollapsedState" stdset="0">
838822
<bool>true</bool>
839823
</property>
840-
<property name="syncGroup">
824+
<property name="syncGroup" stdset="0">
841825
<string notr="true">rasterstyle</string>
842826
</property>
843827
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -1047,8 +1031,8 @@
10471031
<rect>
10481032
<x>0</x>
10491033
<y>0</y>
1050-
<width>400</width>
1051-
<height>381</height>
1034+
<width>472</width>
1035+
<height>395</height>
10521036
</rect>
10531037
</property>
10541038
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1065,7 +1049,7 @@
10651049
<property name="title">
10661050
<string>Global transparency</string>
10671051
</property>
1068-
<property name="syncGroup">
1052+
<property name="syncGroup" stdset="0">
10691053
<string notr="true">rastertransp</string>
10701054
</property>
10711055
<layout class="QGridLayout" name="_3">
@@ -1149,7 +1133,7 @@
11491133
<property name="title">
11501134
<string>No data value</string>
11511135
</property>
1152-
<property name="syncGroup">
1136+
<property name="syncGroup" stdset="0">
11531137
<string notr="true">rastertransp</string>
11541138
</property>
11551139
<layout class="QGridLayout" name="gridLayout_11">
@@ -1223,7 +1207,7 @@
12231207
<property name="title">
12241208
<string>Custom transparency options</string>
12251209
</property>
1226-
<property name="syncGroup">
1210+
<property name="syncGroup" stdset="0">
12271211
<string notr="true">rastertransp</string>
12281212
</property>
12291213
<layout class="QGridLayout" name="gridLayout_3">
@@ -1454,8 +1438,8 @@
14541438
<rect>
14551439
<x>0</x>
14561440
<y>0</y>
1457-
<width>515</width>
1458-
<height>196</height>
1441+
<width>600</width>
1442+
<height>205</height>
14591443
</rect>
14601444
</property>
14611445
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1518,8 +1502,8 @@
15181502
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
15191503
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
15201504
p, li { white-space: pre-wrap; }
1521-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
1522-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
1505+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
1506+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
15231507
</property>
15241508
</widget>
15251509
</item>
@@ -1615,8 +1599,8 @@ p, li { white-space: pre-wrap; }
16151599
<rect>
16161600
<x>0</x>
16171601
<y>0</y>
1618-
<width>100</width>
1619-
<height>30</height>
1602+
<width>84</width>
1603+
<height>36</height>
16201604
</rect>
16211605
</property>
16221606
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1665,8 +1649,8 @@ p, li { white-space: pre-wrap; }
16651649
<rect>
16661650
<x>0</x>
16671651
<y>0</y>
1668-
<width>302</width>
1669-
<height>593</height>
1652+
<width>393</width>
1653+
<height>608</height>
16701654
</rect>
16711655
</property>
16721656
<layout class="QGridLayout" name="gridLayout_12">
@@ -1675,7 +1659,7 @@ p, li { white-space: pre-wrap; }
16751659
<property name="title">
16761660
<string>Description</string>
16771661
</property>
1678-
<property name="syncGroup">
1662+
<property name="syncGroup" stdset="0">
16791663
<string notr="true">rastermeta</string>
16801664
</property>
16811665
<layout class="QGridLayout" name="gridLayout_5">
@@ -1770,7 +1754,7 @@ p, li { white-space: pre-wrap; }
17701754
<property name="title">
17711755
<string>Attribution</string>
17721756
</property>
1773-
<property name="syncGroup">
1757+
<property name="syncGroup" stdset="0">
17741758
<string notr="true">vectormeta</string>
17751759
</property>
17761760
<layout class="QGridLayout" name="gridLayout_7">
@@ -1802,7 +1786,7 @@ p, li { white-space: pre-wrap; }
18021786
<property name="title">
18031787
<string>MetadataUrl</string>
18041788
</property>
1805-
<property name="syncGroup">
1789+
<property name="syncGroup" stdset="0">
18061790
<string notr="true">vectormeta</string>
18071791
</property>
18081792
<layout class="QGridLayout" name="gridLayout_9">
@@ -1957,7 +1941,7 @@ p, li { white-space: pre-wrap; }
19571941
<property name="title">
19581942
<string>Properties</string>
19591943
</property>
1960-
<property name="syncGroup">
1944+
<property name="syncGroup" stdset="0">
19611945
<string notr="true">rastermeta</string>
19621946
</property>
19631947
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -2065,6 +2049,12 @@ p, li { white-space: pre-wrap; }
20652049
<extends>QToolButton</extends>
20662050
<header>qgscolorbuttonv2.h</header>
20672051
</customwidget>
2052+
<customwidget>
2053+
<class>QgsProjectionSelectionWidget</class>
2054+
<extends>QWidget</extends>
2055+
<header location="global">qgsprojectionselectionwidget.h</header>
2056+
<container>1</container>
2057+
</customwidget>
20682058
<customwidget>
20692059
<class>QgsScaleRangeWidget</class>
20702060
<extends>QWidget</extends>
@@ -2076,6 +2066,71 @@ p, li { white-space: pre-wrap; }
20762066
<header>qgsblendmodecombobox.h</header>
20772067
</customwidget>
20782068
</customwidgets>
2069+
<tabstops>
2070+
<tabstop>pbnSaveDefaultStyle</tabstop>
2071+
<tabstop>pbnLoadStyle</tabstop>
2072+
<tabstop>pbnLoadDefaultStyle</tabstop>
2073+
<tabstop>pbnSaveStyleAs</tabstop>
2074+
<tabstop>buttonBox</tabstop>
2075+
<tabstop>mOptionsListWidget</tabstop>
2076+
<tabstop>scrollArea_3</tabstop>
2077+
<tabstop>leDisplayName</tabstop>
2078+
<tabstop>mLayerOrigNameLineEd</tabstop>
2079+
<tabstop>leLayerSource</tabstop>
2080+
<tabstop>mCrsSelector</tabstop>
2081+
<tabstop>chkUseScaleDependentRendering</tabstop>
2082+
<tabstop>mRenderTypeComboBox</tabstop>
2083+
<tabstop>sliderSaturation</tabstop>
2084+
<tabstop>mSliderBrightness</tabstop>
2085+
<tabstop>mBrightnessSpinBox</tabstop>
2086+
<tabstop>mSliderContrast</tabstop>
2087+
<tabstop>mContrastSpinBox</tabstop>
2088+
<tabstop>spinBoxSaturation</tabstop>
2089+
<tabstop>mColorizeCheck</tabstop>
2090+
<tabstop>btnColorizeColor</tabstop>
2091+
<tabstop>sliderColorizeStrength</tabstop>
2092+
<tabstop>spinColorizeStrength</tabstop>
2093+
<tabstop>mBlendModeComboBox</tabstop>
2094+
<tabstop>mResetColorRenderingBtn</tabstop>
2095+
<tabstop>comboGrayscale</tabstop>
2096+
<tabstop>mZoomedInResamplingComboBox</tabstop>
2097+
<tabstop>mZoomedOutResamplingComboBox</tabstop>
2098+
<tabstop>mMaximumOversamplingSpinBox</tabstop>
2099+
<tabstop>scrollArea_2</tabstop>
2100+
<tabstop>sliderTransparency</tabstop>
2101+
<tabstop>mSrcNoDataValueCheckBox</tabstop>
2102+
<tabstop>leNoDataValue</tabstop>
2103+
<tabstop>tableTransparency</tabstop>
2104+
<tabstop>cboxTransparencyBand</tabstop>
2105+
<tabstop>pbnAddValuesManually</tabstop>
2106+
<tabstop>pbnAddValuesFromDisplay</tabstop>
2107+
<tabstop>pbnRemoveSelectedRow</tabstop>
2108+
<tabstop>pbnDefaultValues</tabstop>
2109+
<tabstop>pbnImportTransparentPixelValues</tabstop>
2110+
<tabstop>pbnExportTransparentPixelValues</tabstop>
2111+
<tabstop>scrollArea_5</tabstop>
2112+
<tabstop>lbxPyramidResolutions</tabstop>
2113+
<tabstop>tePyramidDescription</tabstop>
2114+
<tabstop>buttonBuildPyramids</tabstop>
2115+
<tabstop>cboResamplingMethod</tabstop>
2116+
<tabstop>cbxPyramidsFormat</tabstop>
2117+
<tabstop>scrollArea_6</tabstop>
2118+
<tabstop>scrollArea_4</tabstop>
2119+
<tabstop>mLayerTitleLineEdit</tabstop>
2120+
<tabstop>mLayerAbstractTextEdit</tabstop>
2121+
<tabstop>mLayerKeywordListLineEdit</tabstop>
2122+
<tabstop>mLayerDataUrlLineEdit</tabstop>
2123+
<tabstop>mLayerDataUrlFormatComboBox</tabstop>
2124+
<tabstop>mLayerAttributionLineEdit</tabstop>
2125+
<tabstop>mLayerAttributionUrlLineEdit</tabstop>
2126+
<tabstop>mLayerMetadataUrlLineEdit</tabstop>
2127+
<tabstop>mLayerMetadataUrlTypeComboBox</tabstop>
2128+
<tabstop>mLayerMetadataUrlFormatComboBox</tabstop>
2129+
<tabstop>mLayerLegendUrlLineEdit</tabstop>
2130+
<tabstop>mLayerLegendUrlFormatComboBox</tabstop>
2131+
<tabstop>txtbMetadata</tabstop>
2132+
<tabstop>scrollArea</tabstop>
2133+
</tabstops>
20792134
<resources>
20802135
<include location="../../images/images.qrc"/>
20812136
</resources>

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 27 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
<property name="title">
280280
<string>Layer info</string>
281281
</property>
282-
<property name="syncGroup">
282+
<property name="syncGroup" stdset="0">
283283
<string notr="true">vectorgeneral</string>
284284
</property>
285285
<layout class="QGridLayout" name="gridLayout">
@@ -377,42 +377,19 @@
377377
<property name="checkable">
378378
<bool>false</bool>
379379
</property>
380-
<property name="syncGroup">
380+
<property name="syncGroup" stdset="0">
381381
<string notr="true">vectorgeneral</string>
382382
</property>
383383
<layout class="QVBoxLayout" name="verticalLayout_27">
384384
<property name="spacing">
385385
<number>6</number>
386386
</property>
387387
<item>
388-
<layout class="QHBoxLayout" name="horizontalLayout_3">
389-
<item>
390-
<widget class="QLineEdit" name="leSpatialRefSys">
391-
<property name="minimumSize">
392-
<size>
393-
<width>100</width>
394-
<height>0</height>
395-
</size>
396-
</property>
397-
<property name="readOnly">
398-
<bool>true</bool>
399-
</property>
400-
</widget>
401-
</item>
402-
<item>
403-
<widget class="QPushButton" name="pbnChangeSpatialRefSys">
404-
<property name="toolTip">
405-
<string>Specify the coordinate reference system of the layer's geometry.</string>
406-
</property>
407-
<property name="whatsThis">
408-
<string>Specify the coordinate reference system of the layer's geometry.</string>
409-
</property>
410-
<property name="text">
411-
<string>Specify...</string>
412-
</property>
413-
</widget>
414-
</item>
415-
</layout>
388+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
389+
<property name="focusPolicy">
390+
<enum>Qt::StrongFocus</enum>
391+
</property>
392+
</widget>
416393
</item>
417394
<item>
418395
<layout class="QHBoxLayout" name="horizontalLayout_5">
@@ -465,7 +442,7 @@
465442
</property>
466443
<layout class="QGridLayout" name="gridLayout_6">
467444
<item row="0" column="0">
468-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
445+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
469446
<property name="toolTip">
470447
<string>A widget to define the scale visibility</string>
471448
</property>
@@ -747,8 +724,8 @@
747724
<rect>
748725
<x>0</x>
749726
<y>0</y>
750-
<width>702</width>
751-
<height>171</height>
727+
<width>684</width>
728+
<height>165</height>
752729
</rect>
753730
</property>
754731
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -841,7 +818,7 @@
841818
</widget>
842819
</item>
843820
<item row="3" column="2">
844-
<widget class="QgsScaleComboBox" name="mSimplifyMaximumScaleComboBox">
821+
<widget class="QgsScaleComboBox" name="mSimplifyMaximumScaleComboBox" native="true">
845822
<property name="sizePolicy">
846823
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
847824
<horstretch>0</horstretch>
@@ -1099,7 +1076,7 @@
10991076
<rect>
11001077
<x>0</x>
11011078
<y>0</y>
1102-
<width>90</width>
1079+
<width>98</width>
11031080
<height>113</height>
11041081
</rect>
11051082
</property>
@@ -1249,7 +1226,7 @@
12491226
<property name="title">
12501227
<string>Description</string>
12511228
</property>
1252-
<property name="syncGroup">
1229+
<property name="syncGroup" stdset="0">
12531230
<string notr="true">vectormeta</string>
12541231
</property>
12551232
<layout class="QGridLayout" name="gridLayout_5">
@@ -1344,7 +1321,7 @@
13441321
<property name="title">
13451322
<string>Attribution</string>
13461323
</property>
1347-
<property name="syncGroup">
1324+
<property name="syncGroup" stdset="0">
13481325
<string notr="true">vectormeta</string>
13491326
</property>
13501327
<layout class="QGridLayout" name="gridLayout_7">
@@ -1376,7 +1353,7 @@
13761353
<property name="title">
13771354
<string>MetadataUrl</string>
13781355
</property>
1379-
<property name="syncGroup">
1356+
<property name="syncGroup" stdset="0">
13801357
<string notr="true">vectormeta</string>
13811358
</property>
13821359
<layout class="QGridLayout" name="gridLayout_9">
@@ -1531,7 +1508,7 @@
15311508
<property name="title">
15321509
<string>Properties</string>
15331510
</property>
1534-
<property name="syncGroup">
1511+
<property name="syncGroup" stdset="0">
15351512
<string notr="true">vectormeta</string>
15361513
</property>
15371514
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1646,14 +1623,20 @@
16461623
<container>1</container>
16471624
</customwidget>
16481625
<customwidget>
1649-
<class>QgsScaleRangeWidget</class>
1626+
<class>QgsScaleComboBox</class>
16501627
<extends>QWidget</extends>
1651-
<header>qgsscalerangewidget.h</header>
1628+
<header>qgsscalecombobox.h</header>
16521629
</customwidget>
16531630
<customwidget>
1654-
<class>QgsScaleComboBox</class>
1655-
<extends>QComboBox</extends>
1656-
<header>qgsscalecombobox.h</header>
1631+
<class>QgsProjectionSelectionWidget</class>
1632+
<extends>QWidget</extends>
1633+
<header location="global">qgsprojectionselectionwidget.h</header>
1634+
<container>1</container>
1635+
</customwidget>
1636+
<customwidget>
1637+
<class>QgsScaleRangeWidget</class>
1638+
<extends>QWidget</extends>
1639+
<header>qgsscalerangewidget.h</header>
16571640
</customwidget>
16581641
</customwidgets>
16591642
<resources>

‎src/ui/qgsvectorlayersaveasdialogbase.ui

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
</property>
4141
</widget>
4242
</item>
43-
<item row="1" column="0">
44-
<widget class="QLabel" name="label">
43+
<item row="0" column="0">
44+
<widget class="QLabel" name="label_2">
4545
<property name="text">
46-
<string>Save as</string>
46+
<string>Format</string>
4747
</property>
4848
<property name="buddy">
49-
<cstring>leFilename</cstring>
49+
<cstring>mFormatComboBox</cstring>
5050
</property>
5151
</widget>
5252
</item>
@@ -55,41 +55,28 @@
5555
<property name="text">
5656
<string>CRS</string>
5757
</property>
58-
<property name="buddy">
59-
<cstring>leCRS</cstring>
60-
</property>
6158
</widget>
6259
</item>
63-
<item row="3" column="1" colspan="2">
64-
<widget class="QComboBox" name="mCRSSelection"/>
65-
</item>
6660
<item row="0" column="1" colspan="2">
6761
<widget class="QComboBox" name="mFormatComboBox"/>
6862
</item>
69-
<item row="0" column="0">
70-
<widget class="QLabel" name="label_2">
71-
<property name="text">
72-
<string>Format</string>
73-
</property>
74-
<property name="buddy">
75-
<cstring>mFormatComboBox</cstring>
76-
</property>
77-
</widget>
63+
<item row="3" column="1" colspan="2">
64+
<widget class="QComboBox" name="mCRSSelection"/>
7865
</item>
79-
<item row="4" column="2">
80-
<widget class="QPushButton" name="browseCRS">
81-
<property name="text">
82-
<string>Change...</string>
66+
<item row="4" column="1" colspan="2">
67+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
68+
<property name="focusPolicy">
69+
<enum>Qt::StrongFocus</enum>
8370
</property>
8471
</widget>
8572
</item>
86-
<item row="4" column="1">
87-
<widget class="QLineEdit" name="leCRS">
88-
<property name="enabled">
89-
<bool>false</bool>
73+
<item row="1" column="0">
74+
<widget class="QLabel" name="label">
75+
<property name="text">
76+
<string>Save as</string>
9077
</property>
91-
<property name="readOnly">
92-
<bool>true</bool>
78+
<property name="buddy">
79+
<cstring>leFilename</cstring>
9380
</property>
9481
</widget>
9582
</item>
@@ -106,8 +93,8 @@
10693
<rect>
10794
<x>0</x>
10895
<y>0</y>
109-
<width>562</width>
110-
<height>508</height>
96+
<width>555</width>
97+
<height>523</height>
11198
</rect>
11299
</property>
113100
<layout class="QVBoxLayout" name="verticalLayout">
@@ -153,7 +140,7 @@
153140
<property name="checked">
154141
<bool>true</bool>
155142
</property>
156-
</widget>
143+
</widget>
157144
</item>
158145
<item>
159146
<layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -341,13 +328,36 @@
341328
<header>qgscollapsiblegroupbox.h</header>
342329
<container>1</container>
343330
</customwidget>
331+
<customwidget>
332+
<class>QgsProjectionSelectionWidget</class>
333+
<extends>QWidget</extends>
334+
<header location="global">qgsprojectionselectionwidget.h</header>
335+
<container>1</container>
336+
</customwidget>
344337
<customwidget>
345338
<class>QgsExtentGroupBox</class>
346339
<extends>QGroupBox</extends>
347340
<header>qgsextentgroupbox.h</header>
348341
<container>1</container>
349342
</customwidget>
350343
</customwidgets>
344+
<tabstops>
345+
<tabstop>mFormatComboBox</tabstop>
346+
<tabstop>leFilename</tabstop>
347+
<tabstop>browseFilename</tabstop>
348+
<tabstop>mCRSSelection</tabstop>
349+
<tabstop>mCrsSelector</tabstop>
350+
<tabstop>scrollArea</tabstop>
351+
<tabstop>mEncodingComboBox</tabstop>
352+
<tabstop>mSelectedOnly</tabstop>
353+
<tabstop>mSkipAttributeCreation</tabstop>
354+
<tabstop>mAddToCanvas</tabstop>
355+
<tabstop>mSymbologyExportComboBox</tabstop>
356+
<tabstop>mScaleSpinBox</tabstop>
357+
<tabstop>mOgrDatasourceOptions</tabstop>
358+
<tabstop>buttonBox</tabstop>
359+
<tabstop>mOgrLayerOptions</tabstop>
360+
</tabstops>
351361
<resources/>
352362
<connections>
353363
<connection>

0 commit comments

Comments
 (0)
Please sign in to comment.