# HG changeset patch # User Jacob Dawid # Date 1313700898 -7200 # Node ID 1686eae6d2e9a796eb65703022ad21a018feee95 # Parent aa54bdaee8c8aee8c720af4e19576b3515bc2337 Now settings cursor at end when typing. diff -r aa54bdaee8c8 -r 1686eae6d2e9 gui/src/OctaveTerminal.cpp --- a/gui/src/OctaveTerminal.cpp Thu Aug 18 21:38:34 2011 +0200 +++ b/gui/src/OctaveTerminal.cpp Thu Aug 18 22:54:58 2011 +0200 @@ -70,6 +70,18 @@ void OctaveTerminal::keyPressEvent (QKeyEvent * keyEvent) { + switch (keyEvent->key ()) + { + case Qt::Key_PageUp: + if (verticalScrollBar ()) + verticalScrollBar ()->setValue (verticalScrollBar ()->value () - 10); + break; + case Qt::Key_PageDown: + if (verticalScrollBar ()) + verticalScrollBar ()->setValue (verticalScrollBar ()->value () + 10); + break; + } + //QByteArray textToSend; //textToSend += QString::fromUtf8()); @@ -94,44 +106,13 @@ { bool update = true; - if (event->key () == Qt::Key_PageUp) - { - _screenWindow->scrollBy (ScreenWindow::ScrollPages, -1); - } - else if (event->key () == Qt::Key_PageDown) - { - _screenWindow->scrollBy (ScreenWindow::ScrollPages, 1); - } - else if (event->key () == Qt::Key_Up) - { - _screenWindow->scrollBy (ScreenWindow::ScrollLines, -1); - } - else if (event->key () == Qt::Key_Down) - { - _screenWindow->scrollBy (ScreenWindow::ScrollLines, 1); - } + else update = false; } - _actSel = 0; // Key stroke implies a screen update, so TerminalDisplay won't - // know where the current selection is. - if (_hasBlinkingCursor) - { - _blinkCursorTimer->start (QApplication::cursorFlashTime () / 2); - if (_cursorBlinking) - blinkCursorEvent (); - else - _cursorBlinking = false; - } - - if (emitKeyPressSignal) - emit keyPressedSignal (event); - - event->accept (); - _scrollBar->setValue (_scrollBar->maximum ()); Qt::KeyboardModifiers modifiers = keyEvent->modifiers (); KeyboardTranslator::States states = KeyboardTranslator::NoState; @@ -219,6 +200,7 @@ QTextCursor tc = textCursor (); tc.movePosition (QTextCursor::End); tc.insertText (data); + setTextCursor (tc); if (verticalScrollBar ()) {