From 091811fa8a76976a783a3a768678f830dff3692c Mon Sep 17 00:00:00 2001
From: Konstantin <djtv01@gmail.com>
Date: Tue, 10 Dec 2019 20:27:01 +0300
Subject: [PATCH] remake combobox
---
.../DapUiQmlScreenDialogAddWalletForm.ui.qml | 48 +++++--------------
.../StatusBar/DapUiQmlWidgetStatusBar.qml | 28 ++---------
libdap-qt-ui-qml | 2 +-
3 files changed, 18 insertions(+), 60 deletions(-)
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index c1d08f8b6..2f403c503 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -110,47 +110,17 @@ DapUiQmlScreen {
model: ListModel {
id: signatureType
- ListElement {
- signatureName: "Dilithium"
- }
- ListElement {
- signatureName: "Bliss"
- }
- ListElement {
- signatureName: "Picnic"
- }
- ListElement {
- signatureName: "Tesla"
- }
+ ListElement {signatureName: "Dilithium"}
+ ListElement {signatureName: "Bliss"}
+ ListElement {signatureName: "Picnic"}
+ ListElement {signatureName: "Tesla"}
}
normalColorText: "#070023"
hilightColorText: "#FFFFFF"
fontSizeComboBox: 16 * pt
hilightColor: "#330F54"
- sidePaddingActive: 20*pt
-
- indicator: Image {
- source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up_dark_blue.png"
- : "qrc:/res/icons/ic_arrow_drop_down_dark_blue.png"
- width: 20 * pt
- height: 20 * pt
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 20 * pt
- }
-
- contentItem: Text {
- anchors.fill: parent
- anchors.leftMargin: 20 * pt
- anchors.topMargin: 12 * pt
- anchors.verticalCenter: parent.verticalCenter
- text: parent.displayText
- font.family: fontRobotoRegular.name
- font.pixelSize: 16*pt
- color: normalColorText
- verticalAlignment: Text.AlignTop
- elide: Text.ElideRight
- }
+ sidePaddingNormal: 20*pt
+ indicatorWidth:20 * pt
}
}
@@ -271,3 +241,9 @@ DapUiQmlScreen {
}
}
}
+
+/*##^##
+Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
index e2c388c40..581f764fe 100644
--- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
+++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
@@ -39,31 +39,13 @@ Rectangle {
property Label fieldBalance: Label {}
model: dapWalletModel.wallets
- indicator: Image {
- id: arrow
- source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/ic_arrow_drop_down.png"
- width: 24 * pt
- height: 24 * pt
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 16 * pt
- }
- contentItem: Text {
- id: headerText
- anchors.fill: parent
- anchors.leftMargin: 12 * pt
- anchors.rightMargin: 48 * pt
- anchors.topMargin: 10 * pt
- text: parent.displayText
- font.family: fontRobotoRegular.name
- font.pixelSize: 14 * pt
- color: parent.popup.visible ? "#332F49" : "#FFFFFF"
- verticalAlignment: Text.AlignTop
- elide: Text.ElideRight
- }
+ indicatorImageNormal:"qrc:/res/icons/ic_arrow_drop_down.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal:12 * pt
+ normalColorText:"#FFFFFF"
+ hilightColorTopText:"#332F49"
hilightColor: "#332F49"
fontSizeComboBox: 14*px
- hilightColorText: "#FFFFFF"
}
Label {
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index 7b490c2c7..8dfd465e9 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit 7b490c2c718ab341af1b1f74f49aec20fb45101e
+Subproject commit 8dfd465e991656dca083c0fd3a0ff5825d61fe86
--
GitLab