diff --git a/python/plugins/processing/gui/GetScriptsAndModels.py b/python/plugins/processing/gui/GetScriptsAndModels.py index ab686e174b2..ee0bc4050d4 100644 --- a/python/plugins/processing/gui/GetScriptsAndModels.py +++ b/python/plugins/processing/gui/GetScriptsAndModels.py @@ -128,15 +128,15 @@ class GetScriptsAndModelsDialog(BASE, WIDGET): self.resourceType = resourceType if self.resourceType == self.MODELS: - self.folder = ModelerUtils.defaultModelsFolder() + self.folder = ModelerUtils.modelsFolders()[0] self.urlBase = 'https://raw.githubusercontent.com/qgis/QGIS-Processing/master/models/' self.icon = QIcon(os.path.join(pluginPath, 'images', 'model.png')) elif self.resourceType == self.SCRIPTS: - self.folder = ScriptUtils.defaultScriptsFolder() + self.folder = ScriptUtils.scriptsFolders()[0] self.urlBase = 'https://raw.githubusercontent.com/qgis/QGIS-Processing/master/scripts/' self.icon = QIcon(os.path.join(pluginPath, 'images', 'script.png')) else: - self.folder = RUtils.defaultRScriptsFolder() + self.folder = RUtils.RScriptsFolders()[0] self.urlBase = 'https://raw.githubusercontent.com/qgis/QGIS-Processing/master/rscripts/' self.icon = QIcon(os.path.join(pluginPath, 'images', 'r.svg')) diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py index b1784414e59..6f9fa2403a6 100644 --- a/python/plugins/processing/gui/ScriptEditorDialog.py +++ b/python/plugins/processing/gui/ScriptEditorDialog.py @@ -193,10 +193,10 @@ class ScriptEditorDialog(BASE, WIDGET): return if self.algType == self.SCRIPT_PYTHON: - scriptDir = ScriptUtils.defaultScriptsFolder() + scriptDir = ScriptUtils.scriptsFolders()[0] filterName = self.tr('Python scripts (*.py)') elif self.algType == self.SCRIPT_R: - scriptDir = RUtils.defaultRScriptsFolder() + scriptDir = RUtils.RScriptsFolders()[0] filterName = self.tr('Processing R script (*.rsx)') self.filename = QFileDialog.getOpenFileName( @@ -224,10 +224,10 @@ class ScriptEditorDialog(BASE, WIDGET): def saveScript(self, saveAs): if self.filename is None or saveAs: if self.algType == self.SCRIPT_PYTHON: - scriptDir = ScriptUtils.defaultScriptsFolder() + scriptDir = ScriptUtils.scriptsFolders()[0] filterName = self.tr('Python scripts (*.py)') elif self.algType == self.SCRIPT_R: - scriptDir = RUtils.defaultRScriptsFolder() + scriptDir = RUtils.RScriptsFolders()[0] filterName = self.tr('Processing R script (*.rsx)') self.filename = unicode(QFileDialog.getSaveFileName(self, diff --git a/python/plugins/processing/modeler/AddModelFromFileAction.py b/python/plugins/processing/modeler/AddModelFromFileAction.py index 8190d0b6c8d..d95a716d1f0 100644 --- a/python/plugins/processing/modeler/AddModelFromFileAction.py +++ b/python/plugins/processing/modeler/AddModelFromFileAction.py @@ -71,6 +71,6 @@ class AddModelFromFileAction(ToolboxAction): self.tr('Error reading model', 'AddModelFromFileAction'), self.tr('Cannot read file', 'AddModelFromFileAction')) return - destFilename = os.path.join(ModelerUtils.defaultModelsFolder(), os.path.basename(filename)) + destFilename = os.path.join(ModelerUtils.modelsFolders()[0], os.path.basename(filename)) shutil.copyfile(filename, destFilename) algList.reloadProvider('model') diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py index ca952795a7a..696d4377118 100644 --- a/python/plugins/processing/modeler/ModelerDialog.py +++ b/python/plugins/processing/modeler/ModelerDialog.py @@ -310,7 +310,7 @@ class ModelerDialog(BASE, WIDGET): else: filename = unicode(QFileDialog.getSaveFileName(self, self.tr('Save Model'), - ModelerUtils.defaultModelsFolder(), + ModelerUtils.modelsFolders()[0], self.tr('Processing models (*.model)'))) if filename: if not filename.endswith('.model'): @@ -341,7 +341,7 @@ class ModelerDialog(BASE, WIDGET): def openModel(self): filename = unicode(QFileDialog.getOpenFileName(self, - self.tr('Open Model'), ModelerUtils.defaultModelsFolder(), + self.tr('Open Model'), ModelerUtils.modelsFolders()[0], self.tr('Processing models (*.model *.MODEL)'))) if filename: try: diff --git a/python/plugins/processing/script/AddScriptFromFileAction.py b/python/plugins/processing/script/AddScriptFromFileAction.py index 5a65f52e490..64a3123716a 100644 --- a/python/plugins/processing/script/AddScriptFromFileAction.py +++ b/python/plugins/processing/script/AddScriptFromFileAction.py @@ -65,7 +65,7 @@ class AddScriptFromFileAction(ToolboxAction): self.tr('Error reading script', 'AddScriptFromFileAction'), self.tr('The selected file does not contain a valid script', 'AddScriptFromFileAction')) return - destFilename = os.path.join(ScriptUtils.defaultScriptsFolder(), os.path.basename(filename)) + destFilename = os.path.join(ScriptUtils.scriptsFolders()[0], os.path.basename(filename)) with open(destFilename, 'w') as f: f.write(script.script) algList.reloadProvider('script')