sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move plugin installer's settings to the [app] section

Browse Source
This commit is contained in:
Borys Jurgiel 2017-11-02 09:15:06 +01:00
parent 5ffbb359d0
commit 4b6228d81e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/pyplugin_installer/installer_data.py
View File

@ -98,9 +98,8 @@ mPlugins = dict of dicts {id : {
translatableAttributes = ["name", "description", "about", "tags"] translatableAttributes = ["name", "description", "about", "tags"]
reposGroup = "/Qgis/plugin-repos" settingsGroup = "app/plugin_installer"
settingsGroup = "/Qgis/plugin-installer" reposGroup = "app/plugin_repositories"
seenPluginGroup = "/Qgis/plugin-seen"
officialRepo = (QCoreApplication.translate("QgsPluginInstaller", "QGIS Official Plugin Repository"), "https://plugins.qgis.org/plugins/plugins.xml") officialRepo = (QCoreApplication.translate("QgsPluginInstaller", "QGIS Official Plugin Repository"), "https://plugins.qgis.org/plugins/plugins.xml")
@ -790,7 +789,7 @@ class Plugins(QObject):
def markNews(self): def markNews(self):
""" mark all new plugins as new """ """ mark all new plugins as new """
settings = QgsSettings() settings = QgsSettings()
seenPlugins = settings.value(seenPluginGroup, list(self.mPlugins.keys()), type=str) seenPlugins = settings.value(settingsGroup + '/seen_plugins', list(self.mPlugins.keys()), type=str)
if len(seenPlugins) > 0: if len(seenPlugins) > 0:
for i in list(self.mPlugins.keys()): for i in list(self.mPlugins.keys()):
if seenPlugins.count(i) == 0 and self.mPlugins[i]["status"] == "not installed": if seenPlugins.count(i) == 0 and self.mPlugins[i]["status"] == "not installed":
@ -800,11 +799,11 @@ class Plugins(QObject):
def updateSeenPluginsList(self): def updateSeenPluginsList(self):
""" update the list of all seen plugins """ """ update the list of all seen plugins """
settings = QgsSettings() settings = QgsSettings()
seenPlugins = settings.value(seenPluginGroup, list(self.mPlugins.keys()), type=str) seenPlugins = settings.value(settingsGroup + '/seen_plugins', list(self.mPlugins.keys()), type=str)
for i in list(self.mPlugins.keys()): for i in list(self.mPlugins.keys()):
if seenPlugins.count(i) == 0: if seenPlugins.count(i) == 0:
seenPlugins += [i] seenPlugins += [i]
settings.setValue(seenPluginGroup, seenPlugins) settings.setValue(settingsGroup + '/seen_plugins', seenPlugins)
# ----------------------------------------- # # ----------------------------------------- #
def isThereAnythingNew(self): def isThereAnythingNew(self):

5
resources/2to3migration.txt
View File

@ -1,4 +1,4 @@
# version=1 # version=2
# If you update this file make sure you bump the above version number it must be higher then the last run. # If you update this file make sure you bump the above version number it must be higher then the last run.
#oldkey;newkey #oldkey;newkey
@ -17,3 +17,6 @@ Qgis/compileExpressions;*
variables/names;* variables/names;*
variables/values;* variables/values;*
#Plugin installer
Qgis/plugin-installer/*;app/plugin_installer/*
Qgis/plugin-repos/*;app/plugin_repositories/*