From b90643cd5a4ddda675acb9a75a4acc5337e88bc7 Mon Sep 17 00:00:00 2001 From: "evgenii.tagiltsev" <tagiltsev.evgenii@gmail.com> Date: Mon, 2 Dec 2019 13:16:42 +0100 Subject: [PATCH] [*] moved files --- .../CellFrameDashboardGUI.pro | 125 ++++---- .../DapUiQmlWidgetChainExchanges.ui.qml | 14 + .../DapUiQmlScreenDialogAddWallet.qml | 14 + .../DapUiQmlScreenDialogAddWalletForm.ui.qml | 283 ++++++++++++++++++ .../LastAction/DapUiQmlWidgetChainWallet.qml | 64 ++++ .../DapUiQmlWidgetChainWalletForm.ui.qml | 271 +++++++++++++++++ .../DapChainNodeNetworkExplorer.h | 0 .../{ => include}/DapChainNodeNetworkModel.h | 0 .../Src/{ => include}/DapChainWalletModel.h | 0 .../Src/{ => include}/DapChainWalletsModel.h | 0 .../Src/{ => include}/DapClipboard.h | 0 .../Src/{ => include}/DapCommandController.h | 0 .../Src/{ => include}/DapConsoleModel.h | 0 .../Src/{ => include}/DapScreenDialog.h | 0 .../DapScreenDialogChangeWidget.h | 0 .../DapScreenHistoryFilterModel.h | 0 .../Src/{ => include}/DapScreenHistoryModel.h | 0 .../Src/{ => include}/DapServiceClient.h | 0 .../DapServiceClientNativeAbstract.h | 0 .../DapServiceClientNativeLinux.h | 0 .../DapServiceClientNativeMacOS.h | 0 .../{ => include}/DapServiceClientNativeWin.h | 0 .../Src/{ => include}/DapServiceController.h | 0 .../{ => include}/DapSettingsNetworkModel.h | 0 .../Src/{ => include}/DapWalletFilterModel.h | 0 CellFrameDashboardGUI/qml.qrc | 125 ++++---- 26 files changed, 770 insertions(+), 126 deletions(-) create mode 100644 CellFrameDashboardGUI/Screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml create mode 100644 CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml create mode 100644 CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml create mode 100644 CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWallet.qml create mode 100644 CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWalletForm.ui.qml rename CellFrameDashboardGUI/Src/{ => include}/DapChainNodeNetworkExplorer.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapChainNodeNetworkModel.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapChainWalletModel.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapChainWalletsModel.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapClipboard.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapCommandController.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapConsoleModel.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapScreenDialog.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapScreenDialogChangeWidget.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapScreenHistoryFilterModel.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapScreenHistoryModel.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapServiceClient.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapServiceClientNativeAbstract.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapServiceClientNativeLinux.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapServiceClientNativeMacOS.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapServiceClientNativeWin.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapServiceController.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapSettingsNetworkModel.h (100%) rename CellFrameDashboardGUI/Src/{ => include}/DapWalletFilterModel.h (100%) diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro index b0db04095..50f85d114 100755 --- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro +++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro @@ -46,36 +46,50 @@ ICON = Resources/Icons/icon.ico # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +#DESTDIR = bin +#MOC_DIR = moc +#OBJECTS_DIR = obj +#RCC_DIR = rcc +#UI_DIR = uic + +SRC_PATH = $$PWD/Src/ +INCLUDE_PATH = $${SRC_PATH}/include/ + +INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/ + $$_PRO_FILE_PWD_/../DapRPCProtocol/ + $${INCLUDE_PATH}/ + $${SRC_PATH}/ + SOURCES += \ - DapChainNodeNetworkExplorer.cpp \ - DapChainNodeNetworkModel.cpp \ - DapChainWalletModel.cpp \ - DapClipboard.cpp \ - DapConsoleModel.cpp \ - DapScreenHistoryFilterModel.cpp \ - DapScreenHistoryModel.cpp \ - DapSettingsNetworkModel.cpp \ - DapUiQmlWidgetChainTransactions.cpp \ - DapWalletFilterModel.cpp \ - main.cpp \ - DapUiQmlWidgetChainBallance.cpp \ - DapUiQmlWidgetChainBlockExplorer.cpp \ - DapUiQmlWidgetChainNodeLogs.cpp \ - DapUiQmlWidgetChainOperations.cpp \ - DapUiQmlWidgetModel.cpp \ - DapUiQmlWidget.cpp \ - DapScreenDialog.cpp \ - DapScreenDialogChangeWidget.cpp \ - DapServiceClient.cpp \ - DapServiceController.cpp \ - DapCommandController.cpp \ - DapServiceClientNativeAbstract.cpp \ - DapServiceClientNativeLinux.cpp \ - DapServiceClientNativeWin.cpp \ - DapServiceClientNativeMacOS.cpp \ - DapChainWalletsModel.cpp - -RESOURCES += qml.qrc + $${SRC_PATH}/DapChainNodeNetworkExplorer.cpp \ + $${SRC_PATH}/DapChainNodeNetworkModel.cpp \ + $${SRC_PATH}/DapChainWalletModel.cpp \ + $${SRC_PATH}/DapClipboard.cpp \ + $${SRC_PATH}/DapConsoleModel.cpp \ + $${SRC_PATH}/DapScreenHistoryFilterModel.cpp \ + $${SRC_PATH}/DapScreenHistoryModel.cpp \ + $${SRC_PATH}/DapSettingsNetworkModel.cpp \ + $${SRC_PATH}/DapUiQmlWidgetChainTransactions.cpp \ + $${SRC_PATH}/DapWalletFilterModel.cpp \ + $${SRC_PATH}/main.cpp \ + $${SRC_PATH}/DapUiQmlWidgetChainBallance.cpp \ + $${SRC_PATH}/DapUiQmlWidgetChainBlockExplorer.cpp \ + $${SRC_PATH}/DapUiQmlWidgetChainNodeLogs.cpp \ + $${SRC_PATH}/DapUiQmlWidgetChainOperations.cpp \ + $${SRC_PATH}/DapUiQmlWidgetModel.cpp \ + $${SRC_PATH}/DapUiQmlWidget.cpp \ + $${SRC_PATH}/DapScreenDialog.cpp \ + $${SRC_PATH}/DapScreenDialogChangeWidget.cpp \ + $${SRC_PATH}/DapServiceClient.cpp \ + $${SRC_PATH}/DapServiceController.cpp \ + $${SRC_PATH}/DapCommandController.cpp \ + $${SRC_PATH}/DapServiceClientNativeAbstract.cpp \ + $${SRC_PATH}/DapServiceClientNativeLinux.cpp \ + $${SRC_PATH}/DapServiceClientNativeWin.cpp \ + $${SRC_PATH}/DapServiceClientNativeMacOS.cpp \ + $${SRC_PATH}/DapChainWalletsModel.cpp + +RESOURCES += $$PWD/qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = @@ -89,32 +103,31 @@ else: unix:!android: target.path = /opt/cellframe-dashboard/bin !isEmpty(target.path): INSTALLS += target HEADERS += \ - DapChainNodeNetworkExplorer.h \ - DapChainNodeNetworkModel.h \ - DapChainWalletModel.h \ - DapClipboard.h \ - DapConsoleModel.h \ - DapScreenHistoryFilterModel.h \ - DapScreenHistoryModel.h \ - DapSettingsNetworkModel.h \ - DapUiQmlWidgetChainBallance.h \ - DapUiQmlWidgetChainBlockExplorer.h \ - DapUiQmlWidgetChainNodeLogs.h \ -# DapUiQmlScreenDashboard.h \ - DapUiQmlWidgetChainOperations.h \ - DapUiQmlWidgetChainTransactions.h \ - DapUiQmlWidgetModel.h \ - DapUiQmlWidget.h \ - DapScreenDialog.h \ - DapScreenDialogChangeWidget.h \ - DapServiceClient.h \ - DapServiceController.h \ - DapCommandController.h \ - DapServiceClientNativeAbstract.h \ - DapServiceClientNativeLinux.h \ - DapServiceClientNativeWin.h \ - DapChainWalletsModel.h \ - DapWalletFilterModel.h + $${INCLUDE_PATH}/DapChainNodeNetworkExplorer.h \ + $${INCLUDE_PATH}/DapChainNodeNetworkModel.h \ + $${INCLUDE_PATH}/DapChainWalletModel.h \ + $${INCLUDE_PATH}/DapClipboard.h \ + $${INCLUDE_PATH}/DapConsoleModel.h \ + $${INCLUDE_PATH}/DapScreenHistoryFilterModel.h \ + $${INCLUDE_PATH}/DapScreenHistoryModel.h \ + $${INCLUDE_PATH}/DapSettingsNetworkModel.h \ + $${INCLUDE_PATH}/DapUiQmlWidgetChainBallance.h \ + $${INCLUDE_PATH}/DapUiQmlWidgetChainBlockExplorer.h \ + $${INCLUDE_PATH}/DapUiQmlWidgetChainNodeLogs.h \ + $${INCLUDE_PATH}/DapUiQmlWidgetChainOperations.h \ + $${INCLUDE_PATH}/DapUiQmlWidgetChainTransactions.h \ + $${INCLUDE_PATH}/DapUiQmlWidgetModel.h \ + $${INCLUDE_PATH}/DapUiQmlWidget.h \ + $${INCLUDE_PATH}/DapScreenDialog.h \ + $${INCLUDE_PATH}/DapScreenDialogChangeWidget.h \ + $${INCLUDE_PATH}/DapServiceClient.h \ + $${INCLUDE_PATH}/DapServiceController.h \ + $${INCLUDE_PATH}/DapCommandController.h \ + $${INCLUDE_PATH}/DapServiceClientNativeAbstract.h \ + $${INCLUDE_PATH}/DapServiceClientNativeLinux.h \ + $${INCLUDE_PATH}/DapServiceClientNativeWin.h \ + $${INCLUDE_PATH}/DapChainWalletsModel.h \ + $${INCLUDE_PATH}/DapWalletFilterModel.h include (../libdap/libdap.pri) include (../libdap-crypto/libdap-crypto.pri) @@ -124,8 +137,6 @@ include (../libdap-qt-ui-qml/libdap-qt-ui-qml.pri) include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri) include (../DapRPCProtocol/DapRPCProtocol.pri) -INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/ - $$_PRO_FILE_PWD_/../DapRPCProtocol/ unix: !mac : !android { diff --git a/CellFrameDashboardGUI/Screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml b/CellFrameDashboardGUI/Screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml new file mode 100644 index 000000000..fef680a80 --- /dev/null +++ b/CellFrameDashboardGUI/Screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml @@ -0,0 +1,14 @@ +import QtQuick 2.9 +import QtQuick.Controls 2.2 + +Page { + id: dapUiQmlWidgetChainExchanges + + title: qsTr("Exchanges") + + Text { + id: name + anchors.centerIn: parent + text: qsTr("Exchanges") + } +} diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml new file mode 100644 index 000000000..3d9d8efb6 --- /dev/null +++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml @@ -0,0 +1,14 @@ +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import CellFrameDashboard 1.0 + +DapUiQmlScreenDialogAddWalletForm { + id: dialogAddWallet + focus: true +} + +/*##^## +Designer { + D{i:0;autoSize:true;height:0;width:0} +} +##^##*/ diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml new file mode 100644 index 000000000..57feb1d44 --- /dev/null +++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml @@ -0,0 +1,283 @@ +import QtQuick 2.4 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.1 + +Rectangle { + property alias pressedCloseAddWallet: mouseAreaCloseAddWallet.pressed + property alias pressedNextButton: mouseAreaNextButton.pressed + property bool isWordsRecoveryMethodChecked: selectionWords.checked + property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked + property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked + + id: addWalletMenu + width: 640 + height: 800 + border.color: "#B5B5B5" + border.width: 1 * pt + color: "#EDEFF2" + visible: true + + anchors { + top: parent.top + right: parent.right + bottom: parent.bottom + } + + Rectangle { + id: newNameArea + height: 36 + color: "#edeff2" + anchors.right: parent.right + anchors.rightMargin: 1 + anchors.left: parent.left + anchors.leftMargin: 1 + anchors.top: parent.top + anchors.topMargin: 0 + + Text { + id: newNameAreaText + text: qsTr("New wallet") + anchors.verticalCenter: parent.verticalCenter + anchors.left: buttonCloseAddWallet.right + anchors.leftMargin: 12 + font.pointSize: 14 + } + + Button { + id: buttonCloseAddWallet + width: 20 + height: 20 + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: 8 + anchors.left: newNameArea.left + anchors.horizontalCenter: newNameArea.Center + background: Image { + source: mouseAreaCloseAddWallet.containsMouse ? "qrc:/Resources/Icons/close_icon_hover.png" : "qrc:/Resources/Icons/close_icon.png" + fillMode: Image.PreserveAspectFit + } + + MouseArea { + id: mouseAreaCloseAddWallet + anchors.fill: parent + hoverEnabled: true + } + } + } + + Rectangle { + id: nameWalletTextArea + height: 30 + color: "#757184" + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 1 + anchors.top: newNameArea.bottom + anchors.topMargin: 0 + + Text { + id: nameWalletText + color: "#ffffff" + text: qsTr("Name of wallet") + anchors.left: parent.left + anchors.leftMargin: 16 + anchors.verticalCenter: parent.verticalCenter + font.pointSize: 12 + horizontalAlignment: Text.AlignLeft + font.family: "Roboto" + font.styleName: "Normal" + font.weight: Font.Normal + } + } + + Rectangle { + id: inputNameWalletArea + height: 68 + color: "#EDEFF2" + anchors.left: parent.left + anchors.leftMargin: 1 + anchors.right: parent.right + anchors.top: nameWalletTextArea.bottom + + TextInput { + id: textInputNameWallet + text: qsTr("Pocket of happiness") + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: 20 + font.pointSize: 16 + color: "#070023" + font.family: "Roboto" + font.styleName: "Normal" + font.weight: Font.Normal + horizontalAlignment: Text.AlignLeft + } + } + + Rectangle { + id: chooseSignatureTypeTextArea + height: 30 + color: "#757184" + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 1 + anchors.top: inputNameWalletArea.bottom + + Text { + id: chooseSignatureTypeText + color: "#ffffff" + text: qsTr("Choose signature type") + font.pointSize: 12 + anchors.leftMargin: 16 + horizontalAlignment: Text.AlignLeft + font.styleName: "Normal" + font.family: "Roboto" + font.weight: Font.Normal + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + } + } + + Rectangle { + id: chooseSignatureTypeArea + height: 68 + color: "#EDEFF2" + anchors.leftMargin: 1 + anchors.left: parent.left + anchors.right: parent.right + anchors.top: chooseSignatureTypeTextArea.bottom + + DapUiQmlWidgetSignatureTypeComboBox { + id: comboBoxChooseSignatureType + height: 20 * pt + anchors { + verticalCenter: chooseSignatureTypeArea.verticalCenter + left: parent.left + right: parent.right + leftMargin: 8 + rightMargin: 32 + verticalCenterOffset: 0 + } + } + } + + Rectangle { + id: recoveryMethodTextArea + height: 30 + color: "#757184" + anchors.leftMargin: 1 + anchors.left: parent.left + anchors.right: parent.right + anchors.top: chooseSignatureTypeArea.bottom + + Text { + id: recoveryMethodText + color: "#ffffff" + text: qsTr("Recovery method") + font.family: "Roboto" + font.styleName: "Normal" + font.weight: Font.Normal + anchors.left: parent.left + font.pointSize: 12 + horizontalAlignment: Text.AlignLeft + anchors.leftMargin: 16 + anchors.verticalCenter: parent.verticalCenter + } + } + + ColumnLayout { + id: chooseRecoveryMethod + height: 272 + anchors.leftMargin: 1 + spacing: 32 + anchors.top: recoveryMethodTextArea.bottom + anchors.left: parent.left + anchors.right: parent.right + + RadioButton { + id: selectionWords + text: qsTr("24 words") + Layout.alignment: Qt.AlignLeft | Qt.AlignTop + Layout.topMargin: 32 + checked: true + spacing: 16 + autoExclusive: true + display: AbstractButton.TextBesideIcon + font.pointSize: 14 + font.wordSpacing: 0 + font.family: "Roboto" + Layout.leftMargin: 16 + } + + RadioButton { + id: selectionQRcode + y: 120 + text: qsTr("QR code") + Layout.alignment: Qt.AlignLeft | Qt.AlignTop + Layout.topMargin: 0 + Layout.leftMargin: 16 + spacing: 16 + font.pointSize: 14 + font.family: "Roboto" + } + + RadioButton { + id: selectionExportToFile + text: qsTr("Export to file") + spacing: 16 + font.pointSize: 14 + font.family: "Roboto" + Layout.alignment: Qt.AlignLeft | Qt.AlignTop + Layout.topMargin: 0 + Layout.leftMargin: 16 + } + + RadioButton { + id: selectionNothing + y: 235 + text: qsTr("Nothing") + spacing: 16 + checked: false + font.family: "Roboto" + font.pointSize: 14 + Layout.alignment: Qt.AlignLeft | Qt.AlignTop + Layout.topMargin: 0 + Layout.leftMargin: 16 + } + } + + Button { + id: nextButton + height: 44 + width: 130 + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: chooseRecoveryMethod.bottom + anchors.topMargin: 32 + + MouseArea { + id: mouseAreaNextButton + anchors.fill: parent + hoverEnabled: true + } + + 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 + horizontalAlignment: Text.AlignLeft + } + + background: Rectangle { + implicitWidth: parent.width + implicitHeight: parent.height + color: mouseAreaNextButton.containsMouse ? "#D51F5D" : "#070023" + } + } +} diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWallet.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWallet.qml new file mode 100644 index 000000000..a49037b58 --- /dev/null +++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWallet.qml @@ -0,0 +1,64 @@ +import QtQuick 2.9 +import QtQuick.Controls 1.4 +import QtQuick.Controls 2.2 +import QtQuick.Window 2.0 +import QtQuick.Controls.Styles 1.3 +import QtQuick.Controls.Styles 1.4 +import Qt.labs.platform 1.0 +import CellFrameDashboard 1.0 + +DapUiQmlWidgetChainWalletForm { + id: dapQmlWidgetChainWallet + + property int indexWallet: -1 + property string nameWallet: "" + + listViewWallet.highlight: + Component + { + Rectangle { + id: rectangleMenu + color: "#121B28" + Rectangle + { + height: rectangleMenu.height + width: 4 + color: "green" + } + } + } + + listViewWallet.onCurrentItemChanged: + { + listViewTokens.model.clear() + for(var i = 0; i < listViewWallet.model.get(listViewWallet.currentIndex).count; i++) + { + var value = listViewWallet.model.get(listViewWallet.currentIndex).balance[i] + listViewTokens.model.append({token: listViewWallet.model.get(listViewWallet.currentIndex).tokens[i], balance: value.replace(/[^\d.-]/g, '')}); + } + + if(listViewWallet.currentIndex >= 0) + { + indexWallet = listViewWallet.currentIndex + nameWallet = listViewWallet.model.get(listViewWallet.currentIndex).name + } + else + { + listViewWallet.currentIndex = 0 + } + + addressWallet.text = listViewWallet.model.get(listViewWallet.currentIndex).address + } + +// buttonSaveWallet.onClicked: { +// dialogAddWallet.show() +// } + + buttonDeleteWallet.onClicked: { + dialogRemoveWallet.show() + } + + buttonSendToken.onClicked: { + dialogSendToken.show() + } +} diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWalletForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWalletForm.ui.qml new file mode 100644 index 000000000..887a96ae2 --- /dev/null +++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetChainWalletForm.ui.qml @@ -0,0 +1,271 @@ +import QtQuick 2.9 +import QtGraphicalEffects 1.0 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Styles 1.4 +import CellFrameDashboard 1.0 + +Page { + id: dapUiQmlWidgetChainWallet + + title: qsTr("Wallet") + + property alias listViewWallet: listViewWallet + property alias buttonSaveWallet: buttonSaveWallet + property alias dialogAddWallet: dialogAddWallet + property alias dialogSendToken: dialogSendToken + property alias addressWallet: addressWallet + property alias listViewTokens: listViewTokens + property alias buttonSendToken: buttonSendToken + property alias buttonDeleteWallet: buttonDeleteWallet + property alias dialogRemoveWallet: dialogRemoveWallet + + Rectangle { + id: rectanglePanel + anchors.left: parent.left + anchors.top: parent.top + anchors.bottom: parent.bottom + color: "#353841" + width: 100 + ListView { + id: listViewWallet + anchors.fill: parent + keyNavigationEnabled: true + model: dapChainWalletsModel + + delegate: Item { + id: delegateWallet + width: parent.width + height: 100 + + Column { + anchors.centerIn: parent + spacing: 5 + + Label { + id: nameWallet + anchors.horizontalCenter: parent.horizontalCenter + text: qsTr(name) + font.pixelSize: 14 + color: "#BBBEBF" + font.family: "Roboto" + width: delegateWallet.width + elide: Text.ElideRight + leftPadding: 5 + } + } + + MouseArea { + anchors.fill: parent + onClicked: listViewWallet.currentIndex = index + } + } + + focus: true + } + } + + Rectangle { + anchors.left: rectanglePanel.right + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + + Row + { + id: rowAddress + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + height: 100 + width: parent.width + Rectangle + { + id: rectangleLableAddress + color: "green" + width: 150 + height: parent.height + Text + { + id: labelAddress + anchors.centerIn: parent + text: "Address" + font.pixelSize: 22 + color: "white" + } + } + Column + { + id: columnAddress + width: rowAddress.width - rectangleLableAddress.width + height: parent.height + clip: true + TextEdit { + id: addressWallet + font.pixelSize: 16 + wrapMode: TextEdit.WrapAnywhere + + selectByMouse: true + color: "#353841" + selectionColor: "#353841" + clip: true + readOnly: true + height: parent.height - rectangleBottomBorder.height + width: parent.width + verticalAlignment: TextEdit.AlignVCenter + horizontalAlignment: TextEdit.AlignHCenter + } + Rectangle + { + id: rectangleBottomBorder + color: "green" + height: 1 + width: columnAddress.width + } + } + } + + ListView { + id: listViewTokens + height: 100 + orientation: ListView.Horizontal + anchors.top: rowAddress.bottom + anchors.left: parent.left + anchors.right: parent.right + flickableDirection: Flickable.VerticalFlick + preferredHighlightBegin: parent.width/2-width/3/2; + preferredHighlightEnd: parent.width/2+width/3/2 + highlightRangeMode: ListView.StrictlyEnforceRange + snapMode: ListView.SnapOneItem; + model: ListModel { + id: modelTokens + } + + delegate: Item { + id: delegateListViewTokens + width: listViewTokens.width/3; height: listViewTokens.height + Column + { + id: itemRectangleIfoWallet + anchors.centerIn: delegateListViewTokens + Text { + id: itemNameWallet; + anchors.horizontalCenter: parent.horizontalCenter + text: token; + color: listViewTokens.currentIndex === index ? 'green' : "#BBBEBF"; + font.pixelSize: listViewTokens.currentIndex === index ? 40 : 30; + font.family: "Roboto" + font.weight: Font.Thin + } + Text { + id: itemBalanceWallet; + anchors.horizontalCenter: parent.horizontalCenter + text: balance + color: listViewTokens.currentIndex === index ? 'green' : "#BBBEBF"; + font.pixelSize: listViewTokens.currentIndex === index ? 40 : 30; + font.family: "Roboto" + font.weight: Font.Thin + } + } + MouseArea { + anchors.fill: parent + onClicked: listViewTokens.currentIndex = index + } + } + + focus: true + clip: true + } + + Rectangle + { + id: rectangleHistory + anchors.top: listViewTokens.bottom + anchors.left: parent.left + anchors.right: parent.right + color: "green" + width: parent.width + height: 30 + Text + { + id: labelHistory + anchors.centerIn: parent + text: "History" + font.pixelSize: 22 + color: "white" + } + } + } + +// DapUiQmlScreenDialogAddWallet { +// id: dialogAddWallet +// } + DapUiQmlScreenDialogSendToken { + id: dialogSendToken + } + DapUiQmlScreenDialogRemoveWallet { + id: dialogRemoveWallet + } + RoundButton { + id: buttonDeleteWallet + highlighted: true + anchors.margins: 10 + anchors.left: parent.left + anchors.bottom: buttonSaveWallet.top + height: 40 + width: 40 + contentItem: Text { + text: qsTr("-") + color: "#121B28" + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + background: Rectangle { + color: "white" + border.color: "#121B28" + radius: 20 + } + } + + RoundButton { + id: buttonSaveWallet + contentItem: Text { + text: qsTr("+") + color: "#121B28" + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + background: Rectangle { + id: inSave + color: "white" + border.color: "#121B28" + radius: 20 + } + + highlighted: true + anchors.margins: 10 + anchors.left: parent.left + anchors.bottom: parent.bottom + height: 40 + width: 40 + } + + RoundButton { + id: buttonSendToken + text: qsTr("->") + highlighted: true + anchors.margins: 10 + anchors.right: parent.right + anchors.bottom: parent.bottom + } + + RoundButton { + id: buttonAddToken + text: qsTr("+") + highlighted: true + anchors.margins: 10 + anchors.right: parent.right + anchors.bottom: buttonSendToken.top + } +} diff --git a/CellFrameDashboardGUI/Src/DapChainNodeNetworkExplorer.h b/CellFrameDashboardGUI/Src/include/DapChainNodeNetworkExplorer.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapChainNodeNetworkExplorer.h rename to CellFrameDashboardGUI/Src/include/DapChainNodeNetworkExplorer.h diff --git a/CellFrameDashboardGUI/Src/DapChainNodeNetworkModel.h b/CellFrameDashboardGUI/Src/include/DapChainNodeNetworkModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapChainNodeNetworkModel.h rename to CellFrameDashboardGUI/Src/include/DapChainNodeNetworkModel.h diff --git a/CellFrameDashboardGUI/Src/DapChainWalletModel.h b/CellFrameDashboardGUI/Src/include/DapChainWalletModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapChainWalletModel.h rename to CellFrameDashboardGUI/Src/include/DapChainWalletModel.h diff --git a/CellFrameDashboardGUI/Src/DapChainWalletsModel.h b/CellFrameDashboardGUI/Src/include/DapChainWalletsModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapChainWalletsModel.h rename to CellFrameDashboardGUI/Src/include/DapChainWalletsModel.h diff --git a/CellFrameDashboardGUI/Src/DapClipboard.h b/CellFrameDashboardGUI/Src/include/DapClipboard.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapClipboard.h rename to CellFrameDashboardGUI/Src/include/DapClipboard.h diff --git a/CellFrameDashboardGUI/Src/DapCommandController.h b/CellFrameDashboardGUI/Src/include/DapCommandController.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapCommandController.h rename to CellFrameDashboardGUI/Src/include/DapCommandController.h diff --git a/CellFrameDashboardGUI/Src/DapConsoleModel.h b/CellFrameDashboardGUI/Src/include/DapConsoleModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapConsoleModel.h rename to CellFrameDashboardGUI/Src/include/DapConsoleModel.h diff --git a/CellFrameDashboardGUI/Src/DapScreenDialog.h b/CellFrameDashboardGUI/Src/include/DapScreenDialog.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapScreenDialog.h rename to CellFrameDashboardGUI/Src/include/DapScreenDialog.h diff --git a/CellFrameDashboardGUI/Src/DapScreenDialogChangeWidget.h b/CellFrameDashboardGUI/Src/include/DapScreenDialogChangeWidget.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapScreenDialogChangeWidget.h rename to CellFrameDashboardGUI/Src/include/DapScreenDialogChangeWidget.h diff --git a/CellFrameDashboardGUI/Src/DapScreenHistoryFilterModel.h b/CellFrameDashboardGUI/Src/include/DapScreenHistoryFilterModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapScreenHistoryFilterModel.h rename to CellFrameDashboardGUI/Src/include/DapScreenHistoryFilterModel.h diff --git a/CellFrameDashboardGUI/Src/DapScreenHistoryModel.h b/CellFrameDashboardGUI/Src/include/DapScreenHistoryModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapScreenHistoryModel.h rename to CellFrameDashboardGUI/Src/include/DapScreenHistoryModel.h diff --git a/CellFrameDashboardGUI/Src/DapServiceClient.h b/CellFrameDashboardGUI/Src/include/DapServiceClient.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapServiceClient.h rename to CellFrameDashboardGUI/Src/include/DapServiceClient.h diff --git a/CellFrameDashboardGUI/Src/DapServiceClientNativeAbstract.h b/CellFrameDashboardGUI/Src/include/DapServiceClientNativeAbstract.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapServiceClientNativeAbstract.h rename to CellFrameDashboardGUI/Src/include/DapServiceClientNativeAbstract.h diff --git a/CellFrameDashboardGUI/Src/DapServiceClientNativeLinux.h b/CellFrameDashboardGUI/Src/include/DapServiceClientNativeLinux.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapServiceClientNativeLinux.h rename to CellFrameDashboardGUI/Src/include/DapServiceClientNativeLinux.h diff --git a/CellFrameDashboardGUI/Src/DapServiceClientNativeMacOS.h b/CellFrameDashboardGUI/Src/include/DapServiceClientNativeMacOS.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapServiceClientNativeMacOS.h rename to CellFrameDashboardGUI/Src/include/DapServiceClientNativeMacOS.h diff --git a/CellFrameDashboardGUI/Src/DapServiceClientNativeWin.h b/CellFrameDashboardGUI/Src/include/DapServiceClientNativeWin.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapServiceClientNativeWin.h rename to CellFrameDashboardGUI/Src/include/DapServiceClientNativeWin.h diff --git a/CellFrameDashboardGUI/Src/DapServiceController.h b/CellFrameDashboardGUI/Src/include/DapServiceController.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapServiceController.h rename to CellFrameDashboardGUI/Src/include/DapServiceController.h diff --git a/CellFrameDashboardGUI/Src/DapSettingsNetworkModel.h b/CellFrameDashboardGUI/Src/include/DapSettingsNetworkModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapSettingsNetworkModel.h rename to CellFrameDashboardGUI/Src/include/DapSettingsNetworkModel.h diff --git a/CellFrameDashboardGUI/Src/DapWalletFilterModel.h b/CellFrameDashboardGUI/Src/include/DapWalletFilterModel.h similarity index 100% rename from CellFrameDashboardGUI/Src/DapWalletFilterModel.h rename to CellFrameDashboardGUI/Src/include/DapWalletFilterModel.h diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc index 418e5d432..cf3b1aedf 100755 --- a/CellFrameDashboardGUI/qml.qrc +++ b/CellFrameDashboardGUI/qml.qrc @@ -1,56 +1,16 @@ <RCC> <qresource prefix="/"> - <file>main.qml</file> <file>CellFrameDashboardGUI.conf</file> - <file>DapUiQmlWidgetChainBlockExplorer.ui.qml</file> - <file>DapUiQmlWidgetChainExchanges.ui.qml</file> - <file>DapUiQmlWidgetChainServicesClient.ui.qml</file> - <file>DapUiQmlWidgetChainServicesShareControl.ui.qml</file> - <file>DapUiQmlWidgetChainSettings.ui.qml</file> - <file>DapUiQmlScreenDashboard.qml</file> <file>Resources/Icons/icon.png</file> - <file>DapUiQmlScreenAbout.ui.qml</file> - <file>DapQmlScreenAbout.qml</file> - <file>DapUiQmlWidgetDelegate.qml</file> - <file>DapUiQmlWidgetDelegateForm.ui.qml</file> - <file>DapUiQmlScreenChangeWidget.qml</file> <file>Resources/Icons/icon.ico</file> - <file>DapUiQmlScreenDialogAddWallet.qml</file> - <file>DapUiQmlWidgetChainWallet.qml</file> - <file>DapUiQmlWidgetChainWalletForm.ui.qml</file> - <file>DapUiQmlWidgetChainNodeLogs.qml</file> - <file>DapUiQmlWidgetChainNodeLogsForm.ui.qml</file> - <file>DapUiQmlScreenDialogSendToken.qml</file> - <file>DapUiQmlScreenDialogRemoveWallet.qml</file> - <file>DapUiQmlWidgetNodeNetworkExplorer.qml</file> <file>Resources/Icons/defaul_icon.png</file> - <file>DapUiQmlScreenExchangeForm.ui.qml</file> <file>Resources/Fonts/roboto_light.ttf</file> <file>Resources/Fonts/roboto_medium.ttf</file> <file>Resources/Fonts/roboto_regular.ttf</file> - <file>DapUiQmlWidgetExchangeOrderForm.ui.qml</file> - <file>DapUiQmlWidgetExchangeOrderTitleForm.ui.qml</file> - <file>DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file> - <file>DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file> - <file>DapUiQmlScreenHistory.qml</file> <file>Resources/Icons/ic_scroll-down.png</file> <file>Resources/Icons/ic_scroll-down_hover.png</file> <file>Resources/Icons/ic_scroll-up.png</file> <file>Resources/Icons/ic_scroll-up_hover.png</file> - <file>DapUiQmlWidgetLastActionsButtonForm.qml</file> - <file>DapUiQmlWidgetLastActionsDelegateForm.qml</file> - <file>DapUiQmlWidgetLastActionsSectionForm.qml</file> - <file>DapUiQmlWidgetLastActionsHeaderForm.qml</file> - <file>DapUiQmlScreenMainWindow.qml</file> - <file>DapUiQmlScreenMainWindowForm.ui.qml</file> - <file>DapUiQmlWidgetLastActions.qml</file> - <file>DapUiQmlWidgetLastActionsForm.ui.qml</file> - <file>DapUiQmlScreenHistoryForm.ui.qml</file> - <file>DapUiQmlScreenConsoleForm.ui.qml</file> - <file>DapUiQmlWidgetConsoleLastActionsForm.qml</file> - <file>DapUiQmlWidgetConsoleLastActionsDelegateForm.qml</file> - <file>DapUiQmlWidgetConsole.qml</file> - <file>DapUiQmlWidgetConsoleForm.ui.qml</file> <file>Resources/Icons/icon_console.png</file> <file>Resources/Icons/icon_console_hover.png</file> <file>Resources/Icons/icon_dashboard.png</file> @@ -63,34 +23,10 @@ <file>Resources/Icons/icon_logs_hover.png</file> <file>Resources/Icons/ic_arrow_drop_down.png</file> <file>Resources/Icons/ic_arrow_drop_up.png</file> - <file>DapUiQmlWidgetStatusBar.qml</file> <file>DapUiQmlWidgetStatusBarComboBox.qml</file> - <file>DapUiQmlWidgetStatusBarContentItem.qml</file> - <file>DapUiQmlWidgetSettingsNetwork.qml</file> - <file>DapUiQmlWidgetSettingsNetworkForm.ui.qml</file> - <file>DapUiQmlScreenSettings.qml</file> - <file>DapUiQmlScreenSettingsForm.ui.qml</file> - <file>DapUiQmlScreenSettingsSection.qml</file> - <file>DapUiQmlWidgetStatusBarButton.ui.qml</file> - <file>DapUiQmlWidgetStatusBarComboBoxWallet.qml</file> - <file>DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml</file> - <file>DapUiQmlWidgetStatusBarComboBoxToken.qml</file> - <file>DapUiQmlWidgetStatusBarComboBoxTokenForm.ui.qml</file> <file>Resources/Icons/icon_settings.png</file> <file>Resources/Icons/icon_settings_hover.png</file> - <file>DapUiQmlScreenVpn.qml</file> - <file>DapUiQmlScreenVpnForm.ui.qml</file> - <file>DapUiQmlWidgetSettingsVpn.qml</file> - <file>DapUiQmlWidgetSettingsVpnForm.ui.qml</file> - <file>DapUiQmlWidgetSettingsVpnComboBox.qml</file> - <file>DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml</file> <file>DapUiQmlWidgetStatusBarComboBoxDelegate.qml</file> - <file>DapUiQmlWidgetDashboardTokenSectionDelegate.qml</file> - <file>DapUiQmlScreenDialogAddWalletForm.ui.qml</file> - <file>DapUiQmlWidgetSignatureTypeComboBox.qml</file> - <file>DapUiQmlRecoveryQrForm.ui.qml</file> - <file>DapUiQmlRecoveryNotesForm.ui.qml</file> - <file>DapUiQmlWalletCreatedForm.ui.qml</file> <file>Resources/Icons/back_icon.png</file> <file>Resources/Icons/back_icon_hover.png</file> <file>Resources/Icons/close_icon.png</file> @@ -100,10 +36,61 @@ <file>Resources/Icons/ic_edit.png</file> <file>Resources/Icons/ic_edit_hover.png</file> <file>Resources/Icons/new-payment_icon.png</file> - <file>DapUiQmlWidgetRightPanel.qml</file> - <file>DapUiQmlWidgetRightPanelForm.ui.qml</file> - <file>DapUiQmlWidgetHistoryLastActions.qml</file> - <file>DapUiQmlScreen.qml</file> - <file>DapUiQmlScreenForm.ui.qml</file> + <file>Screen/Console/DapUiQmlScreenConsoleForm.ui.qml</file> + <file>Screen/Console/DapUiQmlWidgetConsole.qml</file> + <file>Screen/Console/DapUiQmlWidgetConsoleForm.ui.qml</file> + <file>Screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml</file> + <file>Screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml</file> + <file>Screen/Dashboard/DapUiQmlScreenDashboard.qml</file> + <file>Screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml</file> + <file>Screen/Exchange/DapUiQmlWidgetChainExchanges.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> + <file>Screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml</file> + <file>Screen/History/DapUiQmlScreenHistory.qml</file> + <file>Screen/History/DapUiQmlScreenHistoryForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml</file> + <file>Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetChainWallet.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetChainWalletForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetHistoryLastActions.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetLastActions.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetRightPanel.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetScreenDialogAddWallet.ui.qml</file> + <file>Screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml</file> + <file>Screen/Log/DapUiQmlWidgetChainNodeLogs.qml</file> + <file>Screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml</file> + <file>Screen/Settings/DapUiQmlScreenSettings.qml</file> + <file>Screen/Settings/DapUiQmlScreenSettingsForm.ui.qml</file> + <file>Screen/Settings/DapUiQmlScreenSettingsSection.qml</file> + <file>Screen/Settings/DapUiQmlWidgetSettingsNetwork.qml</file> + <file>Screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml</file> + <file>Screen/StatusBar/DapUiQmlWidgetStatusBar.qml</file> + <file>Screen/StatusBar/DapUiQmlWidgetStatusBarButton.ui.qml</file> + <file>Screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml</file> + <file>Screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml</file> + <file>Screen/StatusBar/DapUiQmlWidgetStatusBarContentItem.qml</file> + <file>Screen/VPN/DapUiQmlScreenVpn.qml</file> + <file>Screen/VPN/DapUiQmlScreenVpnForm.ui.qml</file> + <file>Screen/VPN/DapUiQmlWidgetSettingsVpn.qml</file> + <file>Screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml</file> + <file>Screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml</file> + <file>Screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml</file> + <file>Screen/DapUiQmlScreen.qml</file> + <file>Screen/DapUiQmlScreenForm.ui.qml</file> + <file>Screen/DapUiQmlScreenMainWindow.qml</file> + <file>Screen/DapUiQmlScreenMainWindowForm.ui.qml</file> + <file>Screen/main.qml</file> </qresource> </RCC> -- GitLab