From d80186f7e788808c862d91a93ccf78626b3c9912 Mon Sep 17 00:00:00 2001
From: "littletux89@gmail.com" <littletux89@gmail.com>
Date: Thu, 30 Jan 2020 16:44:22 +0300
Subject: [PATCH] [*] Edits made.
---
.../Dashboard/DapDashboardScreenForm.ui.qml | 2 +
.../Dashboard/DapDashboardTopPanelForm.ui.qml | 50 +------------------
libdap-qt-ui-qml | 2 +-
3 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
index 6dce4c8af..809270dec 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
@@ -18,6 +18,8 @@ DapAbstractScreen
property string newGoldImagePath: "qrc:/res/icons/ng_icon.png"
property string kelvinImagePath: "qrc:/res/icons/ic_klvn.png"
+ property alias dapListViewWallets: listViewWallets
+
Rectangle
{
id: titleBlock
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
index 1a973278b..9d5899752 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
@@ -71,60 +71,12 @@ DapAbstractTopPanel
}
}
- // Token selection combo box
- Rectangle
- {
- id: frameComboBoxToken
-
- anchors.left: frameComboBoxWallet.right
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 70 * pt
- width: 148 * pt
- color: "transparent"
-
- DapComboBox
- {
- id: comboboxToken
- model: modelTokens
- mainLineText: "all tokens"
- indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
- indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
- sidePaddingNormal: 0 * pt
- sidePaddingActive: 16 * pt
- normalColorText: "#070023"
- hilightColorText: "#FFFFFF"
- normalColorTopText: "#FFFFFF"
- hilightColorTopText: "#070023"
- hilightColor: "#330F54"
- normalTopColor: "#070023"
- widthPopupComboBoxNormal: 148 * pt
- widthPopupComboBoxActive: 180 * pt
- heightComboBoxNormal: 24 * pt
- heightComboBoxActive: 44 * pt
- bottomIntervalListElement: 8 * pt
- topEffect: false
- x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
- normalColor: "#FFFFFF"
- hilightTopColor: normalColor
- paddingTopItemDelegate: 8 * pt
- heightListElement: 32 * pt
- intervalListElement: 10 * pt
- indicatorWidth: 24 * pt
- indicatorHeight: indicatorWidth
- indicatorLeftInterval: 8 * pt
- colorTopNormalDropShadow: "#00000000"
- colorDropShadow: "#40ABABAB"
- fontComboBox.pixelSize: 14 * pt
- fontComboBox.family: "Roboto"
- }
- }
-
// Static wallet balance text "Wallet balance"
Label
{
id: headerWalletBalance
text: qsTr("Wallet balance")
- anchors.left: frameComboBoxToken.right
+ anchors.left: frameComboBoxWallet.right
anchors.leftMargin: 70 * pt
anchors.verticalCenter: parent.verticalCenter
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index ab16ad669..57caaca1a 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit ab16ad669cfc09a69d071a88add98110d473010e
+Subproject commit 57caaca1a58415e7e54fa5f953abafc5e0ad4912
--
GitLab