diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 42c0f717954ffbe4049dc05fce75b6e08837b46d..5757d3f3d691dce776d78a455fd636e7fc688a4e 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -28,8 +28,6 @@
<file>screen/DapAbstractScreenForm.ui.qml</file>
<file>screen/DapAbstractRightPanel.qml</file>
<file>screen/DapAbstractRightPanelForm.ui.qml</file>
- <file>screen/desktop/Dashboard/DapDashboardRightPanel.qml</file>
- <file>screen/desktop/Dashboard/DapDashboardRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/DapDashboardScreen.qml</file>
<file>screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml</file>
<file>screen/desktop/Dashboard/DapDashboardTab.qml</file>
@@ -82,5 +80,18 @@
<file>res/icons/new-wallet_icon_dark.png</file>
<file>res/icons/ic_arrow_drop_down.png</file>
<file>res/icons/ic_arrow_drop_up.png</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanelForm.ui.qml</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanel.qml</file>
+ <file>screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml</file>
+ <file>res/icons/back_icon_hover.png</file>
+ <file>res/icons/back_icon.png</file>
+ <file>res/icons/close_icon_hover.png</file>
+ <file>res/icons/close_icon.png</file>
+ <file>res/icons/ic_arrow_drop_down_dark.png</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/res/icons/back_icon.png b/CellFrameDashboardGUI/res/icons/back_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f24db8c01d5a675b44a55fb59e27488c22a1831d
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/back_icon.png differ
diff --git a/CellFrameDashboardGUI/res/icons/back_icon_hover.png b/CellFrameDashboardGUI/res/icons/back_icon_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a102770fcaa8b0ae1b1b6e4a2147e69ac2b1a6
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/back_icon_hover.png differ
diff --git a/CellFrameDashboardGUI/res/icons/close_icon.png b/CellFrameDashboardGUI/res/icons/close_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..82b7d676b9efd94d5d899922c6b682b8be379362
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/close_icon.png differ
diff --git a/CellFrameDashboardGUI/res/icons/close_icon_hover.png b/CellFrameDashboardGUI/res/icons/close_icon_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..01969771736724aee37ad6f6c4890ad4547360dd
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/close_icon_hover.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e4355d129fc9dd3ddc5e94f3bbe50b1c5cdfa00
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark.png differ
diff --git a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
index 9930c74c6f17ae9b37abf8934b9a1718304039b6..5dbe131a48540af9fd03f2bcba28f3461dcbb98f 100644
--- a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
@@ -6,34 +6,35 @@ import "qrc:/widgets"
DapRightPanel
{
id: rightPanel
-
- ///@detalis Stack of right panels owned by current.
- property alias dapChildRightPanels: childRightPanels
- dapHeader.height: 30 * pt
- dapFrame.width: 350 * pt
- dapFrame.height: parent.height
- color: "blue"
-
-
- dapHeaderData:
- Rectangle
+ property DapButton dapButtonClose:
+ DapButton
{
- anchors.fill: parent
- color: "yellow"
+ id: buttonClose
+ height: 16 * pt
+ width: 16 * pt
+ heightImageButton: 16 * pt
+ widthImageButton: 16 * pt
+ colorBackgroundNormal: "#F8F7FA"
+ colorBackgroundHover: "#F8F7FA"
+ normalImageButton: "qrc:/res/icons/close_icon.png"
+ hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
}
- dapContentItemData:
- // Install right panel content
- StackView
- {
- id: childRightPanels
- anchors.fill: parent
- }
+ dapHeader.height: 30 * pt
+ dapFrame.width: 400 * pt
+ dapFrame.height: parent.height
+ color: "#F8F7FA"
}
+
+
+
+
+
+
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
diff --git a/CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml b/CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml
index 3111005023886c4765fa26aca2e64d2c11dadf64..a0c6d083d2d16b565e4fc424ee69beeed04ae0eb 100644
--- a/CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml
@@ -4,5 +4,5 @@ import "qrc:/widgets"
DapTab
{
dapSeparator.width: 1 * pt
- dapSeparator.color: "red"
+ dapSeparator.color: "#E3E2E6"
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardRightPanel.qml
deleted file mode 100644
index 31b4eeb7270a3cb0d36fdd62653cbe572c3663fc..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardRightPanel.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.4
-
-DapDashboardRightPanelForm
-{
-
-}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
index e6feae040403a8b829275848b23cc6157c5a8313..7d0c1ea3f05e609e25bc0ebfed5e8de2749f165b 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
@@ -1,5 +1,6 @@
import QtQuick 2.4
-DapDashboardScreenForm {
- buttonTest.onClicked: textTest.text = "DESKTOP"
+DapDashboardScreenForm
+{
+ buttonTest.onClicked: textTest.text = "DESKTOP " + textTest.font.pointSize + " " + textTest.font.pixelSize
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
index 932118b4ff14b920fdf675a0d550f0cb35d79bd9..9d6c2b913c89a7dfa40370313f6be80eb5225aad 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
@@ -1,5 +1,15 @@
import QtQuick 2.4
-DapDashboardTabForm {
+DapDashboardTabForm
+{
+ ///@detalis Path to the right pane of transaction history.
+ readonly property string transactionHistoryWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml"
+ ///@detalis Path to the right pane of transaction history.
+ readonly property string inputNameWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml"
+ ///@detalis Path to the right pane of transaction history.
+ readonly property string recoveryWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml"
+ ///@detalis Path to the right pane of transaction history.
+ readonly property string doneWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapDoneWalletRightPanel.qml"
+ dapDashboardRightPanel.source: Qt.resolvedUrl(inputNameWallet)
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml
index 7df749f392c63f156455ca4987c7f5692b6d8211..59f69cfe5c362b47ad1bec729a228cbe949d7d0d 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml
@@ -1,4 +1,5 @@
import QtQuick 2.4
+import QtQuick.Controls 2.0
import "qrc:/"
import "../../"
@@ -6,11 +7,19 @@ DapAbstractTab
{
id: dashboardTab
+ property alias dapDashboardRightPanel: rightPanelLoader
+
dapTopPanel: DapDashboardTopPanel { }
dapScreen: DapDashboardScreen { }
- dapRightPanel: DapDashboardRightPanel { }
+ dapRightPanel:
+ Loader
+ {
+ id: rightPanelLoader
+ anchors.fill: parent
+ width: 400
+ }
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
index 2a368e021ddbbc9ba11b352774de6e56ad1cbf42..756f7f22a97bc5cef5ce3a976c5bf1128140d98f 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
@@ -1,4 +1,6 @@
import QtQuick 2.4
-DapDashboardTopPanelForm {
+DapDashboardTopPanelForm
+{
+
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
index 52d4a4602d9b070ca89e9d179e4fc51989cf5419..5929a4af6abc4f27f6e2f0d7d6a684b5cb1d6a43 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
@@ -3,15 +3,14 @@ import QtQuick.Controls 2.0
import "qrc:/widgets"
import "../../"
-
-DapAbstractTopPanel
+DapAbstractTopPanel
{
anchors.fill: parent
// Static text "Wallet"
- Label
+ Label
{
- id:textHeaderWallet
+ id: textHeaderWallet
text: qsTr("Wallet")
anchors.left: parent.left
anchors.leftMargin: 24 * pt
@@ -22,7 +21,7 @@ DapAbstractTopPanel
}
// Wallet selection combo box
- Rectangle
+ Rectangle
{
id: frameComboBox
@@ -32,34 +31,47 @@ DapAbstractTopPanel
width: 148 * pt
color: "transparent"
- DapComboBox
+ DapComboBox
{
id: comboboxWallet
- model: ListModel{
- id:ÑonversionList
- ListElement{text:"all wallets"}
- ListElement{text:"Money for children"}
- ListElement{text:"Money for education"}
- ListElement{text:"Money for medicine"}
+ model: ListModel
+ {
+ id: ÑonversionList
+ ListElement
+ {
+ text: "all wallets"
+ }
+ ListElement
+ {
+ text: "Money for children"
+ }
+ ListElement
+ {
+ text: "Money for education"
+ }
+ ListElement
+ {
+ text: "Money for medicine"
+ }
}
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
- sidePaddingNormal:0 * pt
- sidePaddingActive:16 * pt
- topIndentActive:10 * pt
- normalColorText:"#070023"
- hilightColorText:"#FFFFFF"
- normalColorTopText:"#FFFFFF"
- hilightColorTopText:"#070023"
+ sidePaddingNormal: 0 * pt
+ sidePaddingActive: 16 * pt
+ topIndentActive: 10 * pt
+ normalColorText: "#070023"
+ hilightColorText: "#FFFFFF"
+ normalColorTopText: "#FFFFFF"
+ hilightColorTopText: "#070023"
hilightColor: "#330F54"
normalTopColor: "#070023"
- widthPopupComboBoxNormal:148 * pt
- widthPopupComboBoxActive:180 * pt
- heightComboBoxNormal:24 * pt
- heightComboBoxActive:44 * pt
- bottomIntervalListElement:8 * pt
- topEffect:false
+ widthPopupComboBoxNormal: 148 * pt
+ widthPopupComboBoxActive: 180 * pt
+ heightComboBoxNormal: 24 * pt
+ heightComboBoxActive: 44 * pt
+ bottomIntervalListElement: 8 * pt
+ topEffect: false
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
normalColor: "#FFFFFF"
hilightTopColor: normalColor
@@ -74,14 +86,14 @@ DapAbstractTopPanel
indicatorHeight: indicatorWidth
colorTopNormalDropShadow: "#00000000"
colorDropShadow: "#40ABABAB"
- fontComboBox.pixelSize: 14*pt
+ fontComboBox.pixelSize: 14 * pt
fontComboBox.family: "Roboto"
}
}
// Static wallet balance text "Wallet balance"
- Label
+ Label
{
id: headerWalletBalance
text: qsTr("Wallet balance")
@@ -94,7 +106,7 @@ DapAbstractTopPanel
}
// Dynamic wallet balance text
- Label
+ Label
{
id: textWalletBalance
text: "$ 3 050 745.3453289 USD"
@@ -121,16 +133,16 @@ DapAbstractTopPanel
widthImageButton: 28 * pt
heightImageButton: 28 * pt
indentImageLeftButton: 10 * pt
- colorBackgroundNormal:"#070023"
+ colorBackgroundNormal: "#070023"
colorBackgroundHover: "#D51F5D"
colorButtonTextNormal: "#FFFFFF"
colorButtonTextHover: "#FFFFFF"
indentTextRight: 20 * pt
- existenceImage:true
+ fontButton.pixelSize: 14 * pt
+ existenceImage: true
borderColorButton: "#000000"
borderWidthButton: 0
fontButton.family: "Roboto"
- fontButton.pixelSize: 14 * pt
fontButton.weight: Font.Normal
horizontalAligmentText:Qt.AlignRight
colorTextButton: "#FFFFFF"
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_BACKUP_6288.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_BACKUP_6288.qml
new file mode 100644
index 0000000000000000000000000000000000000000..fe848398d7aec871a1b31e7fc6af9fa59ecad8d9
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_BACKUP_6288.qml
@@ -0,0 +1,133 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+<<<<<<< HEAD
+import "qrc:/widgets"
+=======
+>>>>>>> develop
+import "../../"
+
+
+DapAbstractTopPanel
+{
+<<<<<<< HEAD
+ anchors.fill: parent
+=======
+ property alias testButton: button
+ Button
+ {
+ id: button
+ anchors.fill: parent
+ text: "Press"
+ }
+>>>>>>> develop
+
+ // Static text "Wallet"
+ Label
+ {
+ id:textHeaderWallet
+ text: qsTr("Wallet")
+ anchors.left: parent.left
+ anchors.leftMargin: 24 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+
+ // Wallet selection combo box
+ Rectangle
+ {
+ id: frameComboBox
+
+ anchors.left: textHeaderWallet.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 30 * pt
+ width: 148 * pt
+ color: "transparent"
+
+ DapComboBox
+ {
+ id: comboboxWallet
+
+ model: ListModel{
+ id:ÑonversionList
+ ListElement{text:"all wallets"}
+ ListElement{text:"Money for children"}
+ ListElement{text:"Money for education"}
+ ListElement{text:"Money for medicine"}
+ }
+
+ indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal:0 * pt
+ sidePaddingActive:16 * pt
+ topIndentActive:10 * pt
+ normalColorText:"#070023"
+ hilightColorText:"#FFFFFF"
+ normalColorTopText:"#FFFFFF"
+ hilightColorTopText:"#070023"
+ hilightColor: "#330F54"
+ normalTopColor: "#070023"
+ fontSizeComboBox: 14*px
+ widthPopupComboBoxNormal:148 * pt
+ widthPopupComboBoxActive:180 * pt
+ heightComboBoxNormal:24 * pt
+ heightComboBoxActive:44 * pt
+ bottomIntervalListElement:8 * pt
+ topEffect:false
+ x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
+ }
+ }
+
+ // Static wallet balance text "Wallet balance"
+ Label
+ {
+ id: headerWalletBalance
+ text: qsTr("Wallet balance")
+ anchors.left: frameComboBox.right
+ anchors.leftMargin: 70 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+
+ // Dynamic wallet balance text
+ Label
+ {
+ id: textWalletBalance
+ text: "$ 3 050 745.3453289 USD"
+ anchors.left: headerWalletBalance.right
+ anchors.leftMargin: 18 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 16 * pt
+ color: "#FFFFFF"
+ }
+
+ // Wallet create button
+ DapButton
+ {
+ id: addWalletButton
+ textButton: "New wallet"
+ anchors.right: parent.right
+ anchors.rightMargin: 24 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
+ hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
+ heightButton: 24 * pt
+ widthButton: 120 * pt
+ widthImageButton: 28 * pt
+ heightImageButton: 28 * pt
+ indentImageLeftButton: 10 * pt
+ colorBackgroundNormal:"#070023"
+ colorBackgroundHover: "#D51F5D"
+ colorButtonTextNormal: "#FFFFFF"
+ colorButtonTextHover: "#FFFFFF"
+ indentTextRight: 20 * pt
+ fontSizeButton: 14 * pt
+ existenceImage:true
+ borderColorButton: "#000000"
+ borderWidthButton: 0
+ }
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_BASE_6288.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_BASE_6288.qml
new file mode 100644
index 0000000000000000000000000000000000000000..ea5ef5959e3cd220fa7a09b158bc0461f64ee4a3
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_BASE_6288.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.4
+import "../../"
+
+DapAbstractTopPanel
+{
+
+}
+
+
+
+
+
+
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_LOCAL_6288.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_LOCAL_6288.qml
new file mode 100644
index 0000000000000000000000000000000000000000..1b689c1d6207418c18e1a9ad5ae9a8dd9f5d9c49
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_LOCAL_6288.qml
@@ -0,0 +1,120 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import "qrc:/widgets"
+import "../../"
+
+
+DapAbstractTopPanel
+{
+ anchors.fill: parent
+
+ // Static text "Wallet"
+ Label
+ {
+ id:textHeaderWallet
+ text: qsTr("Wallet")
+ anchors.left: parent.left
+ anchors.leftMargin: 24 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+
+ // Wallet selection combo box
+ Rectangle
+ {
+ id: frameComboBox
+
+ anchors.left: textHeaderWallet.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 30 * pt
+ width: 148 * pt
+ color: "transparent"
+
+ DapComboBox
+ {
+ id: comboboxWallet
+
+ model: ListModel{
+ id:ÑonversionList
+ ListElement{text:"all wallets"}
+ ListElement{text:"Money for children"}
+ ListElement{text:"Money for education"}
+ ListElement{text:"Money for medicine"}
+ }
+
+ indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal:0 * pt
+ sidePaddingActive:16 * pt
+ topIndentActive:10 * pt
+ normalColorText:"#070023"
+ hilightColorText:"#FFFFFF"
+ normalColorTopText:"#FFFFFF"
+ hilightColorTopText:"#070023"
+ hilightColor: "#330F54"
+ normalTopColor: "#070023"
+ fontSizeComboBox: 14*px
+ widthPopupComboBoxNormal:148 * pt
+ widthPopupComboBoxActive:180 * pt
+ heightComboBoxNormal:24 * pt
+ heightComboBoxActive:44 * pt
+ bottomIntervalListElement:8 * pt
+ topEffect:false
+ x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
+ }
+ }
+
+ // Static wallet balance text "Wallet balance"
+ Label
+ {
+ id: headerWalletBalance
+ text: qsTr("Wallet balance")
+ anchors.left: frameComboBox.right
+ anchors.leftMargin: 70 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+
+ // Dynamic wallet balance text
+ Label
+ {
+ id: textWalletBalance
+ text: "$ 3 050 745.3453289 USD"
+ anchors.left: headerWalletBalance.right
+ anchors.leftMargin: 18 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 16 * pt
+ color: "#FFFFFF"
+ }
+
+ // Wallet create button
+ DapButton
+ {
+ id: addWalletButton
+ textButton: "New wallet"
+ anchors.right: parent.right
+ anchors.rightMargin: 24 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
+ hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
+ heightButton: 24 * pt
+ widthButton: 120 * pt
+ widthImageButton: 28 * pt
+ heightImageButton: 28 * pt
+ indentImageLeftButton: 10 * pt
+ colorBackgroundNormal:"#070023"
+ colorBackgroundHover: "#D51F5D"
+ colorButtonTextNormal: "#FFFFFF"
+ colorButtonTextHover: "#FFFFFF"
+ indentTextRight: 20 * pt
+ fontSizeButton: 14 * pt
+ existenceImage:true
+ borderColorButton: "#000000"
+ borderWidthButton: 0
+ }
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_REMOTE_6288.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_REMOTE_6288.qml
new file mode 100644
index 0000000000000000000000000000000000000000..b58555259e7bc024f2f444000d92b2f0484c5839
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui_REMOTE_6288.qml
@@ -0,0 +1,26 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import "../../"
+
+DapAbstractTopPanel
+{
+ property alias testButton: button
+ Button
+ {
+ id: button
+ anchors.fill: parent
+ text: "Press"
+ }
+
+}
+
+
+
+
+
+
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..01b96efde04f495beb991b2688fca72fb93fa450
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanel.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.4
+
+DapDoneWalletRightPanelForm
+{
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..b02a714e7fc280d52c4d472d54d5c953ac7e8b31
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
@@ -0,0 +1,121 @@
+import QtQuick 2.4
+import "qrc:/widgets"
+import "../../../"
+
+DapAbstractRightPanel
+{
+ dapButtonClose.height: 16 * pt
+ dapButtonClose.width: 16 * pt
+ dapButtonClose.heightImageButton: 16 * pt
+ dapButtonClose.widthImageButton: 16 * pt
+ dapButtonClose.normalImageButton: "qrc:/res/icons/close_icon.png"
+ dapButtonClose.hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
+
+ dapHeaderData:
+ Row
+ {
+ anchors.fill: parent
+ anchors.leftMargin: 16 * pt
+ anchors.rightMargin: 16 * pt
+ anchors.topMargin: 12 * pt
+ anchors.bottomMargin: 12 * pt
+
+ Item
+ {
+ id: itemButtonClose
+ data: dapButtonClose
+ }
+ }
+
+ dapContentItemData:
+ Rectangle
+ {
+ anchors.fill: parent
+ anchors.leftMargin: 16 * pt
+ anchors.rightMargin: 16 * pt
+ color: "transparent"
+
+ Rectangle
+ {
+ id: rectangleTop
+ anchors.top: parent.top
+ anchors.bottom: textMessage.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ color: "transparent"
+ }
+
+ Text
+ {
+ id: textMessage
+ text: qsTr("Wallet created\nsuccessfully")
+ horizontalAlignment: Text.AlignHCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.topMargin: 24 * pt
+ anchors.bottom: rectangleCenter.top
+ anchors.bottomMargin: 24 * pt
+ color: "#070023"
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pointSize: 16 * pt
+ }
+
+ Rectangle
+ {
+ id: rectangleCenter
+ height: 118 * pt
+ anchors.bottom: buttonDone.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ color: "transparent"
+ }
+
+ DapButton
+ {
+ id: buttonDone
+ heightButton: 44 * pt
+ widthButton: 130 * pt
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.bottom: rectangleBottom.top
+ anchors.topMargin: 24 * pt
+ anchors.bottomMargin: 24 * pt
+ checkable: true
+ textButton: qsTr("Done")
+ existenceImage: false
+ horizontalAligmentText: Text.AlignHCenter
+ indentTextRight: 0
+ fontSizeButton: 18 * pt
+ colorTextButton: buttonDone.checked ? "#3E3853" : "#FFFFFF"
+ colorBackgroundButton: "#3E3853"
+ }
+
+ Rectangle
+ {
+ id: rectangleBottom
+ height: 189 * pt
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ color: "transparent"
+ }
+
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..518af912ef583326cc25091609ef08f7611999d1
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.4
+
+DapInputNewWalletNameRightPanelForm
+{
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..c8f5e821fd53b758442909dbb979087e82b9be6f
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
@@ -0,0 +1,336 @@
+import QtQuick 2.4
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.3
+import QtQuick.Controls.Styles 1.4
+import "qrc:/widgets"
+import "../../../"
+
+DapAbstractRightPanel
+{
+ dapHeaderData:
+ Row
+ {
+ anchors.fill: parent
+ anchors.leftMargin: 16 * pt
+ anchors.rightMargin: 16 * pt
+ anchors.topMargin: 12 * pt
+ anchors.bottomMargin: 12 * pt
+ spacing: 12 * pt
+
+ Item
+ {
+ id: itemButtonClose
+ data: dapButtonClose
+ height: dapButtonClose.height
+ width: dapButtonClose.width
+ }
+
+ Text
+ {
+ id: textHeader
+ text: qsTr("New wallet")
+ font.pixelSize: 14 * pt
+ color: "#3E3853"
+ }
+ }
+
+ dapContentItemData:
+ Rectangle
+ {
+ anchors.fill: parent
+ color: "transparent"
+
+ Rectangle
+ {
+ id: frameNameWallet
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.topMargin: 8 * pt
+ anchors.bottomMargin: 8 * pt
+ color: "#757184"
+ height: 30 * pt
+ Text
+ {
+ id: textNameWallet
+ color: "#ffffff"
+ text: qsTr("Name of wallet")
+ font.pixelSize: 12 * pt
+ horizontalAlignment: Text.AlignLeft
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: 16 * pt
+ }
+ }
+
+ Rectangle
+ {
+ id: frameInputNameWallet
+ height: 68 * pt
+ color: "#F8F7FA"
+ anchors.top: frameNameWallet.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.leftMargin: 16 * pt
+ anchors.rightMargin: 16 * pt
+ TextField
+ {
+ id: textInputNameWallet
+ placeholderText: qsTr("Pocket of happiness")
+ anchors.verticalCenter: parent.verticalCenter
+ font.pixelSize: 16 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ horizontalAlignment: Text.AlignLeft
+ anchors.left: parent.left
+ anchors.leftMargin: 20 * pt
+ anchors.right: parent.right
+ style:
+ TextFieldStyle
+ {
+ textColor: "#070023"
+ placeholderTextColor: "#070023"
+ background:
+ Rectangle
+ {
+ border.width: 0
+ color: "transparent"
+ }
+ }
+ }
+ }
+
+ Rectangle
+ {
+ id: frameChooseSignatureType
+ anchors.top: frameInputNameWallet.bottom
+ anchors.right: parent.right
+ anchors.left: parent.left
+ color: "#757184"
+ height: 30 * pt
+ Text
+ {
+ id: textChooseSignatureType
+ color: "#ffffff"
+ text: qsTr("Choose signature type")
+ font.pixelSize: 12 * pt
+ anchors.leftMargin: 16 * pt
+ anchors.left: parent.left
+ horizontalAlignment: Text.AlignLeft
+ font.styleName: "Normal"
+ font.family: "Roboto"
+ font.weight: Font.Normal
+ anchors.verticalCenter: parent.verticalCenter
+ }
+ }
+
+ Rectangle
+ {
+ id: frameSignatureType
+ height: 68 * pt
+ color: "#F8F7FA"
+ anchors.top: frameChooseSignatureType.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.leftMargin: 16 * pt
+ anchors.rightMargin: 16 * pt
+ DapComboBox
+ {
+ property Label fieldBalance: Label {}
+
+ model:
+ ListModel
+ {
+ id: signatureType
+ ListElement
+ {
+ signatureName: "Dilithium"
+ }
+ ListElement
+ {
+ signatureName: "Bliss"
+ }
+ ListElement
+ {
+ signatureName: "Picnic"
+ }
+ ListElement
+ {
+ signatureName: "Tesla"
+ }
+ }
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.leftMargin: 20 * pt
+ anchors.rightMargin: 20 * pt
+ indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down_dark.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal: 0 * pt
+ sidePaddingActive: 0 * pt
+ topIndentActive: 10 * pt
+ normalColorText: "#070023"
+ hilightColorText: "#transparent"
+ normalColorTopText: "#070023"
+ hilightColorTopText: "#070023"
+ hilightColor: "#330F54"
+ normalTopColor: "transparent"
+ widthPopupComboBoxNormal: 148 * pt
+ widthPopupComboBoxActive: 180 * pt
+ heightComboBoxNormal: 24 * pt
+ heightComboBoxActive: 44 * pt
+ bottomIntervalListElement: 8 * pt
+ topEffect: false
+ x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
+ normalColor: "#FFFFFF"
+ hilightTopColor: normalColor
+ topIndentNormal: 12 * pt
+ bottomIndentNormal: 14 * pt
+ bottomIndentActive: bottomIndentNormal
+ paddingTopItemDelegate: 8 * pt
+ paddingBottomItemDelegate: paddingTopItemDelegate
+ heightListElement: 32 * pt
+ intervalListElement: 10 * pt
+ indicatorWidth: 20 * pt
+ indicatorHeight: indicatorWidth
+ colorTopNormalDropShadow: "#00000000"
+ colorDropShadow: "#40ABABAB"
+ fontComboBox.pixelSize: 16 * pt
+ fontComboBox.family: "Roboto"
+ }
+ }
+
+ Rectangle
+ {
+ id: frameRecoveryMethod
+ anchors.top: frameSignatureType.bottom
+ anchors.right: parent.right
+ anchors.left: parent.left
+ color: "#757184"
+ height: 30 * pt
+ Text
+ {
+ id: textRecoveryMethod
+ color: "#ffffff"
+ text: qsTr("Recovery method")
+ font.pixelSize: 12 * pt
+ anchors.leftMargin: 16 * pt
+ anchors.left: parent.left
+ horizontalAlignment: Text.AlignLeft
+ font.styleName: "Normal"
+ font.family: "Roboto"
+ font.weight: Font.Normal
+ anchors.verticalCenter: parent.verticalCenter
+ }
+ }
+
+ Rectangle
+ {
+ id: frameChooseRecoveryMethod
+ anchors.top: frameRecoveryMethod.bottom
+ anchors.topMargin: 32 * pt
+ anchors.left: parent.left
+ anchors.leftMargin: 16 * pt
+ anchors.right: parent.right
+ height: columnChooseRecoveryMethod.implicitHeight
+ color: "transparent"
+
+ ColumnLayout
+ {
+ id: columnChooseRecoveryMethod
+ spacing: 32 * pt
+ anchors.fill: parent
+ anchors.leftMargin: 16 * pt
+
+ Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+
+ DapRadioButton
+ {
+ id: buttonSelectionWords
+ nameRadioButton: qsTr("24 words")
+ checked: true
+ indicatorSize: 20 * pt
+ indicatorInnerSize: 10 * pt
+ spaceIndicatorText: 16 * pt
+ fontRadioButton.pixelSize: 14 * pt
+ indicatorBackgroundColor: "transparent"
+ indicatorBorder.width: 2 * pt
+ }
+
+ DapRadioButton
+ {
+ id: buttonSelectionQRcode
+ nameRadioButton: qsTr("QR code")
+ indicatorSize: 20 * pt
+ indicatorInnerSize: 10 * pt
+ spaceIndicatorText: 16 * pt
+ fontRadioButton.pixelSize: 14 * pt
+ indicatorBackgroundColor: "transparent"
+ indicatorBorder.width: 2 * pt
+ }
+
+ DapRadioButton
+ {
+ id: buttonSelectionExportToFile
+ nameRadioButton: qsTr("Export to file")
+ indicatorSize: 20 * pt
+ indicatorInnerSize: 10 * pt
+ spaceIndicatorText: 16 * pt
+ fontRadioButton.pixelSize: 14 * pt
+ indicatorBackgroundColor: "transparent"
+ indicatorBorder.width: 2 * pt
+ }
+
+ DapRadioButton
+ {
+ id: buttonSelectionNothing
+ nameRadioButton: qsTr("Nothing")
+ indicatorSize: 20 * pt
+ indicatorInnerSize: 10 * pt
+ spaceIndicatorText: 16 * pt
+ fontRadioButton.pixelSize: 14 * pt
+ indicatorBackgroundColor: "transparent"
+ indicatorBorder.width: 2 * pt
+ }
+ }
+ }
+
+ DapButton
+ {
+ id: buttonNext
+ height: 44 * pt
+ width: 130 * pt
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.top: frameChooseRecoveryMethod.bottom
+ anchors.topMargin: 64 * pt
+ textButton: qsTr("Next")
+ existenceImage: false
+ colorBackgroundHover: "#D51F5D"
+ colorBackgroundNormal: "#070023"
+ colorButtonTextNormal: "#FFFFFF"
+ horizontalAligmentText: Text.AlignHCenter
+ indentTextRight: 0
+ fontButton.pixelSize: 18 * pt
+ }
+
+ Rectangle
+ {
+ id: frameBottom
+ height: 124 * pt
+ anchors.top: buttonNext.bottom
+ anchors.topMargin: 24 * pt
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ color: "transparent"
+ }
+ }
+}
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..48334898d34a19c5858f115c7f95ede75b9ef7e9
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.4
+
+DapRecoveryWalletRightPanelForm
+{
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
similarity index 71%
rename from CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardRightPanelForm.ui.qml
rename to CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
index df6d80022e97df58aea22e1dbee409d03fa65f12..eb1524ce02e9a3f445ba9d61438d7e9b46e66cb5 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
@@ -1,5 +1,5 @@
import QtQuick 2.4
-import "../../"
+import "../../../"
DapAbstractRightPanel
{
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..e02fb3b000cf5dc2c42b37df820c322511ac4844
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.4
+
+DapTransactionHistoryRightPanelForm
+{
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanelForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..7ef5acddf2d8abb1f42f7265187b68ce692ad597
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanelForm.ui.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.4
+import "qrc:/widgets"
+import "../../../"
+
+DapAbstractRightPanel
+{
+ id: historyTransactionRighrPanel
+
+ property alias dapWidth: historyTransactionRighrPanel.width
+}
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index 35158bf204facfeebe2acb5e215dcf29a00003b5..d63a06e0ff7e75f85703a79116e54261ec4b5ea6 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit 35158bf204facfeebe2acb5e215dcf29a00003b5
+Subproject commit d63a06e0ff7e75f85703a79116e54261ec4b5ea6