Skip to content
Snippets Groups Projects
Commit e3b4ccdc authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'features-2448,2533' into 'master'

Features 2448

See merge request !18
parents acef7a74 88ed7cd3
No related branches found
No related tags found
1 merge request!18Features 2448
Pipeline #869 passed with stage
in 3 minutes and 15 seconds
......@@ -22,6 +22,7 @@ Page {
DapUiQmlWidgetConsoleLastActionsForm {
id: lastActionsPanel
consoleData: dapConsoleForm.textAreaCmdHistory
// border.color: "transparent"
}
}
}
......@@ -29,11 +29,25 @@ DapUiQmlWidgetLastActionsForm {
DapUiQmlWidgetLastActionsHeaderForm {
id: dapHeader
height: 36 * pt
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
anchors.leftMargin: 1 * pt
}
Rectangle {
id: splitHeader
anchors.top: dapHeader.bottom
anchors.left: parent.left
anchors.right: parent.right
height: 1 * pt
color: "#C2CAD1"
}
ListView {
id: dapListView
anchors.top: dapHeader.bottom
anchors.top: splitHeader.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
......
......@@ -4,24 +4,15 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
Rectangle {
width: parent.width
height: 36 * pt
color: "#EDEFF2"
Item {
width: childrenRect.width
height: childrenRect.height
anchors.top: parent.top
anchors.left: parent.left
Text {
anchors.fill: parent
anchors.leftMargin: 16 * pt
anchors.topMargin: 13
Text {
text: qsTr("Last actions")
font.family: "Roboto"
font.pixelSize: 12 * pt
color: "#5F5F63"
}
text: qsTr("Last actions")
verticalAlignment: Qt.AlignVCenter
font.family: "Roboto"
font.pixelSize: 12 * pt
color: "#5F5F63"
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment