Skip to content

Commit

Permalink
Fix #16528 mix of Qgis en qgis as root in settins
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@rduivenvoorde @m-kuhn
rduivenvoorde authored and m-kuhn committed Aug 13, 2017
1 parent d3e35ee commit 20a54b1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
26 changes: 13 additions & 13 deletions src/gui/qgsmanageconnectionsdialog.cpp
View file
Expand Up @@ -213,13 +213,13 @@ bool QgsManageConnectionsDialog::populateConnections()
switch ( mConnectionType )
{
case WMS:
settings.beginGroup( QStringLiteral( "/Qgis/connections-wms" ) );
settings.beginGroup( QStringLiteral( "/qgis/connections-wms" ) );
break;
case WFS:
settings.beginGroup( QStringLiteral( "/Qgis/connections-wfs" ) );
settings.beginGroup( QStringLiteral( "/qgis/connections-wfs" ) );
break;
case WCS:
settings.beginGroup( QStringLiteral( "/Qgis/connections-wcs" ) );
settings.beginGroup( QStringLiteral( "/qgis/connections-wcs" ) );
break;
case PostGIS:
settings.beginGroup( QStringLiteral( "/PostgreSQL/connections" ) );
Expand Down Expand Up @@ -361,7 +361,7 @@ QDomDocument QgsManageConnectionsDialog::saveOWSConnections( const QStringList &
QString path;
for ( int i = 0; i < connections.count(); ++i )
{
path = "/Qgis/connections-" + service.toLower() + '/';
path = "/qgis/connections-" + service.toLower() + '/';
QDomElement el = doc.createElement( service.toLower() );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );
Expand All @@ -377,7 +377,7 @@ QDomDocument QgsManageConnectionsDialog::saveOWSConnections( const QStringList &
el.setAttribute( QStringLiteral( "dpiMode" ), settings.value( path + connections[i] + "/dpiMode", "7" ).toInt() );
}

path = "/Qgis/" + service.toUpper() + '/';
path = "/qgis/" + service.toUpper() + '/';
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password", "" ).toString() );
root.appendChild( el );
Expand All @@ -397,14 +397,14 @@ QDomDocument QgsManageConnectionsDialog::saveWfsConnections( const QStringList &
QString path;
for ( int i = 0; i < connections.count(); ++i )
{
path = QStringLiteral( "/Qgis/connections-wfs/" );
path = QStringLiteral( "/qgis/connections-wfs/" );
QDomElement el = doc.createElement( QStringLiteral( "wfs" ) );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );

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

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

QString connectionName;
QgsSettings settings;
settings.beginGroup( "/Qgis/connections-" + service.toLower() );
settings.beginGroup( "/qgis/connections-" + service.toLower() );
QStringList keys = settings.childGroups();
settings.endGroup();
QDomElement child = root.firstChildElement();
Expand Down Expand Up @@ -645,7 +645,7 @@ void QgsManageConnectionsDialog::loadOWSConnections( const QDomDocument &doc, co
}

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

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

QString connectionName;
QgsSettings settings;
settings.beginGroup( QStringLiteral( "/Qgis/connections-wfs" ) );
settings.beginGroup( QStringLiteral( "/qgis/connections-wfs" ) );
QStringList keys = settings.childGroups();
settings.endGroup();
QDomElement child = root.firstChildElement();
Expand Down Expand Up @@ -732,13 +732,13 @@ void QgsManageConnectionsDialog::loadWfsConnections( const QDomDocument &doc, co
}

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

if ( !child.attribute( QStringLiteral( "username" ) ).isEmpty() )
{
settings.beginGroup( "/Qgis/WFS/" + connectionName );
settings.beginGroup( "/qgis/WFS/" + connectionName );
settings.setValue( QStringLiteral( "/username" ), child.attribute( QStringLiteral( "username" ) ) );
settings.setValue( QStringLiteral( "/password" ), child.attribute( QStringLiteral( "password" ) ) );
settings.endGroup();
Expand Down
6 changes: 3 additions & 3 deletions src/gui/qgsowssourceselect.cpp
View file
Expand Up @@ -232,7 +232,7 @@ void QgsOWSSourceSelect::populateConnectionList()
}
void QgsOWSSourceSelect::on_mNewButton_clicked()
{
QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, "/Qgis/connections-" + mService.toLower() + '/' );
QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, "/qgis/connections-" + mService.toLower() + '/' );

if ( nc->exec() )
{
Expand All @@ -245,7 +245,7 @@ void QgsOWSSourceSelect::on_mNewButton_clicked()

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

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

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

0 comments on commit 20a54b1

Please sign in to comment.