diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 5bc6b7bf37beed7369a9a617af4ff19f64540e1b..8dffd0540bc1d796e7ee94ceae9c3dc4b74b9af5 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -144,5 +144,6 @@
<file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml</file>
<file>res/icons/ic_cellframe.png</file>
+ <file>res/icons/ic_search.png</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/res/icons/ic_search.png b/CellFrameDashboardGUI/res/icons/ic_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..b13ae9c16acda11d018d918592defe6d671fc3e3
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_search.png differ
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
index 6fed35f286fa51eb902349e046cbf4df95ebab32..4ebbe01c0052ac7677fe6c162bbb87050aeb728e 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
@@ -68,7 +68,6 @@ DapDashboardScreenForm
font.weight: Font.Normal
color: "#908D9D"
text: address
- elide: Text.ElideRight
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
index 15368001fc33290bc95f5d45925c2a5776e99f84..684c2c66c6732f891618be05894b5fe9bd764370 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
@@ -8,8 +8,6 @@ DapAbstractTopPanel
property alias dapAddWalletButton: addWalletButton
property alias dapComboboxWallet: comboboxWallet
- anchors.fill: parent
-
// Static text "Wallet"
Label
{
@@ -38,8 +36,8 @@ DapAbstractTopPanel
{
id: comboboxWallet
model: dapModelWallets
- comboBoxTextRole: "name"
- mainLineText: "all wallets"
+ comboBoxTextRole: ["name"]
+ mainLineText: ["all wallets"]
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
index 6956beae2b6d14d2cade813c6d440f4b00d8f575..abd372db3fae7935ce4054646dfea2a35ed9752e 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
@@ -109,7 +109,7 @@ DapAbstractRightPanel
id: comboboxToken
anchors.left: parent.left
anchors.right: parent.right
- comboBoxTextRole: "name"
+ comboBoxTextRole: ["name"]
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryRightPanel.qml
index 828b13846c26b0b5f3032ffdb6813caae7b61e0f..85821eccdb5401da8edf71c6bc4d5e2c8a11211a 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryRightPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryRightPanel.qml
@@ -1,4 +1,6 @@
import QtQuick 2.4
-DapHistoryRightPanelForm {
+DapHistoryRightPanelForm
+{
+
}
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml
index 439e389ec252946df3be2dea3fa396bd7cb98758..daeb6ba5a53254595a73b09985bd3924874857a6 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml
@@ -1,4 +1,255 @@
import QtQuick 2.4
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import "qrc:/widgets"
-DapHistoryScreenForm {
+DapHistoryScreenForm
+{
+ id: historyScreen
+ ListModel
+ {
+ id: testModel
+ ListElement
+ {
+ date: "6, february"
+ token: "KELT"
+ status: "Sent"
+ amount: "165489878556"
+ }
+ ListElement
+ {
+ date: "6, february"
+ token: "DAG"
+ status: "Received"
+ amount: "333559878556"
+ }
+ ListElement
+ {
+ date: "5, february"
+ token: "KELT"
+ status: "Error"
+ amount: "165489878556"
+ }
+ ListElement
+ {
+ date: "5, february"
+ token: "DAG"
+ status: "Panding"
+ amount: "333559878556"
+ }
+ ListElement
+ {
+ date: "7, february"
+ token: "DAG"
+ status: "Received"
+ amount: "333559878556"
+ }
+ ListElement
+ {
+ date: "3, february"
+ token: "KELT"
+ status: "Error"
+ amount: "165489878556"
+ }
+ ListElement
+ {
+ date: "5, february"
+ token: "DAG"
+ status: "Panding"
+ amount: "333559878556"
+ }
+ }
+
+ Component
+ {
+ id: delegateDate
+ Rectangle
+ {
+ width: parent.width
+ height: 30 * pt
+ color: "#908D9D"
+
+ Text
+ {
+ anchors.fill: parent
+ verticalAlignment: Qt.AlignVCenter
+ anchors.leftMargin: 16 * pt
+ color: "#FFFFFF"
+ text: section
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ font.pixelSize: 12 * pt
+ }
+ }
+ }
+
+
+ Component
+ {
+ id: delegateToken
+ Column
+ {
+ width: parent.width
+ Rectangle
+ {
+ id: frameContentToken
+ height: 66 * pt
+ width: parent.width
+ color: "transparent"
+
+ // Icon token
+ Rectangle
+ {
+ id: frameIconToken
+ width: 26 * pt
+ height: 26 * pt
+ anchors.left: parent.left
+ anchors.leftMargin: 30 * pt
+ anchors.verticalCenter: parent.verticalCenter
+
+ Image
+ {
+ id: iconToken
+ anchors.fill: parent
+ source: "qrc:/res/icons/ic_cellframe.png"
+ }
+ }
+
+ // Token name
+ Rectangle
+ {
+ id: frameTokenName
+ width: 246 * pt
+ height: textTokenName.contentHeight
+ anchors.left: frameIconToken.right
+ anchors.leftMargin: 20 * pt
+ anchors.verticalCenter: parent.verticalCenter
+
+ Text
+ {
+ id: textTokenName
+ anchors.fill: parent
+ text: token
+ color: "#070023"
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ font.pixelSize: 16 * pt
+ Layout.alignment: Qt.AlignLeft
+ }
+ }
+
+ // Wallet number
+ Rectangle
+ {
+ id: frameNumberWallet
+ anchors.left: frameTokenName.right
+ anchors.leftMargin: 20 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ }
+
+ // Status
+ Rectangle
+ {
+ id: frameStatus
+ width: 100 * pt
+ height: textSatus.contentHeight
+ anchors.left: frameNumberWallet.right
+ anchors.leftMargin: 20 * pt
+ anchors.right: frameBalance.left
+ anchors.rightMargin: 20 * pt
+ anchors.verticalCenter: parent.verticalCenter
+
+ Text
+ {
+ id: textSatus
+ anchors.fill: parent
+ text: status
+ color: status === "Sent" ? "#4B8BEB" : status === "Error" ? "#EB4D4B" : status === "Received" ? "#6F9F00" : "#FFBC00"
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ font.pixelSize: 14 * pt
+ }
+ }
+
+ // Balance
+ Rectangle
+ {
+ id: frameBalance
+ width: 264 * pt
+ height: parent.height
+ anchors.right: parent.right
+ anchors.rightMargin: 20 * pt
+ anchors.verticalCenter: parent.verticalCenter
+
+ ColumnLayout
+ {
+ anchors.right: parent.right
+ anchors.verticalCenter: parent.verticalCenter
+
+ // Token currency
+ Text
+ {
+ id: lblAmount
+ width: parent.width
+ property string sign: (status === "Sent" || status === "Pending") ? "- " : "+ "
+ text: sign + amount + " " + token
+ color: "#070023"
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ font.pixelSize: 16 * pt
+ Layout.alignment: Qt.AlignRight
+ }
+
+ // Equivalent currency
+ Text
+ {
+ id: lblEquivalent
+ width: parent.width
+ property string sign: (status === "Sent" || status === "Pending") ? "- " : "+ "
+ text: sign + "$ " + 0.5 * amount + " USD"
+ color: "#C2CAD1"
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ font.pixelSize: 12 * pt
+ Layout.alignment: Qt.AlignRight
+ }
+ }
+ }
+ }
+ // Underline
+ Rectangle
+ {
+ width: parent.width
+ height: 1
+ color: "#C2CAD1"
+ }
+ }
+
+ }
+
+
+ // Address wallet tip
+ Label
+ {
+ id: lblAddressWallet
+ padding: 3 * pt
+ color: "#4F5357"
+ font.family: "Regular"
+ font.pixelSize: 14 * pt
+ background:
+ Rectangle
+ {
+ anchors.fill: parent
+ color: "#FFFFFF";
+ border.color: "#80000000"
+ border.width: 1 * pt
+ }
+
+ visible: false
+ }
}
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml
index 72d00995d6cd283a1367386df1853fdd19bd8634..19eadafdd6413d48645dd0f7085d9603214d4181 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml
@@ -3,5 +3,18 @@ import "../../"
DapAbstractScreen
{
- dapFrame.color: "blue"
+ ListView
+ {
+ id: dapListViewHistory
+ anchors.fill: parent
+
+ anchors.topMargin: 24 * pt
+ anchors.leftMargin: 24 * pt
+ anchors.rightMargin: 24 * pt
+ model: testModel
+ delegate: delegateToken
+ section.property: "date"
+ section.criteria: ViewSection.FullString
+ section.delegate: delegateDate
+ }
}
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml
index 9db92f6ee038df62f9108933a0dabc1fa721df45..2e3b182a19002c415a6c61b8d9564271b6caa957 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml
@@ -1,4 +1,6 @@
import QtQuick 2.4
-DapHistoryTabForm {
+DapHistoryTabForm
+{
+
}
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTabForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTabForm.ui.qml
index 0dfa21fa6c512ee49a72d115ea84b7c38ccea5e2..32ec297978efbd61e131da08d9729c8250931759 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTabForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTabForm.ui.qml
@@ -10,7 +10,11 @@ DapAbstractTab
dapScreen: DapHistoryScreen { }
- dapRightPanel: DapHistoryRightPanel { }
+ dapRightPanel:
+ DapHistoryRightPanel
+ {
+ visible: false
+ }
}
/*##^## Designer {
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanel.qml
index e585de8eb06059446a3244b54ddd48c5e3ad2301..68a4f5b7f2fb6d3143330248460f12850b92aaf1 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanel.qml
@@ -1,4 +1,6 @@
import QtQuick 2.4
-DapHistoryTopPanelForm {
+DapHistoryTopPanelForm
+{
+
}
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml
index 893e3fab82ffd610d27655715f432e90ac0f8088..00b02a728cbda654e5db05c6cc9ad90b6ef75ad6 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml
@@ -1,7 +1,260 @@
import QtQuick 2.4
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Layouts 1.3
+import "qrc:/widgets"
import "../../"
DapAbstractTopPanelForm
{
+ // Frame icon search
+ Rectangle
+ {
+ id: frameIconSearch
+ anchors.left: parent.left
+ anchors.leftMargin: 16 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ height: 15 * pt
+ width: 15 * pt
+ color: "transparent"
+ Image
+ {
+ id: iconSearch
+ anchors.fill: parent
+ source: "qrc:/res/icons/ic_search.png"
+ }
+ }
+ // Wallet selection combo box
+ Rectangle
+ {
+ id: frameTextFieldSearch
+ anchors.left: frameIconSearch.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 10 * pt
+ width: 252 * pt
+ height: layoutSearch.height
+ color: "transparent"
+ ColumnLayout
+ {
+ id: layoutSearch
+ width: parent.width
+ anchors.verticalCenter: parent.verticalCenter
+ TextField
+ {
+ id: textFieldSearch
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.leftMargin: 10 * pt
+ anchors.right: parent.right
+ placeholderText: qsTr("Search")
+ font.pixelSize: 12 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ style:
+ TextFieldStyle
+ {
+ textColor: "#ACAAB5"
+ placeholderTextColor: "#ACAAB5"
+ background:
+ Rectangle
+ {
+ border.width: 0
+ color: "transparent"
+ }
+ }
+ }
+ Rectangle
+ {
+ anchors.top: textFieldSearch.bottom
+ width: parent.width
+ height: 1 * pt
+ color: "#59556C"
+ }
+ }
+ }
+
+ // Static text "Period"
+ Label
+ {
+ id: textPeriod
+ text: qsTr("Period")
+ anchors.left: frameTextFieldSearch.right
+ anchors.leftMargin: 75 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+
+ // Period selection combo box
+ Rectangle
+ {
+ id: frameComboBoxPeriod
+
+ anchors.left: textPeriod.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 26 * pt
+ width: 108 * pt
+ color: "transparent"
+ DapComboBox
+ {
+ id: comboboxPeriod
+ comboBoxTextRole: ["name"]
+ mainLineText: ["all time"]
+ indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal: 0 * pt
+ sidePaddingActive: 16 * pt
+ normalColorText: "#070023"
+ hilightColorText: "#FFFFFF"
+ normalColorTopText: "#FFFFFF"
+ hilightColorTopText: "#070023"
+ hilightColor: "#330F54"
+ normalTopColor: "#070023"
+ widthPopupComboBoxNormal: 108 * pt
+ widthPopupComboBoxActive: 140 * pt
+ heightComboBoxNormal: 24 * pt
+ heightComboBoxActive: 44 * pt
+ bottomIntervalListElement: 8 * pt
+ topEffect: false
+ x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
+ normalColor: "#FFFFFF"
+ hilightTopColor: normalColor
+ paddingTopItemDelegate: 8 * pt
+ heightListElement: 32 * pt
+ intervalListElement: 10 * pt
+ indicatorWidth: 24 * pt
+ indicatorHeight: indicatorWidth
+ indicatorLeftInterval: 8 * pt
+ colorTopNormalDropShadow: "#00000000"
+ colorDropShadow: "#40ABABAB"
+ fontComboBox.pixelSize: 14 * pt
+ fontComboBox.family: "Roboto"
+ }
+ }
+
+ // Static text "Wallet"
+ Label
+ {
+ id: textHeaderWallet
+ text: qsTr("Wallet")
+ anchors.left: frameComboBoxPeriod.right
+ anchors.leftMargin: 75 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+
+ // Wallet selection combo box
+ Rectangle
+ {
+ id: frameComboBoxWallet
+
+ anchors.left: textHeaderWallet.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 30 * pt
+ width: 148 * pt
+ color: "transparent"
+
+ DapComboBox
+ {
+ id: comboboxWallet
+ model: dapModelWallets
+ comboBoxTextRole: ["name"]
+ mainLineText: ["all wallets"]
+ indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal: 0 * pt
+ sidePaddingActive: 16 * 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
+ x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
+ normalColor: "#FFFFFF"
+ hilightTopColor: normalColor
+ paddingTopItemDelegate: 8 * pt
+ heightListElement: 32 * pt
+ intervalListElement: 10 * pt
+ indicatorWidth: 24 * pt
+ indicatorHeight: indicatorWidth
+ indicatorLeftInterval: 8 * pt
+ colorTopNormalDropShadow: "#00000000"
+ colorDropShadow: "#40ABABAB"
+ fontComboBox.pixelSize: 14 * pt
+ fontComboBox.family: "Roboto"
+ }
+ }
+
+ // Static text "Status"
+ Label
+ {
+ id: textHeaderStatus
+ text: qsTr("Status")
+ anchors.left: frameComboBoxWallet.right
+ anchors.leftMargin: 75 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+
+ // Stats selection combo box
+ Rectangle
+ {
+ id: frameComboBoxStatus
+
+ anchors.left: textHeaderStatus.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 26 * pt
+ width: 120 * pt
+ color: "transparent"
+
+ DapComboBox
+ {
+ id: comboboxStatus
+ comboBoxTextRole: ["name"]
+ mainLineText: ["all status"]
+ indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal: 0 * pt
+ sidePaddingActive: 16 * pt
+ normalColorText: "#070023"
+ hilightColorText: "#FFFFFF"
+ normalColorTopText: "#FFFFFF"
+ hilightColorTopText: "#070023"
+ hilightColor: "#330F54"
+ normalTopColor: "#070023"
+ widthPopupComboBoxNormal: 120 * pt
+ widthPopupComboBoxActive: 152 * pt
+ heightComboBoxNormal: 24 * pt
+ heightComboBoxActive: 44 * pt
+ bottomIntervalListElement: 8 * pt
+ topEffect: false
+ x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
+ normalColor: "#FFFFFF"
+ hilightTopColor: normalColor
+ paddingTopItemDelegate: 8 * pt
+ heightListElement: 32 * pt
+ intervalListElement: 10 * pt
+ indicatorWidth: 24 * pt
+ indicatorHeight: indicatorWidth
+ indicatorLeftInterval: 8 * pt
+ colorTopNormalDropShadow: "#00000000"
+ colorDropShadow: "#40ABABAB"
+ fontComboBox.pixelSize: 14 * pt
+ fontComboBox.family: "Roboto"
+ }
+ }
}
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index 103c3d107cf730c8158368d20e339647cc568659..ceadb4ef28ca0496518497db804fdeb638111650 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit 103c3d107cf730c8158368d20e339647cc568659
+Subproject commit ceadb4ef28ca0496518497db804fdeb638111650