update console for sextante renaming

qgis · Aug 20, 2013 · ec82b52 · ec82b52
1 parent 36812e1
commit ec82b52
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -72,7 +72,7 @@
         <file>themes/default/console/iconSaveConsole.png</file>
         <file>themes/default/console/iconScriptConsole.png</file>
         <file>themes/default/console/iconSettingsConsole.png</file>
-        <file>themes/default/console/iconSextanteConsole.png</file>
+        <file>themes/default/console/iconProcessingConsole.png</file>
         <file>themes/default/console/consoleHelp.png</file>
         <file>themes/default/console/editorHelp.png</file>
         <file>themes/default/console/classBrowserHelp.png</file>

diff --git a/...s/default/console/iconSextanteConsole.png → ...default/console/iconProcessingConsole.png b/...s/default/console/iconSextanteConsole.png → ...default/console/iconProcessingConsole.png
diff --git a/python/console/console.py b/python/console/console.py
@@ -307,16 +307,16 @@ def __init__(self, parent=None):
         self.actionClass.setIconVisibleInMenu(True)
         self.actionClass.setToolTip(actionClassBt)
         self.actionClass.setText(actionClassBt)
-        ## Import Sextante class
-        loadSextanteBt = QCoreApplication.translate("PythonConsole", "Import Sextante class")
-        self.loadSextanteButton = QAction(self)
-        self.loadSextanteButton.setCheckable(False)
-        self.loadSextanteButton.setEnabled(True)
-        self.loadSextanteButton.setIcon(QgsApplication.getThemeIcon("console/iconSextanteConsole.png"))
-        self.loadSextanteButton.setMenuRole(QAction.PreferencesRole)
-        self.loadSextanteButton.setIconVisibleInMenu(True)
-        self.loadSextanteButton.setToolTip(loadSextanteBt)
-        self.loadSextanteButton.setText(loadSextanteBt)
+        ## Import Processing class
+        loadProcessingBt = QCoreApplication.translate("PythonConsole", "Import Processing class")
+        self.loadProcessingButton = QAction(self)
+        self.loadProcessingButton.setCheckable(False)
+        self.loadProcessingButton.setEnabled(True)
+        self.loadProcessingButton.setIcon(QgsApplication.getThemeIcon("console/iconProcessingConsole.png"))
+        self.loadProcessingButton.setMenuRole(QAction.PreferencesRole)
+        self.loadProcessingButton.setIconVisibleInMenu(True)
+        self.loadProcessingButton.setToolTip(loadProcessingBt)
+        self.loadProcessingButton.setText(loadProcessingBt)
         ## Import QtCore class
         loadQtCoreBt = QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore class")
         self.loadQtCoreButton = QAction(self)
@@ -414,7 +414,7 @@ def __init__(self, parent=None):
 
         ## Menu Import Class
         self.classMenu = QMenu()
-        self.classMenu.addAction(self.loadSextanteButton)
+        self.classMenu.addAction(self.loadProcessingButton)
         self.classMenu.addAction(self.loadQtCoreButton)
         self.classMenu.addAction(self.loadQtGuiButton)
         cM = self.toolBar.widgetForAction(self.actionClass)
@@ -526,7 +526,7 @@ def __init__(self, parent=None):
         self.showEditorButton.toggled.connect(self.toggleEditor)
         self.clearButton.triggered.connect(self.shellOut.clearConsole)
         self.optionsButton.triggered.connect(self.openSettings)
-        self.loadSextanteButton.triggered.connect(self.sextante)
+        self.loadProcessingButton.triggered.connect(self.processing)
         self.loadQtCoreButton.triggered.connect(self.qtCore)
         self.loadQtGuiButton.triggered.connect(self.qtGui)
         self.runButton.triggered.connect(self.shell.entered)
@@ -577,8 +577,8 @@ def onClickGoToLine(self, item, column):
             objName = itemName
         tabEditor.goToLine(objName, linenr)
 
-    def sextante(self):
-       self.shell.commandConsole('sextante')
+    def processing(self):
+       self.shell.commandConsole('processing')
 
     def qtCore(self):
        self.shell.commandConsole('qtCore')

diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -153,9 +153,9 @@ def commandConsole(self, command):
         selCmdLenght = len(self.text(line))
         self.setSelection(line, 4, line, selCmdLenght)
         self.removeSelectedText()
-        if command == "sextante":
+        if command == "processing":
             # import Sextante class
-            self.append('import sextante')
+            self.append('import processing')
         elif command == "qtCore":
             # import QtCore class
             self.append('from PyQt4.QtCore import *')