diff --git a/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
index 8877796f4d8fac37bec4b7af8fb01b57579f9ba4..cbf77711c0732ecc2d205992c2a384cad687c01f 100644
--- a/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
@@ -3,67 +3,9 @@ import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
DapUiQmlScreen {
-// property alias pressedBackButton: mouseAreaBackButton.pressed
-// property alias pressedNextButtonForCreateWallet: nextButton.pressed
-
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
@@ -306,9 +248,3 @@ DapUiQmlScreen {
}
}
-/*##^##
-Designer {
- D{i:24;anchors_width:400}
-}
-##^##*/
-
diff --git a/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml
index 005a9544ff16bb530de858b3d41de55d6c2c633d..6d1c94a8669c87f6e090a887fda62b3c4b3c9e00 100644
--- a/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml
@@ -3,64 +3,9 @@ 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
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
index f5bd3a43db4d7f6f67de21b367c10d6f7ee1b3db..0415ef0f13432f027eb2c7e4097fd704438a390b 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
@@ -34,9 +34,3 @@ DapUiQmlScreenDialogAddWalletForm {
}
}
}
-
-/*##^##
-Designer {
- D{i:0;autoSize:true;height:0;width:0}
-}
-##^##*/
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 8bb522682429dec7b0a815a28fe5a994d3af3dc2..37886d14076116ef96a439d17bb07d627ee4e3ae 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -3,64 +3,14 @@ import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
DapUiQmlScreen {
-// property alias pressedCloseAddWallet: mouseAreaCloseAddWallet.pressed
-// property alias pressedNextButton: mouseAreaNextButton.pressed
property alias nextButton: nextButton
property bool isWordsRecoveryMethodChecked: selectionWords.checked
property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked
property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked
-
id: addWalletMenu
color: "#EDEFF2"
-// 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
@@ -269,9 +219,5 @@ DapUiQmlScreen {
implicitHeight: parent.height
color: parent.hovered ? "#D51F5D" : "#070023"
}
-
-// onClicked: {
-
-// }
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
index b59e3dda394bde76af0f691528a5421273a4ed6d..e593f92f8c0ddd7e397f91b4b2cb56f966610373 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
@@ -9,28 +9,28 @@ Dialog {
header:
Rectangle
- {
- height: 30
- color: "#353841"
+ {
+ height: 30
+ color: "#353841"
- Text
- {
- id: textTitle
- leftPadding: 10
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Remove wallet...")
- font.family: "Roboto"
- font.pixelSize: 16
- color: "white"
- }
- Rectangle
- {
- anchors.bottom: parent.bottom
- height: 2
- width: parent.width
- color: "green"
- }
+ Text
+ {
+ id: textTitle
+ leftPadding: 10
+ anchors.verticalCenter: parent.verticalCenter
+ text: qsTr("Remove wallet...")
+ font.family: "Roboto"
+ font.pixelSize: 16
+ color: "white"
+ }
+ Rectangle
+ {
+ anchors.bottom: parent.bottom
+ height: 2
+ width: parent.width
+ color: "green"
}
+ }
width: parent.width/1.5
height: 150
@@ -39,104 +39,101 @@ Dialog {
y: parent.height / 2 - height / 2
function show() {
- dialogRemoveWallet.open();
- }
+ dialogRemoveWallet.open();
+ }
contentItem:
Rectangle
+ {
+ anchors.fill: parent
+
+ TextEdit {
+
+
+ id: textQuery
+ wrapMode: TextEdit.Wrap
+ text: qsTr("Are you sure you want to delete\n\"" + dapQmlWidgetChainWallet.nameWallet + " \"?")
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignHCenter
+
+ height: 55
+ anchors.bottom: buttonOk.top
+ anchors.bottomMargin: 20
+ anchors.right: parent.right
+ anchors.rightMargin: 10
+ anchors.left: parent.left
+ anchors.leftMargin: 10
+ font.pixelSize: 20
+ clip: true
+ }
+
+ Button
{
- anchors.fill: parent
-
- TextEdit {
-
-
- id: textQuery
- wrapMode: TextEdit.Wrap
- text: qsTr("Are you sure you want to delete\n\"" + dapQmlWidgetChainWallet.nameWallet + " \"?")
- verticalAlignment: Text.AlignVCenter
+ id: buttonCancel
+ text: qsTr("Cancel")
+ anchors.right: buttonOk.left
+ anchors.rightMargin: 10
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 10
+
+ contentItem: Text {
+ text: buttonCancel.text
+ font: buttonCancel.font
+ opacity: enabled ? 1.0 : 0.3
+ color: buttonCancel.down ? "#353841" : "white"
horizontalAlignment: Text.AlignHCenter
-
- height: 55
- anchors.bottom: buttonOk.top
- anchors.bottomMargin: 20
- anchors.right: parent.right
- anchors.rightMargin: 10
- anchors.left: parent.left
- anchors.leftMargin: 10
- font.pixelSize: 20
- clip: true
+ verticalAlignment: Text.AlignVCenter
+ elide: Text.ElideRight
}
-
- Button
- {
- id: buttonCancel
- text: qsTr("Cancel")
- anchors.right: buttonOk.left
- anchors.rightMargin: 10
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 10
-
- contentItem: Text {
- text: buttonCancel.text
- font: buttonCancel.font
- opacity: enabled ? 1.0 : 0.3
- color: buttonCancel.down ? "#353841" : "white"
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
-
- background: Rectangle {
- implicitWidth: 100
- implicitHeight: 30
- opacity: enabled ? 1 : 0.3
- color: buttonCancel.down ? "white" : "#353841"
- radius: 4
- }
-
- onClicked:
- {
- close()
- }
+
+ background: Rectangle {
+ implicitWidth: 100
+ implicitHeight: 30
+ opacity: enabled ? 1 : 0.3
+ color: buttonCancel.down ? "white" : "#353841"
+ radius: 4
}
- Button
+ onClicked:
{
- id: buttonOk
- text: "OK"
- anchors.right: parent.right
- anchors.rightMargin: 10
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 10
- contentItem: Text {
- text: buttonOk.text
- font: buttonOk.font
- opacity: enabled ? 1.0 : 0.3
- color: buttonOk.down ? "#353841" : "white"
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
-
- background: Rectangle {
- implicitWidth: 100
- implicitHeight: 30
- opacity: enabled ? 1 : 0.3
- color: buttonOk.down ? "white" : "#353841"
- radius: 4
- }
-
- onClicked:
- {
- dapServiceController.removeWallet(dapQmlWidgetChainWallet.indexWallet, dapQmlWidgetChainWallet.nameWallet)
- close()
- }
+ close()
}
-
-
}
+ Button
+ {
+ id: buttonOk
+ text: "OK"
+ anchors.right: parent.right
+ anchors.rightMargin: 10
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 10
+ contentItem: Text {
+ text: buttonOk.text
+ font: buttonOk.font
+ opacity: enabled ? 1.0 : 0.3
+ color: buttonOk.down ? "#353841" : "white"
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ elide: Text.ElideRight
+ }
+
+ background: Rectangle {
+ implicitWidth: 100
+ implicitHeight: 30
+ opacity: enabled ? 1 : 0.3
+ color: buttonOk.down ? "white" : "#353841"
+ radius: 4
+ }
+
+ onClicked:
+ {
+ dapServiceController.removeWallet(dapQmlWidgetChainWallet.indexWallet, dapQmlWidgetChainWallet.nameWallet)
+ close()
+ }
+ }
+ }
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
index c1ca27d756266adb0da30bef2f48e7f9ff2b886f..dff7c07884c7fb65a700e56705184c4991422d36 100644
--- a/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
@@ -3,62 +3,11 @@ import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
DapUiQmlScreen {
-// property alias pressedCloseAddWallet: mouseAreaCloseAddWallet.pressed
-// property alias pressedDoneCreateWallet: doneCreateWalletButton.pressed
-
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