diff -r 4860fe0ed4a6 -r 8727522a69d5 ViewManager/ViewManager.py
--- a/ViewManager/ViewManager.py Sat Mar 09 17:05:49 2013 +0100
+++ b/ViewManager/ViewManager.py Sun Mar 10 17:10:23 2013 +0100
@@ -4036,8 +4036,6 @@
if zoom is None:
if QApplication.focusWidget() == e5App().getObject("Shell"):
aw = e5App().getObject("Shell")
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- aw = e5App().getObject("Terminal")
else:
aw = self.activeWindow()
if aw:
@@ -4483,9 +4481,8 @@
@param now reference to the widget gaining focus (QWidget)
"""
from QScintilla.Shell import Shell
- from QScintilla.Terminal import Terminal
-
- if not isinstance(now, (Editor, Shell, Terminal)):
+
+ if not isinstance(now, (Editor, Shell)):
self.editActGrp.setEnabled(False)
self.copyActGrp.setEnabled(False)
self.viewActGrp.setEnabled(False)
@@ -4494,14 +4491,14 @@
self.sbZoom.setEnabled(True)
self.sbZoom.setValue(now.getZoom())
- if not isinstance(now, (Editor, Shell, Terminal)) and \
+ if not isinstance(now, (Editor, Shell)) and \
now is not self.quickFindtextCombo:
self.searchActGrp.setEnabled(False)
if now is self.quickFindtextCombo:
self.searchActGrp.setEnabled(True)
- if isinstance(old, (Editor, Shell, Terminal)):
+ if not isinstance(now, (Editor, Shell)):
self.__lastFocusWidget = old
##################################################################
@@ -4532,8 +4529,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
e5App().getObject("Shell").cut()
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").cut()
else:
self.activeWindow().cut()
@@ -4543,8 +4538,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
e5App().getObject("Shell").copy()
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").copy()
else:
self.activeWindow().copy()
@@ -4554,8 +4547,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
e5App().getObject("Shell").paste()
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").paste()
else:
self.activeWindow().paste()
@@ -4565,8 +4556,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
e5App().getObject("Shell").clear()
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").clear()
else:
self.activeWindow().clear()
@@ -5028,8 +5017,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
e5App().getObject("Shell").zoomIn()
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").zoomIn()
else:
aw = self.activeWindow()
if aw:
@@ -5042,8 +5029,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
e5App().getObject("Shell").zoomOut()
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").zoomOut()
else:
aw = self.activeWindow()
if aw:
@@ -5056,8 +5041,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
e5App().getObject("Shell").zoomTo(0)
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").zoomTo(0)
else:
aw = self.activeWindow()
if aw:
@@ -5072,8 +5055,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
aw = e5App().getObject("Shell")
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- aw = e5App().getObject("Terminal")
else:
aw = self.activeWindow()
if aw:
@@ -5094,8 +5075,6 @@
"""
if QApplication.focusWidget() == e5App().getObject("Shell"):
aw = e5App().getObject("Shell")
- elif QApplication.focusWidget() == e5App().getObject("Terminal"):
- aw = e5App().getObject("Terminal")
else:
aw = self.activeWindow()
if aw and aw == self.sender():
@@ -5674,8 +5653,6 @@
self.redoAct.setEnabled(editor.isRedoAvailable())
self.gotoLastEditAct.setEnabled(editor.isLastEditPositionAvailable())
-## self.previewAct.setEnabled(editor.isPreviewable())
-##
lex = editor.getLexer()
if lex is not None:
self.commentAct.setEnabled(lex.canBlockComment())
@@ -5860,8 +5837,6 @@
focusWidget = QApplication.focusWidget()
if focusWidget == e5App().getObject("Shell"):
e5App().getObject("Shell").editorCommand(cmd)
- elif focusWidget == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").editorCommand(cmd)
elif focusWidget == self.quickFindtextCombo:
self.quickFindtextCombo._editor.editorCommand(cmd)
else:
@@ -5876,7 +5851,6 @@
"""
focusWidget = QApplication.focusWidget()
if focusWidget == e5App().getObject("Shell") or \
- focusWidget == e5App().getObject("Terminal") or \
focusWidget == self.quickFindtextCombo:
return
else:
@@ -6079,8 +6053,6 @@
"""
if self.__lastFocusWidget == e5App().getObject("Shell"):
e5App().getObject("Shell").insert(txt)
- elif self.__lastFocusWidget == e5App().getObject("Terminal"):
- e5App().getObject("Terminal").insert(txt)
else:
aw = self.activeWindow()
if aw is not None:
@@ -6103,11 +6075,6 @@
if aw.hasSelectedText():
aw.removeSelectedText()
aw.insert(txt)
- elif self.__lastFocusWidget == e5App().getObject("Terminal"):
- aw = e5App().getObject("Terminal")
- if aw.hasSelectedText():
- aw.removeSelectedText()
- aw.insert(txt)
else:
aw = self.activeWindow()
if aw is not None:
@@ -6128,10 +6095,6 @@
aw = e5App().getObject("Shell")
if aw.hasSelectedText():
txt = aw.selectedText()
- elif self.__lastFocusWidget == e5App().getObject("Terminal"):
- aw = e5App().getObject("Terminal")
- if aw.hasSelectedText():
- txt = aw.selectedText()
else:
aw = self.activeWindow()
if aw is not None:
