From b3a699747568f0fa21cf663d5ce23bb0a8a1087e Mon Sep 17 00:00:00 2001 From: Konstantin <djtv01@gmail.com> Date: Mon, 16 Dec 2019 00:00:29 +0300 Subject: [PATCH 1/3] [*]buttons in the project are changed --- CellFrameDashboardGUI/qml.qrc | 2 - .../DapUiQmlScreenExchangeForm.ui.qml | 2 +- ...pUiQmlWidgetExchangeOrderButtonForm.ui.qml | 25 ----------- .../DapUiQmlWidgetExchangeOrderForm.ui.qml | 17 +++++-- .../StatusBar/DapUiQmlWidgetStatusBar.qml | 16 +++---- .../DapUiQmlWidgetStatusBarButtonForm.ui.qml | 45 ------------------- libdap-qt-ui-qml | 2 +- 7 files changed, 21 insertions(+), 88 deletions(-) delete mode 100644 CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml delete mode 100644 CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc index 0eea33622..591dc4833 100755 --- a/CellFrameDashboardGUI/qml.qrc +++ b/CellFrameDashboardGUI/qml.qrc @@ -53,7 +53,6 @@ <file>screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml</file> <file>screen/Dashboard/DapUiQmlScreenDashboard.qml</file> <file>screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml</file> - <file>screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file> <file>screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file> <file>screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml</file> <file>screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml</file> @@ -87,7 +86,6 @@ <file>screen/Settings/DapUiQmlWidgetSettingsNetwork.qml</file> <file>screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml</file> <file>screen/StatusBar/DapUiQmlWidgetStatusBar.qml</file> - <file>screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml</file> <file>screen/VPN/DapUiQmlScreenVpn.qml</file> <file>screen/VPN/DapUiQmlScreenVpnForm.ui.qml</file> <file>screen/VPN/DapUiQmlWidgetSettingsVpn.qml</file> diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml index da48babc6..f8dcdfea3 100644 --- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml +++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.0 -import "../../" +import "qrc:/" Page { ///Top panel in tab Exchange diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml deleted file mode 100644 index 5ef9c277d..000000000 --- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml +++ /dev/null @@ -1,25 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - property alias buttonFont: buttonText.font.family - property alias buttonText: buttonText.text - - id: buttonBuy - width: 70 * pt - height: 30 * pt - - contentItem: Text { - id: buttonText - color: "#FFFFFF" - font.pixelSize: 14 * pt - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } - - background: Rectangle { - implicitWidth: parent.width - implicitHeight: parent.height - color: buttonBuy.hovered ? "#A2A4A7" : "#4F5357" - } -} diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml index 7a50232f5..97a020701 100644 --- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml +++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 - +import "qrc:/" Item { property alias titleOrder: orderTitle.orderText property string currencyName: qsTr("KLVN") @@ -39,9 +39,18 @@ Item { width: parent.width } - DapUiQmlWidgetExchangeOrderButtonForm { - buttonFont: "Roboto" - buttonText: titleOrder + DapButton{ + anchors.right: parent.right + textButton:titleOrder + existenceImage: false + widthButton: 130 * pt + heightButton: 30 * pt + fontSizeButton: 14 * pt + colorBackgroundNormal: "#3E3853" + colorBackgroundHover: "#A2A4A7" + horizontalAligmentText:Qt.AlignHCenter + indentTextRight:0 } + } } diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml index 4b70c0bcb..a61ed8f8a 100644 --- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml +++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml @@ -1,9 +1,9 @@ -import QtQuick 2.0 +import QtQuick 2.0 import QtQuick.Controls 2.0 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 import QtQuick.Layouts 1.3 -import "../../" +import "qrc:/" Rectangle { height:60 * pt @@ -102,14 +102,10 @@ Rectangle { } } - DapUiQmlWidgetStatusBarButtonForm { + + DapButton{ id: statusBarAddWalletButton visible: rightPanel.visible ? true : false - width: rightPanel.visible ? 120 * pt : 0 - height: 36 * pt - name: qsTr("New wallet") - fontHeight: 14 * pt - backgroundColor: hovered ? "#D51F5D" : "#070023" anchors.right: parent.right anchors.top: parent.top anchors.topMargin: 10 * pt @@ -120,12 +116,12 @@ Rectangle { onClicked: { rightPanel.header.push("qrc:/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml", {"rightPanel": rightPanel}); rightPanel.content.push("qrc:/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml", {"rightPanel": rightPanel}); - statusBarAddWalletButton.backgroundColor = "#D51F5D" + statusBarAddWalletButton.colorBackgroundNormal = "#D51F5D" } Connections { target: rightPanel.header.currentItem - onPressedCloseAddWalletChanged: statusBarAddWalletButton.backgroundColor = "#070023" + onPressedCloseAddWalletChanged: statusBarAddWalletButton.colorBackgroundNormal = "#070023" } } diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml deleted file mode 100644 index 98505bf33..000000000 --- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml +++ /dev/null @@ -1,45 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - property alias name: templateText.text - property alias fontHeight: templateText.font.pixelSize - property alias backgroundColor: background.color - - property int defaultHeight: 50 * pt - property int defaultWidth: 100 * pt - property string normalButton: "qrc:/res/icons/new-wallet_icon_dark.png" - property string hoverButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png" - - id: button - width: defaultHeight - height: defaultWidth - - contentItem: Rectangle { - id: background - anchors.fill: parent - color: "#070023" - - Text { - id: templateText - anchors.fill: parent - verticalAlignment: Qt.AlignVCenter - horizontalAlignment: Qt.AlignRight - anchors.rightMargin: 20 * pt - font.family: "Roboto" - font.weight: Font.Normal - color: "#FFFFFF" - text: qsTr("template") - } - - Image { - id: iconNewWallet - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 10 * pt - source: button.hovered ? hoverButton : normalButton - width: 28 * pt - height: 28 * pt - } - } -} diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml index af9704c26..6cab1008e 160000 --- a/libdap-qt-ui-qml +++ b/libdap-qt-ui-qml @@ -1 +1 @@ -Subproject commit af9704c2619c8d8395625a72f16489f106fc487b +Subproject commit 6cab1008eaca62b098531237e3d69cbcda406d42 -- GitLab From 19d13641ed0fb2ab0021645e38cab02cd362db19 Mon Sep 17 00:00:00 2001 From: Konstantin <djtv01@gmail.com> Date: Mon, 16 Dec 2019 22:53:55 +0300 Subject: [PATCH 2/3] [*]changed button --- .../Dashboard/DapUiQmlScreenDashboard.qml | 26 ++- .../DapUiQmlScreenExchangeForm.ui.qml | 185 ++++++++++-------- .../DapUiQmlRecoveryNotesForm.ui.qml | 77 +++----- .../LastAction/DapUiQmlRecoveryQrForm.ui.qml | 77 +++----- .../DapUiQmlScreenDialogAddWalletForm.ui.qml | 37 +--- .../DapUiQmlWalletCreatedForm.ui.qml | 43 ++-- libdap-qt-ui-qml | 2 +- 7 files changed, 185 insertions(+), 262 deletions(-) diff --git a/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml b/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml index f1c2642f5..15c519b20 100644 --- a/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml +++ b/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml @@ -2,6 +2,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.0 import "../" +import "qrc:/" DapUiQmlScreen { id: dapUiQmlScreenDialog @@ -26,24 +27,19 @@ DapUiQmlScreen { text: "My first wallet" } - Button { + DapButton{ anchors.top: parent.top - width: 132 * pt anchors.bottom: parent.bottom anchors.right: parent.right - text: "New payment" - font.family: fontRobotoRegular.name - font.pixelSize: 12 * pt - highlighted: true - - background: Rectangle { - color: "#3E3853" - } - - icon.width: 20 * pt - icon.height: 20 * pt - icon.source: "qrc:/res/icons/new-payment_icon.png" - icon.color: "#FFFFFF" + widthButton: 132 * pt + heightButton: 36 * pt + textButton: "New payment" + fontSizeButton: 12 * pt + colorBackgroundButton: "#3E3853" + normalImageButton: "qrc:/res/icons/new-payment_icon.png" + hoverImageButton: "qrc:/res/icons/new-payment_icon.png" + widthImageButton: 20*pt + heightImageButton: 20*pt } } diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml index f8dcdfea3..0955128df 100644 --- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml +++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml @@ -4,91 +4,112 @@ import "qrc:/" Page { ///Top panel in tab Exchange - Rectangle{ - id:topPanelExchange + Rectangle { + id: topPanelExchange anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - anchors.leftMargin: 24*pt - anchors.topMargin: 12*pt - anchors.rightMargin: 24*pt - height:30 * pt + anchors.leftMargin: 24 * pt + anchors.topMargin: 12 * pt + anchors.rightMargin: 24 * pt + height: 30 * pt ///Token ComboBox - Rectangle{ - id:leftComboBox + Rectangle { + id: leftComboBox anchors.top: topPanelExchange.top anchors.left: topPanelExchange.left - width:112 * pt - height:parent.height + width: 112 * pt + height: parent.height - DapComboBox{ - model: ListModel{ - id:ÑonversionList - ListElement{text:"TKN1/NGD"} - ListElement{text:"TKN2/NGD"} - ListElement{text:"NGD/KLVN"} - ListElement{text:"KLVN/USD"} + DapComboBox { + model: ListModel { + id: ÑonversionList + ListElement { + text: "TKN1/NGD" + } + ListElement { + text: "TKN2/NGD" + } + ListElement { + text: "NGD/KLVN" + } + ListElement { + text: "KLVN/USD" + } } - fontSizeComboBox: 16*pt - widthPopupComboBoxActive: 144 *pt - widthPopupComboBoxNormal: 112 *pt - sidePaddingActive: 16*pt + fontSizeComboBox: 16 * pt + widthPopupComboBoxActive: 144 * pt + widthPopupComboBoxNormal: 112 * pt + sidePaddingActive: 16 * pt sidePaddingNormal: 0 - x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal - topIndentActive:12 * pt - bottomIndentActive:14 * pt - heightComboBoxNormal:24 * pt - heightComboBoxActive:44 * pt - bottomIntervalListElement:6 * pt - - + x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal + topIndentActive: 12 * pt + bottomIndentActive: 14 * pt + heightComboBoxNormal: 24 * pt + heightComboBoxActive: 44 * pt + bottomIntervalListElement: 6 * pt } - } ///Time ComboBox - Rectangle{ - id:rightComboBox + Rectangle { + id: rightComboBox anchors.left: leftComboBox.right - anchors.leftMargin: 72*pt + anchors.leftMargin: 72 * pt anchors.top: topPanelExchange.top - width:100 * pt - height:parent.height - DapComboBox{ - model: ListModel{ - ListElement{text:"1 minute"} - ListElement{text:"5 minute"} - ListElement{text:"15 minute"} - ListElement{text:"30 minute"} - ListElement{text:"1 hour"} - ListElement{text:"4 hour"} - ListElement{text:"12 hour"} - ListElement{text:"24 hour"} + width: 100 * pt + height: parent.height + DapComboBox { + model: ListModel { + ListElement { + text: "1 minute" + } + ListElement { + text: "5 minute" + } + ListElement { + text: "15 minute" + } + ListElement { + text: "30 minute" + } + ListElement { + text: "1 hour" + } + ListElement { + text: "4 hour" + } + ListElement { + text: "12 hour" + } + ListElement { + text: "24 hour" + } } - fontSizeComboBox: 14*pt - widthPopupComboBoxActive: 132 *pt - widthPopupComboBoxNormal: 100 *pt - sidePaddingActive: 16*pt + fontSizeComboBox: 14 * pt + widthPopupComboBoxActive: 132 * pt + widthPopupComboBoxNormal: 100 * pt + sidePaddingActive: 16 * pt sidePaddingNormal: 0 - x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal - topIndentActive:12 * pt - bottomIndentActive:14 * pt - heightComboBoxNormal:24 * pt - heightComboBoxActive:44 * pt - bottomIntervalListElement:6 * pt + x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal + topIndentActive: 12 * pt + bottomIndentActive: 14 * pt + heightComboBoxNormal: 24 * pt + heightComboBoxActive: 44 * pt + bottomIntervalListElement: 6 * pt } } ///Value Last price - Rectangle{ + Rectangle { id: lastPrice height: parent.height - width: 150*pt + width: 150 * pt anchors.right: volume24.left anchors.rightMargin: 30 * pt - Text{ + Text { anchors.left: lastPrice.left anchors.bottom: value_lastPrice.top anchors.bottomMargin: 6 * pt @@ -96,7 +117,6 @@ Page { font.pixelSize: 10 * pt font.family: fontRobotoRegular.name text: qsTr("Last price") - } Text { id: value_lastPrice @@ -118,35 +138,35 @@ Page { } } ///Value 24h volume - Rectangle{ + Rectangle { id: volume24 height: parent.height - width: 75*pt + width: 75 * pt anchors.right: topPanelExchange.right - Text{ - anchors.right: volume24.right - anchors.bottom: value_valume24.top - anchors.bottomMargin: 6 * pt - color: "#757184" - font.pixelSize: 10 * pt - font.family: fontRobotoRegular.name - text: qsTr("24h volume") - - } - Text { - id: value_valume24 - anchors.right: volume24.right - anchors.bottom: volume24.bottom - color: "#070023" - font.pixelSize: 12 * pt - font.family: fontRobotoRegular.name - text: qsTr("9 800 TKN1") - } -} + Text { + anchors.right: volume24.right + anchors.bottom: value_valume24.top + anchors.bottomMargin: 6 * pt + color: "#757184" + font.pixelSize: 10 * pt + font.family: fontRobotoRegular.name + text: qsTr("24h volume") + } + Text { + id: value_valume24 + anchors.right: volume24.right + anchors.bottom: volume24.bottom + color: "#070023" + font.pixelSize: 12 * pt + font.family: fontRobotoRegular.name + text: qsTr("9 800 TKN1") + } + } } - ///Left down panel + + ///Left down panel Row { anchors.left: parent.left anchors.bottom: parent.bottom @@ -156,7 +176,6 @@ Page { DapUiQmlWidgetExchangeOrderForm { titleOrder: qsTr("Buy") - } DapUiQmlWidgetExchangeOrderForm { diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml index de8e3fd1e..94f52a88e 100644 --- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml +++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml @@ -1,7 +1,8 @@ -import QtQuick 2.0 +import QtQuick 2.0 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.0 import "../" +import "qrc:/" DapUiQmlScreen { property alias pressedNextButton: nextButton.pressed @@ -192,69 +193,37 @@ DapUiQmlScreen { Layout.leftMargin: 26 * pt Layout.columnSpan: 2 - Button { + DapButton{ id: nextButton - height: 44 * pt - width: 130 * pt + heightButton: 44 * pt + widthButton: 130 * pt Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - - Text { - id: nextButtonText - text: qsTr("Next") - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: "#ffffff" - font.family: "Roboto" - font.styleName: "Normal" - font.weight: Font.Normal - font.pointSize: 18 * pt - horizontalAlignment: Text.AlignLeft - } - - background: Rectangle { - implicitWidth: parent.width - implicitHeight: parent.height - color: "#3E3853" - } + textButton: qsTr("Next") + existenceImage: false + horizontalAligmentText: Text.AlignHCenter + indentTextRight: 0 + fontSizeButton: 18 * pt + colorBackgroundButton: "#3E3853" } - Button { + DapButton{ id: copyNotesButton - height: 44 * pt - width: 130 * pt + heightButton: 44 * pt + widthButton: 130 * pt Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter checkable: true - - Text { - id: copyNotesButtonText - text: qsTr("Copy") - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: copyNotesButton.checked ? "#3E3853" : "#FFFFFF" - font.family: "Roboto" - font.styleName: "Normal" - font.weight: Font.Normal - font.pointSize: 18 * pt - horizontalAlignment: Text.AlignLeft - } - - background: Rectangle { - implicitWidth: parent.width - implicitHeight: parent.height - color: copyNotesButton.checked ? "#EDEFF2" : "#3E3853" - border.color: "#3E3853" - border.width: 1 * pt - } + textButton: qsTr("Copy") + existenceImage: false + horizontalAligmentText: Text.AlignHCenter + indentTextRight: 0 + fontSizeButton: 18 * pt + colorBackgroundButton: copyNotesButton.checked ? "#EDEFF2" : "#3E3853" + colorTextButton: copyNotesButton.checked ? "#3E3853" : "#FFFFFF" + borderColorButton: "#3E3853" + borderWidthButton: 1 * pt onClicked: notifyText.text = qsTr( "Recovery words copied to clipboard. Keep them in a\nsafe place before proceeding to the next step.") } } } - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ - diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml index acbde1d7e..7755fb949 100644 --- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml +++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml @@ -1,6 +1,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.0 +import "qrc:/" Rectangle { property alias pressedNextButton: nextButton.pressed @@ -115,68 +116,38 @@ Rectangle { Layout.leftMargin: 26 * pt Layout.columnSpan: 2 - Button { + + DapButton{ id: nextButton - height: 44 * pt - width: 130 * pt + heightButton: 44 * pt + widthButton: 130 * pt Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - - Text { - id: nextButtonText - text: qsTr("Create") - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: "#ffffff" - font.family: "Roboto" - font.styleName: "Normal" - font.weight: Font.Normal - font.pointSize: 18 * pt - horizontalAlignment: Text.AlignLeft - } - - background: Rectangle { - implicitWidth: parent.width - implicitHeight: parent.height - color: "#3E3853" - } + textButton: qsTr("Create") + existenceImage: false + horizontalAligmentText: Text.AlignHCenter + indentTextRight: 0 + fontSizeButton: 18 * pt + colorBackgroundButton: "#3E3853" } - Button { + DapButton{ id: saveQrCodeButton - height: 44 * pt - width: 130 * pt + heightButton: 44 * pt + widthButton: 130 * pt Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - - Text { - id: saveQrCodeButtonText - text: qsTr("Save") - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: saveQrCodeButton.checked ? "#3E3853" : "#FFFFFF" - font.family: "Roboto" - font.styleName: "Normal" - font.weight: Font.Normal - font.pointSize: 18 * pt - horizontalAlignment: Text.AlignLeft - } - - background: Rectangle { - implicitWidth: parent.width - implicitHeight: parent.height - color: saveQrCodeButton.checked ? "#EDEFF2" : "#3E3853" - border.color: "#3E3853" - border.width: 1 * pt - } + checkable: true + textButton: qsTr("Save") + existenceImage: false + horizontalAligmentText: Text.AlignHCenter + indentTextRight: 0 + fontSizeButton: 18 * pt + colorBackgroundButton: saveQrCodeButton.checked ? "#EDEFF2" : "#3E3853" + colorTextButton: saveQrCodeButton.checked ? "#3E3853" : "#FFFFFF" + borderColorButton: "#3E3853" + borderWidthButton: 1 * pt onClicked: notifyText.text = qsTr( "QR-code saved. Keep them in a\nsafe place before proceeding to the next step.") } } } - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ - diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml index f10c8afe1..2ab3e0d40 100644 --- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml +++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.0 -import "../../" +import "qrc:/" import "../" DapUiQmlScreen { @@ -192,38 +192,21 @@ DapUiQmlScreen { } } - Button { + DapButton{ id: nextButton height: 44 * pt width: 130 * pt anchors.horizontalCenter: parent.horizontalCenter anchors.top: chooseRecoveryMethod.bottom anchors.topMargin: 32 * pt - hoverEnabled: true - - contentItem: Text { - id: nextButtonText - text: qsTr("Next") - anchors.fill: parent - color: "#ffffff" - font.family: "Roboto" - font.styleName: "Normal" - font.weight: Font.Normal - font.pixelSize: 18 * pt - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } - - background: Rectangle { - implicitWidth: parent.width - implicitHeight: parent.height - color: parent.hovered ? "#D51F5D" : "#070023" - } + textButton: qsTr("Next") + existenceImage: false + colorBackgroundHover: "#D51F5D" + colorBackgroundNormal: "#070023" + colorButtonTextNormal: "#FFFFFF" + horizontalAligmentText: Text.AlignHCenter + indentTextRight: 0 + fontSizeButton: 18 * pt } } -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml index e57fd327b..a1c624972 100644 --- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml +++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml @@ -1,6 +1,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.0 import "../" +import "qrc:/" DapUiQmlScreen { property alias buttonDone: doneCreateWalletButton @@ -8,32 +9,23 @@ DapUiQmlScreen { id: walletCreatedMenu color: "#F8F7FA" - Button { + + DapButton{ id: doneCreateWalletButton + + heightButton: 44 * pt + widthButton: 130 * pt anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom anchors.bottomMargin: 213 * pt - height: 44 * pt - width: 130 * pt - - Text { - id: doneCreateWalletButtonText - text: qsTr("Done") - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: doneCreateWalletButton.checked ? "#3E3853" : "#FFFFFF" - font.family: "Roboto" - font.styleName: "Normal" - font.weight: Font.Normal - font.pointSize: 18 * pt - horizontalAlignment: Text.AlignLeft - } - - background: Rectangle { - implicitWidth: parent.width - implicitHeight: parent.height - color: "#3E3853" - } + checkable: true + textButton: qsTr("Done") + existenceImage: false + horizontalAligmentText: Text.AlignHCenter + indentTextRight: 0 + fontSizeButton: 18 * pt + colorTextButton: doneCreateWalletButton.checked ? "#3E3853" : "#FFFFFF" + colorBackgroundButton: "#3E3853" } Rectangle { @@ -63,10 +55,3 @@ DapUiQmlScreen { } } } - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ - diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml index 6cab1008e..62ffe284b 160000 --- a/libdap-qt-ui-qml +++ b/libdap-qt-ui-qml @@ -1 +1 @@ -Subproject commit 6cab1008eaca62b098531237e3d69cbcda406d42 +Subproject commit 62ffe284b28e83197b7590f9c9ca7113d2b4922e -- GitLab From e92ee9dff9be4416ee5a29d31ef78e60b3880dcb Mon Sep 17 00:00:00 2001 From: Andrey Daragan <tl1989@gmail.com> Date: Tue, 17 Dec 2019 09:11:12 +0300 Subject: [PATCH 3/3] [*] Fixed merge conflicts with the master. --- libdap | 2 +- libdap-crypto | 2 +- libdap-qt | 2 +- libdap-qt-ui-qml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libdap b/libdap index 1c0614797..ee6e8617e 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit 1c0614797a3a2a2f4c179630025600e177637a65 +Subproject commit ee6e8617e1f589b45f15e327ed18cddfa87915f8 diff --git a/libdap-crypto b/libdap-crypto index c81202ba5..16a16e71b 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit c81202ba5d48e5d77afcc8aea9962a10560527f3 +Subproject commit 16a16e71b9cfae4fd8df530ed8cd6146010ae7e0 diff --git a/libdap-qt b/libdap-qt index 5f661c223..712993499 160000 --- a/libdap-qt +++ b/libdap-qt @@ -1 +1 @@ -Subproject commit 5f661c223be1ccd39f0dfa104a44de0d9f9dfb35 +Subproject commit 7129934993bef42104cffbef8f983cde724afce2 diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml index 62ffe284b..788b1c6b3 160000 --- a/libdap-qt-ui-qml +++ b/libdap-qt-ui-qml @@ -1 +1 @@ -Subproject commit 62ffe284b28e83197b7590f9c9ca7113d2b4922e +Subproject commit 788b1c6b3c67a74fd066ca1afc9daa9e21ed6006 -- GitLab