WMS/OWS:

- add service type to window title (implements #9192) - always fill dpi combobox (fixes #9194)
qgis · Dec 11, 2013 · 36c2f7f · 36c2f7f
1 parent 8405ddb
commit 36c2f7f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
@@ -42,6 +42,13 @@ QgsNewHttpConnection::QgsNewHttpConnection(
 
   txtName->setValidator( new QRegExpValidator( QRegExp( "[^/]+" ), txtName ) );
 
+  cmbDpiMode->clear();
+  cmbDpiMode->addItem( tr( "all" ) );
+  cmbDpiMode->addItem( tr( "off" ) );
+  cmbDpiMode->addItem( tr( "QGIS" ) );
+  cmbDpiMode->addItem( tr( "UMN" ) );
+  cmbDpiMode->addItem( tr( "GeoServer" ) );
+
   if ( !connName.isEmpty() )
   {
     // populate the dialog with the information stored for the connection
@@ -60,12 +67,6 @@ QgsNewHttpConnection::QgsNewHttpConnection(
     cbxIgnoreGetFeatureInfoURI->setChecked( settings.value( key + "/ignoreGetFeatureInfoURI", false ).toBool() );
     cbxSmoothPixmapTransform->setChecked( settings.value( key + "/smoothPixmapTransform", false ).toBool() );
 
-    cmbDpiMode->clear();
-    cmbDpiMode->addItem( tr( "all" ) );
-    cmbDpiMode->addItem( tr( "off" ) );
-    cmbDpiMode->addItem( tr( "QGIS" ) );
-    cmbDpiMode->addItem( tr( "UMN" ) );
-    cmbDpiMode->addItem( tr( "GeoServer" ) );
     int dpiIdx;
     switch ( settings.value( key + "/dpiMode", 7 ).toInt() )
     {

diff --git a/src/gui/qgsowssourceselect.cpp b/src/gui/qgsowssourceselect.cpp
@@ -68,6 +68,8 @@ QgsOWSSourceSelect::QgsOWSSourceSelect( QString service, QWidget * parent, Qt::W
     mDialogButtonBox->button( QDialogButtonBox::Close )->hide();
   }
 
+  setWindowTitle( tr( "Add Layer(s) from a %1 Server" ).arg( service ) );
+
   mAddButton = mDialogButtonBox->button( QDialogButtonBox::Apply );
   mAddButton->setText( tr( "&Add" ) );
   mAddButton->setToolTip( tr( "Add selected layers to map" ) );

diff --git a/src/ui/qgswmssourceselectbase.ui b/src/ui/qgswmssourceselectbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Add Layer(s) from a Server</string>
+   <string>Add Layer(s) from a WM(T)S Server</string>
   </property>
   <property name="windowIcon">
    <iconset>