eric: comparison QScintilla/Shell.py

-:4c45d163c6ac
+:613e37fabd96
 from ThirdParty.enum import Enum
 from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent
 from PyQt5.QtGui import QClipboard, QPalette, QFont
 from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu, \
-QWidget, QHBoxLayout, QVBoxLayout, QShortcut
+QWidget, QHBoxLayout, QVBoxLayout, QShortcut, QSizePolicy
 from PyQt5.Qsci import QsciScintilla
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 self.__shell = Shell(dbs, vm, False, self)
 from UI.SearchWidget import SearchWidget
 self.__searchWidget = SearchWidget(self.__shell, self, horizontal)
+self.__searchWidget.setSizePolicy(QSizePolicy.Fixed,
+QSizePolicy.Preferred)
 self.__searchWidget.hide()
 if horizontal:
 self.__layout = QHBoxLayout(self)
 else:
 @signal searchStringFound(bool) emitted to indicate the search
 result
 @signal historyStyleChanged(ShellHistoryStyle) emitted to indicate a
 change of the history style
+@signal queueText(str) emitted to queue some text for processing
 """
 searchStringFound = pyqtSignal(bool)
 historyStyleChanged = pyqtSignal(ShellHistoryStyle)
+queueText = pyqtSignal(str)
 def __init__(self, dbs, vm, windowedVariant, parent=None):
 """
 Constructor
 }
 self.__historyNavigateByCursor = \
 Preferences.getShell("HistoryNavigateByCursor")
+self.__queuedText = ''
+self.__blockTextProcessing = False
+self.queueText.connect(self.__concatenateText, Qt.QueuedConnection)
 self.grabGesture(Qt.PinchGesture)
 def __showLanguageMenu(self):
 """
 Private slot to prepare the language submenu.
 """
 Private method to display some text.
 @param s text to be displayed (string)
 """
+self.queueText.emit(s)
+def __concatenateText(self, text):
+"""
+Private slot to get all available text and process it in one step.
+@param text text to be appended
+@type str
+"""
+self.__queuedText += text
+if self.__blockTextProcessing:
+return
+self.__blockTextProcessing = True
+# Get all text which is still waiting for output
+QApplication.processEvents()
+# Finally process the accumulated text
 line, col = self.__getEndPos()
 self.setCursorPosition(line, col)
-self.insert(Utilities.filterAnsiSequences(s))
+self.insert(Utilities.filterAnsiSequences(self.__queuedText))
 self.prline, self.prcol = self.getCursorPosition()
 self.ensureCursorVisible()
 self.ensureLineVisible(self.prline)
+self.__queuedText = ''
+self.__blockTextProcessing = False
 def __writeStdOut(self, s):
 """
 Private method to display some text with StdOut label.
 @param s text to be displayed (string)
 @param action context menu action that was triggered (QAction)
 """
 language = action.data()
 self.dbs.startClient(False, language)
+self.__getBanner()
 def handlePreferencesChanged(self):
 """
 Public slot to handle the preferencesChanged signal.
 """
 """
 if not self.__actionsAdded:
 self.addActions(self.vm.editorActGrp.actions())
 self.addActions(self.vm.copyActGrp.actions())
 self.addActions(self.vm.viewActGrp.actions())
-self.__searchShortcut = QShortcut(
+if not self.__windowed:
-self.vm.searchAct.shortcut(), self,
+self.__searchShortcut = QShortcut(
-self.__find, self.__find)
+self.vm.searchAct.shortcut(), self,
-self.__searchNextShortcut = QShortcut(
+self.__find, self.__find)
-self.vm.searchNextAct.shortcut(), self,
+self.__searchNextShortcut = QShortcut(
-self.__searchNext, self.__searchNext)
+self.vm.searchNextAct.shortcut(), self,
-self.__searchPrevShortcut = QShortcut(
+self.__searchNext, self.__searchNext)
-self.vm.searchPrevAct.shortcut(), self,
+self.__searchPrevShortcut = QShortcut(
-self.__searchPrev, self.__searchPrev)
+self.vm.searchPrevAct.shortcut(), self,
+self.__searchPrev, self.__searchPrev)
 try:
 self.vm.editActGrp.setEnabled(False)
 self.vm.editorActGrp.setEnabled(True)
 self.vm.copyActGrp.setEnabled(True)
 self.vm.viewActGrp.setEnabled(True)
 self.vm.searchActGrp.setEnabled(False)
 except AttributeError:
 pass
-self.__searchShortcut.setEnabled(True)
+if not self.__windowed:
-self.__searchNextShortcut.setEnabled(True)
+self.__searchShortcut.setEnabled(True)
-self.__searchPrevShortcut.setEnabled(True)
+self.__searchNextShortcut.setEnabled(True)
+self.__searchPrevShortcut.setEnabled(True)
 self.setCaretWidth(self.caretWidth)
 self.setCursorFlashTime(QApplication.cursorFlashTime())
 super(Shell, self).focusInEvent(event)
 """
 try:
 self.vm.editorActGrp.setEnabled(False)
 except AttributeError:
 pass
-self.__searchShortcut.setEnabled(False)
+if not self.__windowed:
-self.__searchNextShortcut.setEnabled(False)
+self.__searchShortcut.setEnabled(False)
-self.__searchPrevShortcut.setEnabled(False)
+self.__searchNextShortcut.setEnabled(False)
+self.__searchPrevShortcut.setEnabled(False)
 self.setCaretWidth(0)
 super(Shell, self).focusOutEvent(event)
 def insert(self, txt):
 """
 @param wholeWord flag indicating to search for whole words
 only (boolean)
 """
 self.__lastSearch = (txt, caseSensitive, wholeWord)
 ok = self.findFirst(
-txt, False, caseSensitive, wholeWord, False, forward=True)
+txt, False, caseSensitive, wholeWord, True, forward=True)
 self.searchStringFound.emit(ok)
 def __searchPrev(self):
 """
 Private method to search for the next occurrence.
 if self.hasSelectedText():
 line, index = self.getSelection()[:2]
 else:
 line, index = -1, -1
 ok = self.findFirst(
-txt, False, caseSensitive, wholeWord, False,
+txt, False, caseSensitive, wholeWord, True,
 forward=False, line=line, index=index)
 self.searchStringFound.emit(ok)
 def historyStyle(self):
 """

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Shell.py

QScintilla/Shell.py