Skip to content

Commit 36c2f7f

Browse files
committed
WMS/OWS:
- add service type to window title (implements #9192) - always fill dpi combobox (fixes #9194)
1 parent 8405ddb commit 36c2f7f

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

src/gui/qgsnewhttpconnection.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ QgsNewHttpConnection::QgsNewHttpConnection(
4242

4343
txtName->setValidator( new QRegExpValidator( QRegExp( "[^/]+" ), txtName ) );
4444

45+
cmbDpiMode->clear();
46+
cmbDpiMode->addItem( tr( "all" ) );
47+
cmbDpiMode->addItem( tr( "off" ) );
48+
cmbDpiMode->addItem( tr( "QGIS" ) );
49+
cmbDpiMode->addItem( tr( "UMN" ) );
50+
cmbDpiMode->addItem( tr( "GeoServer" ) );
51+
4552
if ( !connName.isEmpty() )
4653
{
4754
// populate the dialog with the information stored for the connection
@@ -60,12 +67,6 @@ QgsNewHttpConnection::QgsNewHttpConnection(
6067
cbxIgnoreGetFeatureInfoURI->setChecked( settings.value( key + "/ignoreGetFeatureInfoURI", false ).toBool() );
6168
cbxSmoothPixmapTransform->setChecked( settings.value( key + "/smoothPixmapTransform", false ).toBool() );
6269

63-
cmbDpiMode->clear();
64-
cmbDpiMode->addItem( tr( "all" ) );
65-
cmbDpiMode->addItem( tr( "off" ) );
66-
cmbDpiMode->addItem( tr( "QGIS" ) );
67-
cmbDpiMode->addItem( tr( "UMN" ) );
68-
cmbDpiMode->addItem( tr( "GeoServer" ) );
6970
int dpiIdx;
7071
switch ( settings.value( key + "/dpiMode", 7 ).toInt() )
7172
{

src/gui/qgsowssourceselect.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ QgsOWSSourceSelect::QgsOWSSourceSelect( QString service, QWidget * parent, Qt::W
6868
mDialogButtonBox->button( QDialogButtonBox::Close )->hide();
6969
}
7070

71+
setWindowTitle( tr( "Add Layer(s) from a %1 Server" ).arg( service ) );
72+
7173
mAddButton = mDialogButtonBox->button( QDialogButtonBox::Apply );
7274
mAddButton->setText( tr( "&Add" ) );
7375
mAddButton->setToolTip( tr( "Add selected layers to map" ) );

src/ui/qgswmssourceselectbase.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Add Layer(s) from a Server</string>
14+
<string>Add Layer(s) from a WM(T)S Server</string>
1515
</property>
1616
<property name="windowIcon">
1717
<iconset>

0 commit comments

Comments
 (0)