diff --git a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml index 0996b95fd23e2135395aceeb4cfa1eab3d300f89..5aef09a6f3477717e84d2c053823b36354ac3d61 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 96a8ae4f5771e1ed409dbaa2ffc4afbcc2382791..9eed47835f6d557f8c4255e6b95a40599ea1d37e 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 96a8ae4f5771e1ed409dbaa2ffc4afbcc2382791..58f5f784100aa417a9e4db95d6eeae6b72369b47 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 11589c3f59305849ef0fc3e045b423da2230fb77..b723ba748c75e531997bf9064104be32c4931e01 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 {