Skip to content

Commit 8203eff

Browse files
committedJan 12, 2013
remove item QgsInterface from import class menu in python console
since a369ed0 it is no longer necessary to import iface object
1 parent 13bfb5e commit 8203eff

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed
 

‎python/console/console.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,6 @@ def __init__(self, parent=None):
167167
self.loadSextanteButton.setIconVisibleInMenu(True)
168168
self.loadSextanteButton.setToolTip(loadSextanteBt)
169169
self.loadSextanteButton.setText(loadSextanteBt)
170-
## Import QgisInterface class
171-
loadIfaceBt = QCoreApplication.translate("PythonConsole", "Import QgisInterface class")
172-
self.loadIfaceButton = QAction(parent)
173-
self.loadIfaceButton.setCheckable(False)
174-
self.loadIfaceButton.setEnabled(True)
175-
self.loadIfaceButton.setIcon(QgsApplication.getThemeIcon("console/iconIfaceConsole.png"))
176-
self.loadIfaceButton.setMenuRole(QAction.PreferencesRole)
177-
self.loadIfaceButton.setIconVisibleInMenu(True)
178-
self.loadIfaceButton.setToolTip(loadIfaceBt)
179-
self.loadIfaceButton.setText(loadIfaceBt)
180170
## Import QtCore class
181171
loadQtCoreBt = QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore class")
182172
self.loadQtCoreButton = QAction(parent)
@@ -246,7 +236,6 @@ def __init__(self, parent=None):
246236
self.toolBar.addAction(self.runButton)
247237
## Menu Import Class
248238
self.classMenu = QMenu(self)
249-
self.classMenu.addAction(self.loadIfaceButton)
250239
self.classMenu.addAction(self.loadSextanteButton)
251240
self.classMenu.addAction(self.loadQtCoreButton)
252241
self.classMenu.addAction(self.loadQtGuiButton)
@@ -293,7 +282,6 @@ def __init__(self, parent=None):
293282

294283
self.clearButton.triggered.connect(self.textEditOut.clearConsole)
295284
self.optionsButton.triggered.connect(self.openSettings)
296-
self.loadIfaceButton.triggered.connect(self.iface)
297285
self.loadSextanteButton.triggered.connect(self.sextante)
298286
self.loadQtCoreButton.triggered.connect(self.qtCore)
299287
self.loadQtGuiButton.triggered.connect(self.qtGui)
@@ -307,9 +295,6 @@ def __init__(self, parent=None):
307295
def sextante(self):
308296
self.edit.commandConsole('sextante')
309297

310-
def iface(self):
311-
self.edit.commandConsole('iface')
312-
313298
def qtCore(self):
314299
self.edit.commandConsole('qtCore')
315300

‎python/console/console_output.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def __init__(self, parent=None):
125125
def insertInitText(self):
126126
txtInit = QCoreApplication.translate("PythonConsole",
127127
"## To access Quantum GIS environment from this console\n"
128-
"## iface object (instance of QgisInterface class). \n"
128+
"## use iface object (instance of QgisInterface class). \n"
129129
"## Type help(iface) for more info and list of methods.\n\n")
130130
initText = self.setText(txtInit)
131131

‎python/console/console_sci.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import code
3232

3333
_init_commands = ["from qgis.core import *", "import qgis.utils",
34-
"from qgis.utils import iface"]
34+
"from qgis.utils import iface"]
3535
_historyFile = os.path.join(str(QDir.homePath()),".qgis","console_history.txt")
3636

3737
class PythonEdit(QsciScintilla, code.InteractiveInterpreter):
@@ -128,10 +128,7 @@ def commandConsole(self, command):
128128
selCmdLenght = self.text(line).length()
129129
self.setSelection(line, 4, line, selCmdLenght)
130130
self.removeSelectedText()
131-
if command == "iface":
132-
# import QgisInterface class
133-
self.append('from qgis.utils import iface')
134-
elif command == "sextante":
131+
if command == "sextante":
135132
# import Sextante class
136133
self.append('import sextante')
137134
elif command == "qtCore":

0 commit comments

Comments
 (0)
Please sign in to comment.