##// END OF EJS Templates
Merge pull request #5961 from minrk/qt-no-truncate-page...
Thomas Kluyver -
r16966:6b7cb2eb merge
parent child Browse files
Show More
@@ -1472,6 +1472,8 class ConsoleWidget(MetaQObjectHasTraits('NewBase', (LoggingConfigurable, QtGui.
1472 self._control.setFocus()
1472 self._control.setFocus()
1473 else:
1473 else:
1474 self.layout().setCurrentWidget(self._control)
1474 self.layout().setCurrentWidget(self._control)
1475 # re-enable buffer truncation after paging
1476 self._control.document().setMaximumBlockCount(self.buffer_size)
1475 return True
1477 return True
1476
1478
1477 elif key in (QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return,
1479 elif key in (QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return,
@@ -1903,6 +1905,8 class ConsoleWidget(MetaQObjectHasTraits('NewBase', (LoggingConfigurable, QtGui.
1903 if self.paging == 'custom':
1905 if self.paging == 'custom':
1904 self.custom_page_requested.emit(text)
1906 self.custom_page_requested.emit(text)
1905 else:
1907 else:
1908 # disable buffer truncation during paging
1909 self._control.document().setMaximumBlockCount(0)
1906 self._page_control.clear()
1910 self._page_control.clear()
1907 cursor = self._page_control.textCursor()
1911 cursor = self._page_control.textCursor()
1908 if html:
1912 if html:
General Comments 0
You need to be logged in to leave comments. Login now