From f7d620ad23f06cd0fb4c7a99eed7d62da927cbb8 Mon Sep 17 00:00:00 2001
From: "aleksandr.martynov" <aleksandr.martynov@demlabs.net>
Date: Wed, 4 Dec 2019 14:00:57 +0300
Subject: [PATCH] [*] replace arrow combobox to black and rewrite position
---
.../Resources/Icons/icon_arrow_down.png | Bin 0 -> 400 bytes
CellFrameDashboardGUI/qml.qrc | 1 +
.../res/icons/icon_arrow_down.png | Bin 0 -> 400 bytes
.../DapUiQmlWidgetStatusBarComboBox.qml | 1 +
.../DapUiQmlScreenDialogAddWalletForm.ui.qml | 18 +++++++++++++-----
.../DapUiQmlScreenDialogAddWalletHeader.qml | 4 ++--
6 files changed, 17 insertions(+), 7 deletions(-)
create mode 100644 CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png
create mode 100644 CellFrameDashboardGUI/res/icons/icon_arrow_down.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png b/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..f13e0fe2fc2b6f13a405c8c3b00f2a198896a204
GIT binary patch
literal 400
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-D$|EK(yp(|mmy
zw18|52FCVG1{RPKAeI7R1_q`DOmGp81<VLGNOJSfl&e6+Y@RNTAr*{oZ|vqh6u`rJ
z!9}N8z}bL_mGw5m?SKFSCTE2sW{m;PEQ;T%j~2e}U+4F7Ss)9CfPzB<10xe2##gQ_
zf)}sNe!DO8cI=V2{pP#h71+ssm;bFSy?J7FbN2V!Uyb5*ZmVC)DkxZ$Cg3Np&$7aP
zPMb)FFxQkOkse__k*+BXlbJ-CrnF3EGtmrE^3%GY;&IaAr9-`<=mAY86Rwp4eufL?
zPvCka!upGArGa1J0>>p>1*;gUx<feq=C57#YCpqze}~YOEsBJkTF+_2;BmP=|7yJ{
QC?pv?UHx3vIVCg!05eQ)ivR!s
literal 0
HcmV?d00001
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 50bb4f338..8696bb5a5 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -39,6 +39,7 @@
<file>res/icons/new-payment_icon.png</file>
<file>res/icons/new-wallet_icon_dark.png</file>
<file>res/icons/new-wallet_icon_dark_hover.png</file>
+ <file>res/icons/icon_arrow_down.png</file>
<file>screen/DapUiQmlScreen.qml</file>
<file>screen/DapUiQmlScreenMainWindow.qml</file>
<file>screen/DapUiQmlScreenMainWindowForm.ui.qml</file>
diff --git a/CellFrameDashboardGUI/res/icons/icon_arrow_down.png b/CellFrameDashboardGUI/res/icons/icon_arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..f13e0fe2fc2b6f13a405c8c3b00f2a198896a204
GIT binary patch
literal 400
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-D$|EK(yp(|mmy
zw18|52FCVG1{RPKAeI7R1_q`DOmGp81<VLGNOJSfl&e6+Y@RNTAr*{oZ|vqh6u`rJ
z!9}N8z}bL_mGw5m?SKFSCTE2sW{m;PEQ;T%j~2e}U+4F7Ss)9CfPzB<10xe2##gQ_
zf)}sNe!DO8cI=V2{pP#h71+ssm;bFSy?J7FbN2V!Uyb5*ZmVC)DkxZ$Cg3Np&$7aP
zPMb)FFxQkOkse__k*+BXlbJ-CrnF3EGtmrE^3%GY;&IaAr9-`<=mAY86Rwp4eufL?
zPvCka!upGArGa1J0>>p>1*;gUx<feq=C57#YCpqze}~YOEsBJkTF+_2;BmP=|7yJ{
QC?pv?UHx3vIVCg!05eQ)ivR!s
literal 0
HcmV?d00001
diff --git a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
index b37128b37..b6864a666 100644
--- a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
@@ -7,6 +7,7 @@ ComboBox {
property alias headerTextColor: headerText.color
property alias widthArrow: arrow.width
property alias heightArrow: arrow.height
+ property alias sourceArrow: arrow.source
id: customComboBox
width: 190 * pt
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 11853ced3..fe98755cf 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -95,15 +95,17 @@ DapUiQmlScreen {
DapUiQmlWidgetSignatureTypeComboBox {
id: comboBoxChooseSignatureType
- height: 20 * pt
+ height: 20
anchors {
verticalCenter: chooseSignatureTypeArea.verticalCenter
- left: parent.left
- right: parent.right
+ fill: parent
+ topMargin: 24
+ bottomMargin: 24
leftMargin: 8
rightMargin: 32
- verticalCenterOffset: 0
}
+
+ sourceArrow: popup.visible ? "qrc:/Resources/Icons/ic_arrow_drop_up.png" : "qrc:/Resources/Icons/icon_arrow_down.png"
}
}
@@ -214,7 +216,6 @@ DapUiQmlScreen {
verticalAlignment: Text.AlignVCenter
}
-
background: Rectangle {
implicitWidth: parent.width
implicitHeight: parent.height
@@ -222,3 +223,10 @@ DapUiQmlScreen {
}
}
}
+
+/*##^##
+Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
+
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
index c62a20da7..09aec6e6c 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
@@ -20,8 +20,8 @@ DapUiQmlScreen {
spacing: 12
Rectangle {
- width: 20
- height: 20
+ width: 16
+ height: 16
color: "transparent"
Image {
--
GitLab