From 4ed034939b7ae1751b251dae568f9b5d06417093 Mon Sep 17 00:00:00 2001
From: "evgenii.tagiltsev" <tagiltsev.evgenii@gmail.com>
Date: Fri, 29 Nov 2019 12:17:18 +0100
Subject: [PATCH] [*] fixed bug
---
CellFrameDashboardGUI/DapUiQmlScreen.qml | 2 +-
CellFrameDashboardGUI/DapUiQmlScreenForm.ui.qml | 6 ------
CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml | 2 +-
CellFrameDashboardGUI/qml.qrc | 1 -
4 files changed, 2 insertions(+), 9 deletions(-)
delete mode 100644 CellFrameDashboardGUI/DapUiQmlScreenForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlScreen.qml b/CellFrameDashboardGUI/DapUiQmlScreen.qml
index 62c964e7d..359694574 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreen.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreen.qml
@@ -1,5 +1,5 @@
import QtQuick 2.4
-DapUiQmlScreenForm {
+Rectangle {
property DapUiQmlWidgetRightPanel rightPanel
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenForm.ui.qml
deleted file mode 100644
index 60978f048..000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenForm.ui.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.5
-
-Rectangle {
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml
index 4587aa885..27a6895a2 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml
@@ -6,7 +6,7 @@ Rectangle {
property alias header : stackViewHeader
property alias content : stackViewContent
property alias background : rightPanelPage.background
- property alias footer: stackViewHeader
+ property alias footer: stackViewFooter
width: visible ? 400 * pt : 0
color: "#E3E2E6"
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index f01a6dd8d..e00667e86 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -104,7 +104,6 @@
<file>DapUiQmlWidgetRightPanelForm.ui.qml</file>
<file>DapUiQmlWidgetHistoryLastActions.qml</file>
<file>DapUiQmlScreen.qml</file>
- <file>DapUiQmlScreenForm.ui.qml</file>
<file>DapUiQmlScreenDialogAddWalletHeader.qml</file>
<file>DapUiQmlWalletCreatedHeader.qml</file>
<file>DapUiQmlWalletCreated.qml</file>
--
GitLab