diff --git a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml index 55329840e2cdb13ca80dcea45626db40574da874..56fc11f427a7c396c7fc55d2d161c860ec6b8bc0 100644 --- a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml +++ b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml @@ -2,23 +2,26 @@ import QtQuick 2.13 import QtQml 2.12 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.12 +import QtQuick.Controls 1.4 Page { + SplitView { + anchors.fill: parent + orientation: Qt.Horizontal + anchors.leftMargin: 30 * pt + handleDelegate: Item { } - DapUiQmlWidgetConsoleForm { - id: dapConsoleForm - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: lastActionsPanel.left - anchors.topMargin: 30 * pt - anchors.leftMargin: 30 * pt - anchors.rightMargin: 30 * pt - } + DapUiQmlWidgetConsoleForm { + id: dapConsoleForm + Layout.fillWidth: true + Layout.topMargin: 30 * pt + Layout.rightMargin: 30 * pt + } - DapUiQmlWidgetConsoleLastActionsForm { - id: lastActionsPanel - consoleData: dapConsoleForm.textAreaCmdHistory + DapUiQmlWidgetConsoleLastActionsForm { + id: lastActionsPanel + consoleData: dapConsoleForm.textAreaCmdHistory + } } } diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml index 7610a2b08f6c6af9085bc0a9ff7c8d4ea62a30a0..74752d1b4039e09d433a565101ac1e8a7c8fdf10 100644 --- a/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml +++ b/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml @@ -71,6 +71,10 @@ Rectangle { consoleCmd.text = dapConsoleModel.getCommandDown(); } + Keys.onEnterPressed: { + Keys.onReturnPressed(event); + } + Keys.onReturnPressed: { txtCommand.append("> " + consoleCmd.text); if(consoleCmd.text === "") return; diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml index aa70bfa6364c08e10151c7a6f361d9813246f4e1..e96f0f39cca36d0f9ba446d5e68f2074b75d1a15 100644 --- a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml +++ b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml @@ -7,7 +7,5 @@ DapUiQmlWidgetLastActions { id: lastActionsPanel viewModel: dapConsoleModel - viewDelegate: DapUiQmlWidgetConsoleLastActionsDelegateForm { - - } + viewDelegate: DapUiQmlWidgetConsoleLastActionsDelegateForm { } }