[processing] fixed ‘add script from file’ tool

This commit is contained in:
volaya 2015-05-21 09:25:11 +02:00
parent a58085bf4e
commit 4d62566db7

View File

@ -28,6 +28,7 @@ __revision__ = '$Format:%H$'
import os import os
from PyQt4.QtGui import QFileDialog, QIcon, QMessageBox from PyQt4.QtGui import QFileDialog, QIcon, QMessageBox
from PyQt4.QtCore import QSettings, QFileInfo
from processing.script.ScriptAlgorithm import ScriptAlgorithm from processing.script.ScriptAlgorithm import ScriptAlgorithm
from processing.gui.ToolboxAction import ToolboxAction from processing.gui.ToolboxAction import ToolboxAction
@ -50,13 +51,12 @@ class AddScriptFromFileAction(ToolboxAction):
settings = QSettings() settings = QSettings()
lastDir = settings.value('Processing/lastScriptsDir', '') lastDir = settings.value('Processing/lastScriptsDir', '')
filename = QFileDialog.getOpenFileName(self.toolbox, filename = QFileDialog.getOpenFileName(self.toolbox,
self.tr('Script files', 'AddScriptFromFileAction'), None, self.tr('Script files', 'AddScriptFromFileAction'), lastDir,
self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction')) self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction'))
if filename: if filename:
try: try:
settings.setValue('Processing/lastScriptsDir', settings.setValue('Processing/lastScriptsDir',
QFileInfo(fileName).absoluteDir().absolutePath()) QFileInfo(filename).absoluteDir().absolutePath())
script = ScriptAlgorithm(filename) script = ScriptAlgorithm(filename)
except WrongScriptException: except WrongScriptException:
QMessageBox.warning(self.toolbox, QMessageBox.warning(self.toolbox,