Changeset 71052 in vbox

Timestamp:

Feb 19, 2018 1:22:57 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120915

Message:

FE/Qt: bugref:6699 Only the last line of the guest control console is editable

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl

Files:

• UIGuestControlConsole.cpp (modified) (6 diffs)
• UIGuestControlTreeItem.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlConsole.cpp

@@ -79 +79 @@
 void UIGuestControlConsole::keyPressEvent(QKeyEvent *pEvent)
 {
+    /* Check if we at the bottom most line.*/
+    bool lastLine = blockCount() == (textCursor().blockNumber() +1);
 
     switch (pEvent->key()) {
@@ -90 +92 @@
         case Qt::Key_Down:
         {
-            replaceLineContent(getNextCommandFromHistory(getCommandString()));
+            if (lastLine)
+                replaceLineContent(getNextCommandFromHistory(getCommandString()));
             break;
         }
@@ -96 +99 @@
         {
             QTextCursor cursor = textCursor();
-            if (cursor.positionInBlock() > m_strPrompt.length())
+            if (lastLine && cursor.positionInBlock() > m_strPrompt.length())
                 cursor.deletePreviousChar();
             break;
@@ -110 +113 @@
         case Qt::Key_Enter:
         {
-            QString strCommand(getCommandString());
-            if (!strCommand.isEmpty())
+            if (lastLine)
             {
-                emit commandEntered(strCommand);
-                if (!m_tCommandHistory.contains(strCommand))
-                    m_tCommandHistory.push_back(strCommand);
-                m_uCommandHistoryIndex = m_tCommandHistory.size()-1;
-                moveCursor(QTextCursor::End);
-                QPlainTextEdit::keyPressEvent(pEvent);
-                startNextLine();
+                QString strCommand(getCommandString());
+                if (!strCommand.isEmpty())
+                {
+                    emit commandEntered(strCommand);
+                    if (!m_tCommandHistory.contains(strCommand))
+                        m_tCommandHistory.push_back(strCommand);
+                    m_uCommandHistoryIndex = m_tCommandHistory.size()-1;
+                    moveCursor(QTextCursor::End);
+                    QPlainTextEdit::keyPressEvent(pEvent);
+                    startNextLine();
+                }
             }
             break;
@@ -132 +138 @@
         }
         default:
-            QPlainTextEdit::keyPressEvent(pEvent);
+            if (lastLine)
+                QPlainTextEdit::keyPressEvent(pEvent);
             break;
     }
@@ -152 +159 @@
 void UIGuestControlConsole::contextMenuEvent(QContextMenuEvent *pEvent)
 {
-    //Q_UNUSED(pEvent);
-    QPlainTextEdit::contextMenuEvent(pEvent);
+    Q_UNUSED(pEvent);
+    //QPlainTextEdit::contextMenuEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlTreeItem.cpp

@@ -115 +115 @@
     return statusString;
 }
+
+
 /*********************************************************************************************************************************
 *   UIGuestControlTreeItem implementation.                                                                                       *
@@ -277 +279 @@
     setText(2, QString("Session Status: %1").arg(sessionStatusString(m_comGuestSession.GetStatus())));
 }
+
 
 /*********************************************************************************************************************************