From c34fde1c990c000ffcfb68f7d6fb9f486c4b6169 Mon Sep 17 00:00:00 2001
From: Andrey Daragan <tl1989@gmail.com>
Date: Thu, 19 Dec 2019 10:32:01 +0300
Subject: [PATCH] [+] The header and widget stackwidget of the right panel.
---
.../screen/DapAbstractRightPanelForm.ui.qml | 28 +++++++++++++------
.../History/DapHistoryRightPanelForm.ui.qml | 6 ++--
.../History/DapHistoryScreenForm.ui.qml | 7 +++--
.../screen/History/DapHistoryTabForm.ui.qml | 4 +--
4 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
index 0996b95fd..5aef09a6f 100644
--- a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
@@ -1,20 +1,30 @@
import QtQuick 2.4
import "qrc:/"
+import QtQuick.Controls 2.0
DapRightPanelForm
{
-// header.height: 30 * pt
-// headerData: Rectangle
-// {
-// anchors.fill: parent
-// color: "green"
-// }
+ header.height: 30 * pt
+ headerData: Rectangle
+ {
+ anchors.fill: parent
+ color: "green"
+ }
+
+ contentItemPanel: Label
+ {
+ text: "HELLO!!!"
+ font.pointSize: 30
+ anchors.fill: parent
+ }
-// rightPanel.height: parent.height
-// rightPanel.width: 350 * pt
- color: "transparent"
+ rightPanel.height: parent.height
+ rightPanel.width: 350 * pt
+ color: "blue"
}
+
+
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
diff --git a/CellFrameDashboardGUI/screen/History/DapHistoryRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/History/DapHistoryRightPanelForm.ui.qml
index 96a8ae4f5..9eed47835 100644
--- a/CellFrameDashboardGUI/screen/History/DapHistoryRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/History/DapHistoryRightPanelForm.ui.qml
@@ -1,6 +1,6 @@
import QtQuick 2.4
+import "../"
-Item {
- width: 400
- height: 400
+DapAbstractRightPanelForm {
+
}
diff --git a/CellFrameDashboardGUI/screen/History/DapHistoryScreenForm.ui.qml b/CellFrameDashboardGUI/screen/History/DapHistoryScreenForm.ui.qml
index 96a8ae4f5..58f5f7841 100644
--- a/CellFrameDashboardGUI/screen/History/DapHistoryScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/History/DapHistoryScreenForm.ui.qml
@@ -1,6 +1,7 @@
import QtQuick 2.4
+import "qrc:/"
-Item {
- width: 400
- height: 400
+DapScreenForm {
+ frame.height: parent.height
+ frame.color: "blue"
}
diff --git a/CellFrameDashboardGUI/screen/History/DapHistoryTabForm.ui.qml b/CellFrameDashboardGUI/screen/History/DapHistoryTabForm.ui.qml
index 11589c3f5..b723ba748 100644
--- a/CellFrameDashboardGUI/screen/History/DapHistoryTabForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/History/DapHistoryTabForm.ui.qml
@@ -8,9 +8,9 @@ DapTabForm {
topPanelForm: DapHistoryTopPanelForm { }
-// screenForm: DapHistoryScreenForm { }
+ screenForm: DapHistoryScreenForm { }
-// rightPanelForm: DapHistoryRightPanelForm { }
+ rightPanelForm: DapHistoryRightPanelForm { }
}
/*##^## Designer {
--
GitLab