mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-16 00:03:12 -04:00
Geopackage: Use the same settings for DB Manager and browser
This commit is contained in:
parent
2364801634
commit
04f79d174d
@ -61,7 +61,7 @@ class GPKGDBPlugin(DBPlugin):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def connectionSettingsKey(self):
|
def connectionSettingsKey(self):
|
||||||
return '/GPKG/connections'
|
return '/providers/geopackage/connections'
|
||||||
|
|
||||||
def databasesFactory(self, connection, uri):
|
def databasesFactory(self, connection, uri):
|
||||||
return GPKGDatabase(connection, uri)
|
return GPKGDatabase(connection, uri)
|
||||||
@ -71,10 +71,10 @@ class GPKGDBPlugin(DBPlugin):
|
|||||||
settings = QgsSettings()
|
settings = QgsSettings()
|
||||||
settings.beginGroup(u"/%s/%s" % (self.connectionSettingsKey(), conn_name))
|
settings.beginGroup(u"/%s/%s" % (self.connectionSettingsKey(), conn_name))
|
||||||
|
|
||||||
if not settings.contains("gpkgpath"): # non-existent entry?
|
if not settings.contains("path"): # non-existent entry?
|
||||||
raise InvalidDataException(self.tr(u'There is no defined database connection "{0}".').format(conn_name))
|
raise InvalidDataException(self.tr(u'There is no defined database connection "{0}".').format(conn_name))
|
||||||
|
|
||||||
database = settings.value("gpkgpath")
|
database = settings.value("path")
|
||||||
|
|
||||||
uri = QgsDataSourceUri()
|
uri = QgsDataSourceUri()
|
||||||
uri.setDatabase(database)
|
uri.setDatabase(database)
|
||||||
@ -84,7 +84,7 @@ class GPKGDBPlugin(DBPlugin):
|
|||||||
def addConnection(self, conn_name, uri):
|
def addConnection(self, conn_name, uri):
|
||||||
settings = QgsSettings()
|
settings = QgsSettings()
|
||||||
settings.beginGroup(u"/%s/%s" % (self.connectionSettingsKey(), conn_name))
|
settings.beginGroup(u"/%s/%s" % (self.connectionSettingsKey(), conn_name))
|
||||||
settings.setValue("gpkgpath", uri.database())
|
settings.setValue("path", uri.database())
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
Loading…
x
Reference in New Issue
Block a user