diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml
new file mode 100644
index 0000000000000000000000000000000000000000..e05b8e9b7552645a235f4417ae4e6a51174cf51b
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml
@@ -0,0 +1,52 @@
+import QtQuick 2.0
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+
+DapUiQmlScreen {
+ height: 36 * pt
+ color: "#edeff2"
+
+ property string backButtonNormal : "qrc:/Resources/Icons/close_icon.png"
+ property string backButtonHovered : "qrc:/Resources/Icons/close_icon_hover.png"
+ property string title : qsTr("New wallet")
+ property alias mouseArea : mouseArea
+
+ RowLayout
+ {
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: 8
+ spacing: 12
+
+ Rectangle {
+ width: 20
+ height: 20
+ color: "transparent"
+
+ Image {
+ id: buttonCloseAddWallet
+ anchors.fill: parent
+ source: backButtonNormal
+ }
+
+ MouseArea {
+ id: mouseArea
+ anchors.fill: parent
+ hoverEnabled: true
+
+ onEntered: buttonCloseAddWallet.source = backButtonHovered
+ onExited: buttonCloseAddWallet.source = backButtonNormal
+
+ onClicked: {
+ rightPanel.header.pop();
+ rightPanel.content.pop();
+ }
+ }
+ }
+
+ Text {
+ text: title
+ font.pointSize: 14
+ }
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreated.qml b/CellFrameDashboardGUI/DapUiQmlWalletCreated.qml
new file mode 100644
index 0000000000000000000000000000000000000000..e336476f69312a539cf308f26bdaedecdd33d1a5
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWalletCreated.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+DapUiQmlWalletCreatedForm {
+ buttonDone.onClicked: {
+ rightPanel.header.pop(null);
+ rightPanel.content.pop(null);
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml b/CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml
new file mode 100644
index 0000000000000000000000000000000000000000..5f0d953d6e38d3cebfdaf972de215341afa4af40
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+
+DapUiQmlScreenDialogAddWalletHeader {
+ title: ""
+
+ mouseArea.onClicked: {
+ rightPanel.header.pop(null);
+ rightPanel.content.pop(null);
+ }
+}
diff --git a/CellFrameDashboardGUI/Screen/Console/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/Screen/Console/DapUiQmlScreenConsoleForm.ui.qml
index 1fc169bcfa8bec4c59a86ff0dddf570c92cd31fc..50d2151500c7cf8ca0f8e6c1a41e5d268af2fe74 100644
--- a/CellFrameDashboardGUI/Screen/Console/DapUiQmlScreenConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/Screen/Console/DapUiQmlScreenConsoleForm.ui.qml
@@ -18,13 +18,5 @@ DapUiQmlScreen {
Layout.topMargin: 30 * pt
Layout.rightMargin: 30 * pt
}
-
-// DapUiQmlWidgetConsoleLastActionsForm {
-// id: lastActionsPanel
-// consoleData: dapConsoleForm.textAreaCmdHistory
-//// border.color: "transparent"
-// }
}
-
-
}
diff --git a/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml b/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml
index 62c964e7dac5ef4ad8a1af7a8836398b18467c75..3596945747322680dd44ebd38db5141e2241a461 100644
--- a/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml
+++ b/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml
@@ -1,5 +1,5 @@
import QtQuick 2.4
-DapUiQmlScreenForm {
+Rectangle {
property DapUiQmlWidgetRightPanel rightPanel
}
diff --git a/CellFrameDashboardGUI/Screen/DapUiQmlScreenForm.ui.qml b/CellFrameDashboardGUI/Screen/DapUiQmlScreenForm.ui.qml
deleted file mode 100644
index dcae899cc963a4ab9bbd2d9c064dca429a5aba8e..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/Screen/DapUiQmlScreenForm.ui.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.2
-
-Page {
-
-}
diff --git a/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml b/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml
index 0b4ef1a0e92e975f3526a992f97115cfbe8b968c..fa42a42c0f7371ab88bafc09f2cfbbb91e57f95c 100644
--- a/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml
+++ b/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml
@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.12
DapUiQmlScreen {
id: dapUiQmlScreenDialog
- title: qsTr("Dashboard")
anchors.fill: parent
ColumnLayout {
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
index 8ed1b631b173aaa028354bc49908bee4ce3c4b0c..cbf77711c0732ecc2d205992c2a384cad687c01f 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
@@ -2,68 +2,10 @@ import QtQuick 2.12
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
-Rectangle {
- property alias pressedBackButton: mouseAreaBackButton.pressed
- property alias pressedNextButtonForCreateWallet: nextButton.pressed
-
+DapUiQmlScreen {
id: recoveryNoteMenu
- width: 400
- height: 640
- border.color: "#B5B5B5"
- border.width: 1 * pt
color: "#edeff2"
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- Rectangle {
- id: newWalletArea
- height: 36
- color: "#edeff2"
- border.width: 0
- anchors.right: parent.right
- anchors.rightMargin: 1
- anchors.left: parent.left
- anchors.leftMargin: 1
- anchors.top: parent.top
- anchors.topMargin: 0
-
- Text {
- id: newWalletText
- text: qsTr("New wallet")
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: backButton.right
- anchors.leftMargin: 12
- font.pointSize: 12
- }
-
- Button {
- id: backButton
- width: 20
- height: 20
- anchors.leftMargin: 16
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.horizontalCenter: newNameArea.Center
-
- MouseArea {
- id: mouseAreaBackButton
- anchors.leftMargin: 0
- anchors.fill: parent
- hoverEnabled: true
- }
-
- background: Image {
- id: imageButton
- source: mouseAreaBackButton.containsMouse ? "qrc:/Resources/Icons/back_icon_hover.png" : "qrc:/Resources/Icons/back_icon.png"
- fillMode: Image.PreserveAspectFit
- }
- }
- }
-
Rectangle {
id: wordTextArea
height: 30
@@ -72,7 +14,7 @@ Rectangle {
anchors.leftMargin: 1
anchors.right: parent.right
anchors.left: parent.left
- anchors.top: newWalletArea.bottom
+ anchors.top: parent.top
Text {
id: wordText
@@ -306,9 +248,3 @@ Rectangle {
}
}
-/*##^##
-Designer {
- D{i:24;anchors_width:400}
-}
-##^##*/
-
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
index a21fe3d86a651b7089c9d1696974d3135031ab06..6d1c94a8669c87f6e090a887fda62b3c4b3c9e00 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
@@ -3,71 +3,16 @@ import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
Rectangle {
- property alias pressedBackButton: mouseAreaBackButton.pressed
- property alias pressedNextButtonForCreateWallet: nextButton.pressed
-
id: recoveryQrMenu
- width: 400
- height: 640
- border.color: "#B5B5B5"
- border.width: 1 * pt
color: "#edeff2"
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- Rectangle {
- id: newWalletArea
- 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: newWalletText
- text: qsTr("New wallet")
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: backButton.right
- anchors.leftMargin: 12
- font.pointSize: 12
- }
-
- Button {
- id: backButton
- width: 20
- height: 20
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: newNameArea.left
- anchors.horizontalCenter: newNameArea.Center
-
- MouseArea {
- id: mouseAreaBackButton
- anchors.fill: parent
- hoverEnabled: true
- }
-
- background: Image {
- id: imageButton
- source: mouseAreaBackButton.containsMouse ? "qrc:/Resources/Icons/back_icon_hover.png" : "qrc:/Resources/Icons/back_icon.png"
- fillMode: Image.PreserveAspectFit
- }
- }
- }
-
Rectangle {
id: qrCodeTextArea
height: 30
color: "#757184"
anchors.right: parent.right
anchors.left: parent.left
- anchors.top: newWalletArea.bottom
+ anchors.top: parent.top
Text {
id: qrCodeText
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
index 3d9d8efb6fc86bd2937664f50ddbf93805113876..0415ef0f13432f027eb2c7e4097fd704438a390b 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
@@ -5,10 +5,32 @@ import CellFrameDashboard 1.0
DapUiQmlScreenDialogAddWalletForm {
id: dialogAddWallet
focus: true
-}
-/*##^##
-Designer {
- D{i:0;autoSize:true;height:0;width:0}
+ Connections {
+ target: nextButton
+ onClicked: {
+ if(isWordsRecoveryMethodChecked) {
+
+ rightPanel.content.push("DapUiQmlRecoveryNotesForm.ui.qml", {"rightPanel": rightPanel});
+ rightPanel.header.push("DapUiQmlScreenDialogAddWalletHeader.qml", {
+ "backButtonNormal": "qrc:/Resources/Icons/back_icon.png",
+ "backButtonHovered": "qrc:/Resources/Icons/back_icon_hover.png",
+ "rightPanel": rightPanel
+ });
+ }
+ else if(isQRCodeRecoveryMethodChecked) {
+ rightPanel.content.push("DapUiQmlRecoveryQrForm.ui.qml", {"rightPanel": rightPanel});
+ rightPanel.header.push("DapUiQmlScreenDialogAddWalletHeader.qml", {
+ "backButtonNormal": "qrc:/Resources/Icons/back_icon.png",
+ "backButtonHovered": "qrc:/Resources/Icons/back_icon_hover.png",
+ "rightPanel": rightPanel
+ });
+ }
+ else if(isExportToFileRecoveryMethodChecked) console.debug("Export to file"); /*TODO: create dialog select file to export */
+ else {
+ rightPanel.header.push("DapUiQmlWalletCreatedHeader.qml", {"rightPanel": rightPanel });
+ rightPanel.content.push("DapUiQmlWalletCreated.qml", {"rightPanel": rightPanel} )
+ }
+ }
+ }
}
-##^##*/
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 57feb1d440214611b4a115bc4eabcaf525ae47bf..37886d14076116ef96a439d17bb07d627ee4e3ae 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -1,79 +1,23 @@
import QtQuick 2.4
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
-Rectangle {
- property alias pressedCloseAddWallet: mouseAreaCloseAddWallet.pressed
- property alias pressedNextButton: mouseAreaNextButton.pressed
+DapUiQmlScreen {
+ property alias nextButton: nextButton
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
+ anchors.top: parent.top
Text {
id: nameWalletText
@@ -254,30 +198,26 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: chooseRecoveryMethod.bottom
anchors.topMargin: 32
+ hoverEnabled: true
- MouseArea {
- id: mouseAreaNextButton
- anchors.fill: parent
- hoverEnabled: true
- }
-
- Text {
+ contentItem: Text {
id: nextButtonText
text: qsTr("Next")
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
+ anchors.fill: parent
color: "#ffffff"
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
font.pointSize: 18
- horizontalAlignment: Text.AlignLeft
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
}
+
background: Rectangle {
implicitWidth: parent.width
implicitHeight: parent.height
- color: mouseAreaNextButton.containsMouse ? "#D51F5D" : "#070023"
+ color: parent.hovered ? "#D51F5D" : "#070023"
}
}
}
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
index 4b86a0525575b5d3df46eeffaf8f21195a7e034b..dff7c07884c7fb65a700e56705184c4991422d36 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
@@ -2,61 +2,12 @@ import QtQuick 2.0
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
-Rectangle {
- property alias pressedCloseAddWallet: mouseAreaCloseAddWallet.pressed
- property alias pressedDoneCreateWallet: doneCreateWalletButton.pressed
+DapUiQmlScreen {
+ property alias buttonDone: doneCreateWalletButton
id: walletCreatedMenu
- width: 400
- height: 640
- border.color: "#B5B5B5"
- border.width: 1 * pt
color: "#edeff2"
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- Rectangle {
- id: newWalletArea
- 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
-
- Button {
- id: closeButton
- width: 20
- height: 20
- anchors.leftMargin: 16
- anchors.verticalCenterOffset: 0
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.horizontalCenter: newNameArea.Center
-
- MouseArea {
- id: mouseAreaCloseAddWallet
- width: parent.width
- height: parent.height
- anchors.left: parent.left
- anchors.leftMargin: 0
- hoverEnabled: true
- }
-
- background: Image {
- id: imageButton
- source: mouseAreaCloseAddWallet.containsMouse ? "Resources/Icons/close_icon_hover.png" : "Resources/Icons/close_icon.png"
- fillMode: Image.PreserveAspectFit
- }
- }
- }
-
Button {
id: doneCreateWalletButton
anchors.horizontalCenter: parent.horizontalCenter
@@ -83,6 +34,8 @@ Rectangle {
implicitHeight: parent.height
color: "#3E3853"
}
+
+
}
Rectangle {
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActions.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActions.qml
index 1b88d889791b7229d2e426071efd038ed8879773..57853a3aa5ed1ce052c417880aa16d51e9c77954 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActions.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActions.qml
@@ -27,31 +27,9 @@ DapUiQmlWidgetLastActionsForm {
}
}
-// DapUiQmlWidgetLastActionsHeaderForm {
-// id: dapHeader
-// height: 36 * pt
-// anchors.left: parent.left
-// anchors.top: parent.top
-// anchors.right: parent.right
-// anchors.leftMargin: 1 * pt
-// }
-
-// Rectangle {
-// id: splitHeader
-// anchors.top: dapHeader.bottom
-// anchors.left: parent.left
-// anchors.right: parent.right
-// height: 1 * pt
-// color: "#C2CAD1"
-// }
-
ListView {
id: dapListView
anchors.fill: parent
-// anchors.top: splitHeader.bottom
-// anchors.left: parent.left
-// anchors.right: parent.right
-// anchors.bottom: parent.bottom
clip: true
property var contentPos: 0.0;
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
index 0a169c72db940e262be59aafa3a1a2e0fcf27474..7648b3a8cefb5f12585e52c214eccafc46a4daee 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
@@ -1,9 +1,5 @@
import QtQuick 2.4
Rectangle {
- anchors.fill: parent
color: "transparent"
-// border.color: "#B5B5B5"
-// border.width: 1 * pt
-// color: "#EDEFF2"
}
diff --git a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
index e9ed025f49a83d5448e1e4d0b5d06bacbd020ab1..27a6895a22036f5606c4365771adc66e5ba95d7e 100644
--- a/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/Screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
@@ -2,10 +2,11 @@ import QtQuick 2.4
import QtQuick.Controls 2.13
Rectangle {
+ id: rightPanel
property alias header : stackViewHeader
property alias content : stackViewContent
property alias background : rightPanelPage.background
- property alias footer: stackViewHeader
+ property alias footer: stackViewFooter
width: visible ? 400 * pt : 0
color: "#E3E2E6"
@@ -22,17 +23,20 @@ Rectangle {
id: stackViewHeader
width: parent.width
height: currentItem === null ? 0 : currentItem.height
+ clip: true
}
StackView {
id: stackViewContent
anchors.fill: parent
+ clip: true
}
footer: StackView {
id: stackViewFooter
width: parent.width
height: currentItem === null ? 0 : currentItem.height
+ clip: true
}
- }
+ }
}
diff --git a/CellFrameDashboardGUI/Screen/StatusBar/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/Screen/StatusBar/DapUiQmlWidgetStatusBar.qml
index 3e23035abb1830dc324dfd13c3745f3247c35206..fbce3f2ec0f83cabd8e7e12bc52aca87e02eb32b 100644
--- a/CellFrameDashboardGUI/Screen/StatusBar/DapUiQmlWidgetStatusBar.qml
+++ b/CellFrameDashboardGUI/Screen/StatusBar/DapUiQmlWidgetStatusBar.qml
@@ -5,7 +5,7 @@ import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.3
Rectangle {
- property alias addWalletPressed: statusBarAddWalletButton.pressed
+// property alias addWalletPressed: statusBarAddWalletButton.pressed
Rectangle {
anchors.fill: parent
anchors.bottomMargin: 1
@@ -71,6 +71,11 @@ Rectangle {
anchors.rightMargin: 20 * pt
anchors.bottom: parent.bottom
anchors.bottomMargin: 10 * pt
+
+ onClicked: {
+ rightPanel.header.push("DapUiQmlScreenDialogAddWalletHeader.qml", {"rightPanel": rightPanel});
+ rightPanel.content.push("DapUiQmlScreenDialogAddWallet.qml", {"rightPanel": rightPanel});
+ }
}
}
}
diff --git a/CellFrameDashboardGUI/Src/main.cpp b/CellFrameDashboardGUI/Src/main.cpp
index 00ce401b807641e3bcae56344e1acd9b79916fc7..7379a76e4cf4f2b0a74ce9e0a7779c40cfccff7c 100644
--- a/CellFrameDashboardGUI/Src/main.cpp
+++ b/CellFrameDashboardGUI/Src/main.cpp
@@ -54,6 +54,8 @@ int main(int argc, char *argv[])
mkdir("/tmp/cellframe-dashboard_log",0777);
dapLogger.setLogFile(QString("/tmp/cellframe-dashboard_log/%1Gui.log").arg(DAP_BRAND));
#elif defined Q_OS_WIN
+ dapLogger.setLogFile(QString("%Dashboard.log").arg(DAP_BRAND));
+ dapLogger.setLogLevel(L_DEBUG);
#endif
//#endif
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index cf3b1aedf951fb61b01fd845236748d45007ccfa..fcfb1094b1531d5549c8794a246786804f052080 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -36,6 +36,13 @@
<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>DapUiQmlScreenDialogAddWalletHeader.qml</file>
+ <file>DapUiQmlWalletCreatedHeader.qml</file>
+ <file>DapUiQmlWalletCreated.qml</file>
<file>Screen/Console/DapUiQmlScreenConsoleForm.ui.qml</file>
<file>Screen/Console/DapUiQmlWidgetConsole.qml</file>
<file>Screen/Console/DapUiQmlWidgetConsoleForm.ui.qml</file>
diff --git a/libdap-crypto b/libdap-crypto
index d9337dda7db1b3430d17914b4e290b9a200045a2..c81202ba5d48e5d77afcc8aea9962a10560527f3 160000
--- a/libdap-crypto
+++ b/libdap-crypto
@@ -1 +1 @@
-Subproject commit d9337dda7db1b3430d17914b4e290b9a200045a2
+Subproject commit c81202ba5d48e5d77afcc8aea9962a10560527f3
diff --git a/libdap-qt b/libdap-qt
index cc89c94372b96df8e9ffec736e3da7ccecdb0abe..5f661c223be1ccd39f0dfa104a44de0d9f9dfb35 160000
--- a/libdap-qt
+++ b/libdap-qt
@@ -1 +1 @@
-Subproject commit cc89c94372b96df8e9ffec736e3da7ccecdb0abe
+Subproject commit 5f661c223be1ccd39f0dfa104a44de0d9f9dfb35
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index fc638ab642564dbe3136fe9c5ad573d6428099fc..257d070fbe0228bd5c6c6be433c48160eaaefb28 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit fc638ab642564dbe3136fe9c5ad573d6428099fc
+Subproject commit 257d070fbe0228bd5c6c6be433c48160eaaefb28