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 Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png differ diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc index 50bb4f33859b17e057c6bdda0bfe28ebcfd814f2..8696bb5a5d4ad1134773a97a771e2e067a751cef 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 Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/icon_arrow_down.png differ diff --git a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml index b37128b3781ca534d292c7850d4e1e4f7fbffeec..b6864a666b08612c37dfda4a12eec87b58f71d7f 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 11853ced31878f5758454c158d5b8adffd834e32..fe98755cf2d8a7b318be45f7a2010e4f10e78695 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 c62a20da714f8e0416fa1dd57d5fcb8531de0f02..09aec6e6c8fa1fec5516e6bd28e69da568a96c80 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 {