Skip to content

Commit

Permalink
[processing] Fix some message box titles
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Feb 21, 2018
1 parent f8c3f39 commit 277e06e
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
Expand Up @@ -42,7 +42,7 @@
class AddModelFromFileAction(ToolboxAction): class AddModelFromFileAction(ToolboxAction):


def __init__(self): def __init__(self):
self.name = self.tr('Add model from file') self.name = self.tr('Add Model From File…')
self.group = self.tr('Tools') self.group = self.tr('Tools')


def getIcon(self): def getIcon(self):
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/modeler/CreateNewModelAction.py
Expand Up @@ -38,7 +38,7 @@
class CreateNewModelAction(ToolboxAction): class CreateNewModelAction(ToolboxAction):


def __init__(self): def __init__(self):
self.name = self.tr('Create new model') self.name = self.tr('Create New Model…')
self.group = self.tr('Tools') self.group = self.tr('Tools')


def getIcon(self): def getIcon(self):
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/modeler/DeleteModelAction.py
Expand Up @@ -34,15 +34,15 @@
class DeleteModelAction(ContextAction): class DeleteModelAction(ContextAction):


def __init__(self): def __init__(self):
self.name = self.tr('Delete model', 'DeleteModelAction') self.name = self.tr('Delete Model…', 'DeleteModelAction')


def isEnabled(self): def isEnabled(self):
return isinstance(self.itemData, QgsProcessingModelAlgorithm) return isinstance(self.itemData, QgsProcessingModelAlgorithm)


def execute(self): def execute(self):
reply = QMessageBox.question( reply = QMessageBox.question(
None, None,
self.tr('Confirmation', 'DeleteModelAction'), self.tr('Delete Model', 'DeleteModelAction'),
self.tr('Are you sure you want to delete this model?', 'DeleteModelAction'), self.tr('Are you sure you want to delete this model?', 'DeleteModelAction'),
QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes | QMessageBox.No,
QMessageBox.No) QMessageBox.No)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/modeler/EditModelAction.py
Expand Up @@ -33,7 +33,7 @@
class EditModelAction(ContextAction): class EditModelAction(ContextAction):


def __init__(self): def __init__(self):
self.name = self.tr('Edit model', 'EditModelAction') self.name = self.tr('Edit Model…', 'EditModelAction')


def isEnabled(self): def isEnabled(self):
return isinstance(self.itemData, QgsProcessingModelAlgorithm) return isinstance(self.itemData, QgsProcessingModelAlgorithm)
Expand Down
Expand Up @@ -35,14 +35,14 @@
class DeletePreconfiguredAlgorithmAction(ContextAction): class DeletePreconfiguredAlgorithmAction(ContextAction):


def __init__(self): def __init__(self):
self.name = self.tr('Delete preconfigured algorithm', 'DeletePreconfiguredAlgorithmAction') self.name = self.tr('Delete Preconfigured Algorithm…', 'DeletePreconfiguredAlgorithmAction')


def isEnabled(self): def isEnabled(self):
return isinstance(self.itemData, PreconfiguredAlgorithm) return isinstance(self.itemData, PreconfiguredAlgorithm)


def execute(self): def execute(self):
reply = QMessageBox.question(None, reply = QMessageBox.question(None,
self.tr('Confirmation', 'DeletePreconfiguredAlgorithmAction'), self.tr('Delete Algorithm', 'DeletePreconfiguredAlgorithmAction'),
self.tr('Are you sure you want to delete this algorithm?', self.tr('Are you sure you want to delete this algorithm?',
'DeletePreconfiguredAlgorithmAction'), 'DeletePreconfiguredAlgorithmAction'),
QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes | QMessageBox.No,
Expand Down
Expand Up @@ -27,15 +27,14 @@
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'


from processing.gui.ContextAction import ContextAction from processing.gui.ContextAction import ContextAction
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.preconfigured.PreconfiguredAlgorithmDialog import PreconfiguredAlgorithmDialog from processing.preconfigured.PreconfiguredAlgorithmDialog import PreconfiguredAlgorithmDialog
from processing.preconfigured.PreconfiguredAlgorithm import PreconfiguredAlgorithm from processing.preconfigured.PreconfiguredAlgorithm import PreconfiguredAlgorithm




class NewPreconfiguredAlgorithmAction(ContextAction): class NewPreconfiguredAlgorithmAction(ContextAction):


def __init__(self): def __init__(self):
self.name = self.tr('Create preconfigured algorithm', 'NewPreconfiguredAlgorithmAction') self.name = self.tr('Create Preconfigured Algorithm…', 'NewPreconfiguredAlgorithmAction')


def isEnabled(self): def isEnabled(self):
return (isinstance(self.itemData, GeoAlgorithm) and return (isinstance(self.itemData, GeoAlgorithm) and
Expand Down
Expand Up @@ -40,7 +40,7 @@
class AddScriptFromFileAction(ToolboxAction): class AddScriptFromFileAction(ToolboxAction):


def __init__(self): def __init__(self):
self.name = self.tr("Add script from file") self.name = self.tr("Add Script From File…")
self.group = self.tr("Tools") self.group = self.tr("Tools")


def execute(self): def execute(self):
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/script/CreateNewScriptAction.py
Expand Up @@ -37,7 +37,7 @@
class CreateNewScriptAction(ToolboxAction): class CreateNewScriptAction(ToolboxAction):


def __init__(self): def __init__(self):
self.name = self.tr("Create new script") self.name = self.tr("Create New Script…")
self.group = self.tr("Tools") self.group = self.tr("Tools")


def execute(self): def execute(self):
Expand Down
12 changes: 6 additions & 6 deletions python/plugins/processing/script/DeleteScriptAction.py
Expand Up @@ -39,14 +39,14 @@
class DeleteScriptAction(ContextAction): class DeleteScriptAction(ContextAction):


def __init__(self): def __init__(self):
self.name = self.tr("Delete script") self.name = self.tr("Delete Script…")


def isEnabled(self): def isEnabled(self):
return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "script" return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "script"


def execute(self): def execute(self):
reply = QMessageBox.question(None, reply = QMessageBox.question(None,
self.tr("Confirmation"), self.tr("Delete Script"),
self.tr("Are you sure you want to delete this script?"), self.tr("Are you sure you want to delete this script?"),
QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes | QMessageBox.No,
QMessageBox.No) QMessageBox.No)
Expand All @@ -56,7 +56,7 @@ def execute(self):
os.remove(filePath) os.remove(filePath)
QgsApplication.processingRegistry().providerById("script").refreshAlgorithms() QgsApplication.processingRegistry().providerById("script").refreshAlgorithms()
else: else:
QgsMessageBox.warning(None, QMessageBox.warning(None,
self.tr("File not found"), self.tr("Delete Script"),
self.tr("Can not find corresponding script file.") self.tr("Can not find corresponding script file.")
) )
11 changes: 6 additions & 5 deletions python/plugins/processing/script/EditScriptAction.py
Expand Up @@ -29,6 +29,7 @@


from qgis.core import QgsProcessingAlgorithm from qgis.core import QgsProcessingAlgorithm
from qgis.utils import iface from qgis.utils import iface
from qgis.PyQt.QtWidgets import QMessageBox


from processing.gui.ContextAction import ContextAction from processing.gui.ContextAction import ContextAction


Expand All @@ -39,7 +40,7 @@
class EditScriptAction(ContextAction): class EditScriptAction(ContextAction):


def __init__(self): def __init__(self):
self.name = self.tr("Edit script") self.name = self.tr("Edit Script…")


def isEnabled(self): def isEnabled(self):
return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "script" return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "script"
Expand All @@ -50,7 +51,7 @@ def execute(self):
dlg = ScriptEditorDialog(filePath, iface.mainWindow()) dlg = ScriptEditorDialog(filePath, iface.mainWindow())
dlg.show() dlg.show()
else: else:
QgsMessageBox.warning(None, QMessageBox.warning(None,
self.tr("File not found"), self.tr("Edit Script"),
self.tr("Can not find corresponding script file.") self.tr("Can not find corresponding script file.")
) )

0 comments on commit 277e06e

Please sign in to comment.