Skip to content

Commit 20a54b1

Browse files
rduivenvoordem-kuhn
rduivenvoorde
authored and
m-kuhn
committedAug 13, 2017
Fix #16528 mix of Qgis en qgis as root in settins
On Linux the use of Qgis and qgis as root for connection settings makes it currently impossible to add a new WCS connection Fixes #16528
·
ltr-3_40final-3_0_0
1 parent d3e35ee commit 20a54b1

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed
 

‎src/gui/qgsmanageconnectionsdialog.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,13 @@ bool QgsManageConnectionsDialog::populateConnections()
213213
switch ( mConnectionType )
214214
{
215215
case WMS:
216-
settings.beginGroup( QStringLiteral( "/Qgis/connections-wms" ) );
216+
settings.beginGroup( QStringLiteral( "/qgis/connections-wms" ) );
217217
break;
218218
case WFS:
219-
settings.beginGroup( QStringLiteral( "/Qgis/connections-wfs" ) );
219+
settings.beginGroup( QStringLiteral( "/qgis/connections-wfs" ) );
220220
break;
221221
case WCS:
222-
settings.beginGroup( QStringLiteral( "/Qgis/connections-wcs" ) );
222+
settings.beginGroup( QStringLiteral( "/qgis/connections-wcs" ) );
223223
break;
224224
case PostGIS:
225225
settings.beginGroup( QStringLiteral( "/PostgreSQL/connections" ) );
@@ -361,7 +361,7 @@ QDomDocument QgsManageConnectionsDialog::saveOWSConnections( const QStringList &
361361
QString path;
362362
for ( int i = 0; i < connections.count(); ++i )
363363
{
364-
path = "/Qgis/connections-" + service.toLower() + '/';
364+
path = "/qgis/connections-" + service.toLower() + '/';
365365
QDomElement el = doc.createElement( service.toLower() );
366366
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
367367
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );
@@ -377,7 +377,7 @@ QDomDocument QgsManageConnectionsDialog::saveOWSConnections( const QStringList &
377377
el.setAttribute( QStringLiteral( "dpiMode" ), settings.value( path + connections[i] + "/dpiMode", "7" ).toInt() );
378378
}
379379

380-
path = "/Qgis/" + service.toUpper() + '/';
380+
path = "/qgis/" + service.toUpper() + '/';
381381
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username", "" ).toString() );
382382
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password", "" ).toString() );
383383
root.appendChild( el );
@@ -397,14 +397,14 @@ QDomDocument QgsManageConnectionsDialog::saveWfsConnections( const QStringList &
397397
QString path;
398398
for ( int i = 0; i < connections.count(); ++i )
399399
{
400-
path = QStringLiteral( "/Qgis/connections-wfs/" );
400+
path = QStringLiteral( "/qgis/connections-wfs/" );
401401
QDomElement el = doc.createElement( QStringLiteral( "wfs" ) );
402402
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
403403
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );
404404

405405
el.setAttribute( QStringLiteral( "referer" ), settings.value( path + connections[ i ] + "/referer", "" ).toString() );
406406

407-
path = QStringLiteral( "/Qgis/WFS/" );
407+
path = QStringLiteral( "/qgis/WFS/" );
408408
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username", "" ).toString() );
409409
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password", "" ).toString() );
410410
root.appendChild( el );
@@ -592,7 +592,7 @@ void QgsManageConnectionsDialog::loadOWSConnections( const QDomDocument &doc, co
592592

593593
QString connectionName;
594594
QgsSettings settings;
595-
settings.beginGroup( "/Qgis/connections-" + service.toLower() );
595+
settings.beginGroup( "/qgis/connections-" + service.toLower() );
596596
QStringList keys = settings.childGroups();
597597
settings.endGroup();
598598
QDomElement child = root.firstChildElement();
@@ -645,7 +645,7 @@ void QgsManageConnectionsDialog::loadOWSConnections( const QDomDocument &doc, co
645645
}
646646

647647
// no dups detected or overwrite is allowed
648-
settings.beginGroup( "/Qgis/connections-" + service.toLower() );
648+
settings.beginGroup( "/qgis/connections-" + service.toLower() );
649649
settings.setValue( QString( '/' + connectionName + "/url" ), child.attribute( QStringLiteral( "url" ) ) );
650650
settings.setValue( QString( '/' + connectionName + "/ignoreGetMapURI" ), child.attribute( QStringLiteral( "ignoreGetMapURI" ) ) == QLatin1String( "true" ) );
651651
settings.setValue( QString( '/' + connectionName + "/ignoreGetFeatureInfoURI" ), child.attribute( QStringLiteral( "ignoreGetFeatureInfoURI" ) ) == QLatin1String( "true" ) );
@@ -658,7 +658,7 @@ void QgsManageConnectionsDialog::loadOWSConnections( const QDomDocument &doc, co
658658

659659
if ( !child.attribute( QStringLiteral( "username" ) ).isEmpty() )
660660
{
661-
settings.beginGroup( "/Qgis/" + service.toUpper() + '/' + connectionName );
661+
settings.beginGroup( "/qgis/" + service.toUpper() + '/' + connectionName );
662662
settings.setValue( QStringLiteral( "/username" ), child.attribute( QStringLiteral( "username" ) ) );
663663
settings.setValue( QStringLiteral( "/password" ), child.attribute( QStringLiteral( "password" ) ) );
664664
settings.endGroup();
@@ -679,7 +679,7 @@ void QgsManageConnectionsDialog::loadWfsConnections( const QDomDocument &doc, co
679679

680680
QString connectionName;
681681
QgsSettings settings;
682-
settings.beginGroup( QStringLiteral( "/Qgis/connections-wfs" ) );
682+
settings.beginGroup( QStringLiteral( "/qgis/connections-wfs" ) );
683683
QStringList keys = settings.childGroups();
684684
settings.endGroup();
685685
QDomElement child = root.firstChildElement();
@@ -732,13 +732,13 @@ void QgsManageConnectionsDialog::loadWfsConnections( const QDomDocument &doc, co
732732
}
733733

734734
// no dups detected or overwrite is allowed
735-
settings.beginGroup( QStringLiteral( "/Qgis/connections-wfs" ) );
735+
settings.beginGroup( QStringLiteral( "/qgis/connections-wfs" ) );
736736
settings.setValue( QString( '/' + connectionName + "/url" ), child.attribute( QStringLiteral( "url" ) ) );
737737
settings.endGroup();
738738

739739
if ( !child.attribute( QStringLiteral( "username" ) ).isEmpty() )
740740
{
741-
settings.beginGroup( "/Qgis/WFS/" + connectionName );
741+
settings.beginGroup( "/qgis/WFS/" + connectionName );
742742
settings.setValue( QStringLiteral( "/username" ), child.attribute( QStringLiteral( "username" ) ) );
743743
settings.setValue( QStringLiteral( "/password" ), child.attribute( QStringLiteral( "password" ) ) );
744744
settings.endGroup();

‎src/gui/qgsowssourceselect.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ void QgsOWSSourceSelect::populateConnectionList()
232232
}
233233
void QgsOWSSourceSelect::on_mNewButton_clicked()
234234
{
235-
QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, "/Qgis/connections-" + mService.toLower() + '/' );
235+
QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, "/qgis/connections-" + mService.toLower() + '/' );
236236

237237
if ( nc->exec() )
238238
{
@@ -245,7 +245,7 @@ void QgsOWSSourceSelect::on_mNewButton_clicked()
245245

246246
void QgsOWSSourceSelect::on_mEditButton_clicked()
247247
{
248-
QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, "/Qgis/connections-" + mService.toLower() + '/', mConnectionsComboBox->currentText() );
248+
QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, "/qgis/connections-" + mService.toLower() + '/', mConnectionsComboBox->currentText() );
249249

250250
if ( nc->exec() )
251251
{
@@ -587,7 +587,7 @@ void QgsOWSSourceSelect::addDefaultServers()
587587
// exampleServers["Qgis users map"] = "http://qgis.org/wms.cgi";
588588

589589
QgsSettings settings;
590-
settings.beginGroup( "/Qgis/connections-" + mService.toLower() );
590+
settings.beginGroup( "/qgis/connections-" + mService.toLower() );
591591
QMap<QString, QString>::const_iterator i = exampleServers.constBegin();
592592
for ( ; i != exampleServers.constEnd(); ++i )
593593
{

0 commit comments

Comments
 (0)
Please sign in to comment.