From 6db75978bf4142efa4e07b07f572c8ededf39642 Mon Sep 17 00:00:00 2001
From: jonymt <johanmt@yandex.ru>
Date: Mon, 23 Sep 2019 20:41:29 +0200
Subject: [PATCH] [*] fixed choose commands from last actions list
---
CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml | 2 ++
.../DapUiQmlWidgetConsoleLastActionsDelegateForm.qml | 10 ++++++++++
.../DapUiQmlWidgetConsoleLastActionsForm.qml | 7 ++++++-
libdap-crypto | 2 +-
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
index 86238fb76..55329840e 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
@@ -6,6 +6,7 @@ import QtQuick.Layouts 1.12
Page {
DapUiQmlWidgetConsoleForm {
+ id: dapConsoleForm
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: parent.left
@@ -18,5 +19,6 @@ Page {
DapUiQmlWidgetConsoleLastActionsForm {
id: lastActionsPanel
+ consoleData: dapConsoleForm.textAreaCmdHistory
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
index 3092bc5c1..9a54cf094 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
@@ -1,8 +1,10 @@
import QtQuick 2.0
+import QtQuick.Controls 2.12
import QtQuick.Layouts 1.13
Component {
ColumnLayout {
+
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 18 * pt
@@ -22,6 +24,14 @@ Component {
font.family: "Roboto Regular"
font.pixelSize: 14 * pt
clip: true
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ consoleData.append("> " + lastCommand);
+ dapConsoleModel.receiveRequest(lastCommand);
+ }
+ }
}
Rectangle {
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml
index d2ffab088..aa70bfa63 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml
@@ -1,8 +1,13 @@
import QtQuick 2.0
+import QtQuick.Controls 2.1
import QtQuick.Layouts 1.13
DapUiQmlWidgetLastActions {
+ property TextArea consoleData
+
id: lastActionsPanel
viewModel: dapConsoleModel
- viewDelegate: DapUiQmlWidgetConsoleLastActionsDelegateForm {}
+ viewDelegate: DapUiQmlWidgetConsoleLastActionsDelegateForm {
+
+ }
}
diff --git a/libdap-crypto b/libdap-crypto
index ff63d7626..d2c567906 160000
--- a/libdap-crypto
+++ b/libdap-crypto
@@ -1 +1 @@
-Subproject commit ff63d762657f9687173db825705b8bf4b958abee
+Subproject commit d2c567906d783f94e28ae2ca87acc875175da6a8
--
GitLab