Merge pull request #36129 from jgrocha/postgis-dialogue-ux-improvement

Enables Postgresql service based connections without database name
qgis · May 4, 2020 · 8aa32f7 · 8aa32f7
2 parents ac8b956 + c90ce4e
commit 8aa32f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
@@ -249,7 +249,7 @@ void QgsPgNewConnection::showHelp()
 void QgsPgNewConnection::updateOkButtonState()
 {
   bool enabled = !txtName->text().isEmpty() && (
-                   ( !txtService->text().isEmpty() && !txtDatabase->text().isEmpty() ) ||
+                   !txtService->text().isEmpty() ||
                    ( !txtHost->text().isEmpty() && !txtPort->text().isEmpty() && !txtDatabase->text().isEmpty() ) );
   buttonBox->button( QDialogButtonBox::Ok )->setEnabled( enabled );
 }
diff --git a/src/providers/postgres/qgspgsourceselect.cpp b/src/providers/postgres/qgspgsourceselect.cpp
@@ -345,6 +345,7 @@ void QgsPgSourceSelect::btnLoad_clicked()
 void QgsPgSourceSelect::btnEdit_clicked()
 {
   QgsPgNewConnection *nc = new QgsPgNewConnection( this, cmbConnections->currentText() );
+  nc->setWindowTitle( tr( "Edit PostGIS Connection" ) );
   if ( nc->exec() )
   {
     populateConnectionList();

diff --git a/src/providers/postgres/qgspostgresdataitemguiprovider.cpp b/src/providers/postgres/qgspostgresdataitemguiprovider.cpp
@@ -185,6 +185,7 @@ void QgsPostgresDataItemGuiProvider::newConnection( QgsDataItem *item )
 void QgsPostgresDataItemGuiProvider::editConnection( QgsDataItem *item )
 {
   QgsPgNewConnection nc( nullptr, item->name() );
+  nc.setWindowTitle( tr( "Edit PostGIS Connection" ) );
   if ( nc.exec() )
   {
     // the parent should be updated