Skip to content
Snippets Groups Projects
Commit 6d710834 authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

[+] Added a screen design History.

parent 1773c58a
No related branches found
No related tags found
1 merge request!109features-3092
Pipeline #1887 failed with stage
Stage: build
    in 12 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 538 additions and 13 deletions
    CellFrameDashboardGUI/qml.qrc
    + 1
    − 0
    View file @ 6d710834
    ......@@ -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>
    CellFrameDashboardGUI/res/icons/ic_search.png 0 → 100644
    + 0
    − 0
    View file @ 6d710834
    CellFrameDashboardGUI/res/icons/ic_search.png

    754 B

    CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
    + 0
    − 1
    View file @ 6d710834
    ......@@ -68,7 +68,6 @@ DapDashboardScreenForm
    font.weight: Font.Normal
    color: "#908D9D"
    text: address
    elide: Text.ElideRight
    }
    ......
    CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
    + 2
    − 4
    View file @ 6d710834
    ......@@ -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
    ......
    CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
    + 1
    − 1
    View file @ 6d710834
    ......@@ -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
    ......
    CellFrameDashboardGUI/screen/desktop/History/DapHistoryRightPanel.qml
    + 3
    − 1
    View file @ 6d710834
    import QtQuick 2.4
    DapHistoryRightPanelForm {
    DapHistoryRightPanelForm
    {
    }
    CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreen.qml
    + 252
    − 1
    View file @ 6d710834
    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
    }
    }
    CellFrameDashboardGUI/screen/desktop/History/DapHistoryScreenForm.ui.qml
    + 14
    − 1
    View file @ 6d710834
    ......@@ -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
    }
    }
    CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml
    + 3
    − 1
    View file @ 6d710834
    import QtQuick 2.4
    DapHistoryTabForm {
    DapHistoryTabForm
    {
    }
    CellFrameDashboardGUI/screen/desktop/History/DapHistoryTabForm.ui.qml
    + 5
    − 1
    View file @ 6d710834
    ......@@ -10,7 +10,11 @@ DapAbstractTab
    dapScreen: DapHistoryScreen { }
    dapRightPanel: DapHistoryRightPanel { }
    dapRightPanel:
    DapHistoryRightPanel
    {
    visible: false
    }
    }
    /*##^## Designer {
    ......
    CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanel.qml
    + 3
    − 1
    View file @ 6d710834
    import QtQuick 2.4
    DapHistoryTopPanelForm {
    DapHistoryTopPanelForm
    {
    }
    CellFrameDashboardGUI/screen/desktop/History/DapHistoryTopPanelForm.ui.qml
    + 253
    − 0
    View file @ 6d710834
    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"
    }
    }
    }
    libdap-qt-ui-qml @ ceadb4ef
    Compare 103c3d10...ceadb4ef
    Subproject commit 103c3d107cf730c8158368d20e339647cc568659
    Subproject commit ceadb4ef28ca0496518497db804fdeb638111650
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment