Skip to content

Commit 862b113

Browse files
committed
[processing] move script provider stuff into provider directory
1 parent 6841c52 commit 862b113

9 files changed

+64
-303
lines changed

python/plugins/processing/gui/ContextAction.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ def setData(self, itemData, toolbox):
3737

3838
def tr(self, string, context=''):
3939
if context == '':
40-
context = 'ContextAction'
40+
context = self.__class__.__name__
4141
return QCoreApplication.translate(context, string)

python/plugins/processing/gui/ScriptEdit.py

-208
This file was deleted.

python/plugins/processing/script/AddScriptFromFileAction.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@
3232

3333
from qgis.core import QgsApplication, QgsSettings
3434

35-
from processing.script.ScriptAlgorithm import ScriptAlgorithm
3635
from processing.gui.ToolboxAction import ToolboxAction
36+
37+
from processing.script.ScriptAlgorithm import ScriptAlgorithm
3738
from processing.script.WrongScriptException import WrongScriptException
3839
from processing.script.ScriptUtils import ScriptUtils
3940

@@ -53,8 +54,9 @@ def execute(self):
5354
settings = QgsSettings()
5455
lastDir = settings.value('Processing/lastScriptsDir', '')
5556
filenames, selected_filter = QFileDialog.getOpenFileNames(self.toolbox,
56-
self.tr('Script files', 'AddScriptFromFileAction'), lastDir,
57-
self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction'))
57+
self.tr('Script files'),
58+
lastDir,
59+
self.tr('Script files (*.py *.PY)'))
5860
if filenames:
5961
validAlgs = 0
6062
wrongAlgs = []
@@ -73,6 +75,6 @@ def execute(self):
7375
QgsApplication.processingRegistry().providerById('script').refreshAlgorithms()
7476
if wrongAlgs:
7577
QMessageBox.warning(self.toolbox,
76-
self.tr('Error reading scripts', 'AddScriptFromFileAction'),
77-
self.tr('The following files do not contain a valid script:\n-', 'AddScriptFromFileAction') +
78-
"\n-".join(wrongAlgs))
78+
self.tr('Error reading scripts'),
79+
self.tr('The following files do not contain a valid script:\n') +
80+
"\n- ".join(wrongAlgs))

python/plugins/processing/gui/CreateNewScriptAction.py renamed to python/plugins/processing/script/CreateNewScriptAction.py

+5-12
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,20 @@
3030
from qgis.core import QgsApplication
3131

3232
from processing.gui.ToolboxAction import ToolboxAction
33-
from processing.gui.ScriptEditorDialog import ScriptEditorDialog
33+
34+
from processing.script.ScriptEditorDialog import ScriptEditorDialog
3435

3536
pluginPath = os.path.split(os.path.dirname(__file__))[0]
3637

3738

3839
class CreateNewScriptAction(ToolboxAction):
39-
40-
SCRIPT_PYTHON = 0
41-
42-
def __init__(self, actionName, scriptType):
40+
def __init__(self, actionName):
4341
self.name, self.i18n_name = self.trAction(actionName)
4442
self.group, self.i18n_group = self.trAction('Tools')
4543

46-
self.scriptType = scriptType
47-
4844
def getIcon(self):
49-
if self.scriptType == self.SCRIPT_PYTHON:
50-
return QgsApplication.getThemeIcon("/processingScript.svg")
45+
return QgsApplication.getThemeIcon("/processingScript.svg")
5146

5247
def execute(self):
53-
dlg = None
54-
if self.scriptType == self.SCRIPT_PYTHON:
55-
dlg = ScriptEditorDialog(ScriptEditorDialog.SCRIPT_PYTHON, None)
48+
dlg = ScriptEditorDialog(None)
5649
dlg.show()

python/plugins/processing/gui/DeleteScriptAction.py renamed to python/plugins/processing/script/DeleteScriptAction.py

+6-13
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,18 @@
3737

3838

3939
class DeleteScriptAction(ContextAction):
40-
41-
SCRIPT_PYTHON = 0
42-
43-
def __init__(self, scriptType):
44-
self.name = self.tr('Delete script', 'DeleteScriptAction')
45-
self.scriptType = scriptType
40+
def __init__(self):
41+
self.name = self.tr('Delete script')
4642

4743
def isEnabled(self):
48-
if self.scriptType == self.SCRIPT_PYTHON:
49-
return isinstance(self.itemData, ScriptAlgorithm) and self.itemData.allowEdit
44+
return isinstance(self.itemData, ScriptAlgorithm) and self.itemData.allowEdit
5045

5146
def execute(self):
5247
reply = QMessageBox.question(None,
53-
self.tr('Confirmation', 'DeleteScriptAction'),
54-
self.tr('Are you sure you want to delete this script?',
55-
'DeleteScriptAction'),
48+
self.tr('Confirmation'),
49+
self.tr('Are you sure you want to delete this script?'),
5650
QMessageBox.Yes | QMessageBox.No,
5751
QMessageBox.No)
5852
if reply == QMessageBox.Yes:
5953
os.remove(self.itemData.descriptionFile)
60-
if self.scriptType == self.SCRIPT_PYTHON:
61-
QgsApplication.processingRegistry().providerById('script').refreshAlgorithms()
54+
QgsApplication.processingRegistry().providerById('script').refreshAlgorithms()

python/plugins/processing/gui/EditScriptAction.py renamed to python/plugins/processing/script/EditScriptAction.py

+6-10
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,18 @@
2626
__revision__ = '$Format:%H$'
2727

2828
from processing.gui.ContextAction import ContextAction
29-
from processing.gui.ScriptEditorDialog import ScriptEditorDialog
29+
30+
from processing.script.ScriptEditorDialog import ScriptEditorDialog
3031
from processing.script.ScriptAlgorithm import ScriptAlgorithm
3132

3233

3334
class EditScriptAction(ContextAction):
34-
35-
SCRIPT_PYTHON = 0
36-
37-
def __init__(self, scriptType):
38-
self.name = self.tr('Edit script', 'EditScriptAction')
39-
self.scriptType = scriptType
35+
def __init__(self):
36+
self.name = self.tr('Edit script')
4037

4138
def isEnabled(self):
42-
if self.scriptType == ScriptEditorDialog.SCRIPT_PYTHON:
43-
return isinstance(self.itemData, ScriptAlgorithm) and self.itemData.allowEdit
39+
return isinstance(self.itemData, ScriptAlgorithm) and self.itemData.allowEdit
4440

4541
def execute(self):
46-
dlg = ScriptEditorDialog(self.scriptType, self.itemData)
42+
dlg = ScriptEditorDialog(self.itemData)
4743
dlg.show()

python/plugins/processing/script/ScriptAlgorithmProvider.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@
3131
QgsProcessingProvider)
3232

3333
from processing.core.ProcessingConfig import ProcessingConfig, Setting
34-
from processing.gui.EditScriptAction import EditScriptAction
35-
from processing.gui.DeleteScriptAction import DeleteScriptAction
36-
from processing.gui.CreateNewScriptAction import CreateNewScriptAction
37-
from processing.script.ScriptUtils import ScriptUtils
38-
from processing.script.AddScriptFromFileAction import AddScriptFromFileAction
3934
from processing.gui.ProviderActions import (ProviderActions,
4035
ProviderContextMenuActions)
36+
37+
from processing.script.AddScriptFromFileAction import AddScriptFromFileAction
38+
from processing.script.CreateNewScriptAction import CreateNewScriptAction
39+
from processing.script.DeleteScriptAction import DeleteScriptAction
40+
from processing.script.EditScriptAction import EditScriptAction
4141
from processing.script.CreateScriptCollectionPluginAction import CreateScriptCollectionPluginAction
42+
from processing.script.ScriptUtils import ScriptUtils
4243

4344
pluginPath = os.path.split(os.path.dirname(__file__))[0]
4445

@@ -49,13 +50,11 @@ def __init__(self):
4950
super().__init__()
5051
self.algs = []
5152
self.folder_algorithms = []
52-
self.actions = [CreateNewScriptAction('Create new script',
53-
CreateNewScriptAction.SCRIPT_PYTHON),
53+
self.actions = [CreateNewScriptAction('Create new script'),
5454
AddScriptFromFileAction(),
5555
CreateScriptCollectionPluginAction()]
56-
self.contextMenuActions = \
57-
[EditScriptAction(EditScriptAction.SCRIPT_PYTHON),
58-
DeleteScriptAction(DeleteScriptAction.SCRIPT_PYTHON)]
56+
self.contextMenuActions = [EditScriptAction(),
57+
DeleteScriptAction()]
5958

6059
def load(self):
6160
ProcessingConfig.settingIcons[self.name()] = self.icon()

0 commit comments

Comments
 (0)