Merge pull request #385 from slarosa/pyqgis-console

remove item QgsInterface from import class menu in python console
qgis · Jan 12, 2013 · 82ea429 · 82ea429
2 parents 13bfb5e + 8203eff
commit 82ea429
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/python/console/console.py b/python/console/console.py
@@ -167,16 +167,6 @@ def __init__(self, parent=None):
         self.loadSextanteButton.setIconVisibleInMenu(True)
         self.loadSextanteButton.setToolTip(loadSextanteBt)
         self.loadSextanteButton.setText(loadSextanteBt)
-        ## Import QgisInterface class
-        loadIfaceBt = QCoreApplication.translate("PythonConsole", "Import QgisInterface class")
-        self.loadIfaceButton = QAction(parent)
-        self.loadIfaceButton.setCheckable(False)
-        self.loadIfaceButton.setEnabled(True)
-        self.loadIfaceButton.setIcon(QgsApplication.getThemeIcon("console/iconIfaceConsole.png"))
-        self.loadIfaceButton.setMenuRole(QAction.PreferencesRole)
-        self.loadIfaceButton.setIconVisibleInMenu(True)
-        self.loadIfaceButton.setToolTip(loadIfaceBt)
-        self.loadIfaceButton.setText(loadIfaceBt)
         ## Import QtCore class
         loadQtCoreBt = QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore class")
         self.loadQtCoreButton = QAction(parent)
@@ -246,7 +236,6 @@ def __init__(self, parent=None):
         self.toolBar.addAction(self.runButton)
         ## Menu Import Class
         self.classMenu = QMenu(self)
-        self.classMenu.addAction(self.loadIfaceButton)
         self.classMenu.addAction(self.loadSextanteButton)
         self.classMenu.addAction(self.loadQtCoreButton)
         self.classMenu.addAction(self.loadQtGuiButton)
@@ -293,7 +282,6 @@ def __init__(self, parent=None):
 
         self.clearButton.triggered.connect(self.textEditOut.clearConsole)
         self.optionsButton.triggered.connect(self.openSettings)
-        self.loadIfaceButton.triggered.connect(self.iface)
         self.loadSextanteButton.triggered.connect(self.sextante)
         self.loadQtCoreButton.triggered.connect(self.qtCore)
         self.loadQtGuiButton.triggered.connect(self.qtGui)
@@ -307,9 +295,6 @@ def __init__(self, parent=None):
     def sextante(self):
        self.edit.commandConsole('sextante')
 
-    def iface(self):
-       self.edit.commandConsole('iface')
-
     def qtCore(self):
        self.edit.commandConsole('qtCore')
 

diff --git a/python/console/console_output.py b/python/console/console_output.py
@@ -125,7 +125,7 @@ def __init__(self, parent=None):
     def insertInitText(self):
         txtInit = QCoreApplication.translate("PythonConsole",
                                              "## To access Quantum GIS environment from this console\n"
-                                             "## iface object (instance of QgisInterface class). \n"
+                                             "## use iface object (instance of QgisInterface class). \n"
                                              "## Type help(iface) for more info and list of methods.\n\n")
         initText = self.setText(txtInit)
 

diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -31,7 +31,7 @@
 import code
 
 _init_commands = ["from qgis.core import *", "import qgis.utils",
-                "from qgis.utils import iface"]
+                  "from qgis.utils import iface"]
 _historyFile = os.path.join(str(QDir.homePath()),".qgis","console_history.txt")
 
 class PythonEdit(QsciScintilla, code.InteractiveInterpreter):
@@ -128,10 +128,7 @@ def commandConsole(self, command):
         selCmdLenght = self.text(line).length()
         self.setSelection(line, 4, line, selCmdLenght)
         self.removeSelectedText()
-        if command == "iface":
-            # import QgisInterface class
-            self.append('from qgis.utils import iface')
-        elif command == "sextante":
+        if command == "sextante":
             # import Sextante class
             self.append('import sextante')
         elif command == "qtCore":