2 changes: 1 addition & 1 deletion images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
28 changes: 14 additions & 14 deletions python/console/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions python/console/console_sci.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *')
Expand Down
Binary file removed python/plugins/processing/images/toolbox.png
Binary file not shown.