Revert "Merge branch 'bug-2708' into 'master'"

This reverts merge request !54

CellFrameDashboardGUI/main.cpp

@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     app.setOrganizationDomain("demlabs.net");
     app.setApplicationName("CellFrame Dashboard");
     app.setWindowIcon(QIcon(":/res/icons/icon.ico"));
-
+    
     DapLogger dapLogger;
     /// TODO: The code is commented out at the time of developing the logging strategy in the project
 //#ifndef QT_DEBUG

CellFrameDashboardGUI/qml.qrc

 <RCC>
     <qresource prefix="/">
         <file>CellFrameDashboardGUI.conf</file>
-        <file>res/icons/ic_arrow_drop_down_dark_blue.png</file>
-        <file>res/icons/ic_arrow_drop_up_dark_blue.png</file>
         <file>res/cellframe-logo.svg</file>
         <file>res/Settings.json</file>
         <file>res/fonts/roboto_light.ttf</file>
@@ -45,6 +43,9 @@
         <file>screen/DapUiQmlScreen.qml</file>
         <file>screen/DapUiQmlScreenMainWindow.qml</file>
         <file>screen/DapUiQmlScreenMainWindowForm.ui.qml</file>
+        <file>screen/DapUiQmlWidgetStatusBarComboBox.qml</file>
+        <file>screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml</file>
+        <file>screen/DapUiQmlWidgetStatusBarContentItem.qml</file>
         <file>screen/main.qml</file>
         <file>screen/Console/DapUiQmlScreenConsoleForm.ui.qml</file>
         <file>screen/Console/DapUiQmlWidgetConsole.qml</file>
@@ -53,6 +54,7 @@
         <file>screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml</file>
         <file>screen/Dashboard/DapUiQmlScreenDashboard.qml</file>
         <file>screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml</file>
+        <file>screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml</file>
         <file>screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file>
         <file>screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file>
         <file>screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml</file>
@@ -78,6 +80,8 @@
         <file>screen/LastAction/DapUiQmlWidgetRightPanel.qml</file>
         <file>screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml</file>
         <file>screen/LastAction/DapUiQmlWidgetScreenDialogAddWallet.ui.qml</file>
+        <file>screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml</file>
+        <file>screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml</file>
         <file>screen/LastAction/DapRadioButton.qml</file>
         <file>screen/Log/DapUiQmlWidgetChainNodeLogs.qml</file>
         <file>screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml</file>
@@ -88,6 +92,8 @@
         <file>screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml</file>
         <file>screen/StatusBar/DapUiQmlWidgetStatusBar.qml</file>
         <file>screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml</file>
+        <file>screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml</file>
+        <file>screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml</file>
         <file>screen/VPN/DapUiQmlScreenVpn.qml</file>
         <file>screen/VPN/DapUiQmlScreenVpnForm.ui.qml</file>
         <file>screen/VPN/DapUiQmlWidgetSettingsVpn.qml</file>

CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml

+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtGraphicalEffects 1.0
+
+ComboBox {
+    property alias headerTextColor: headerText.color
+    property alias widthArrow: arrow.width
+    property alias heightArrow: arrow.height
+    property alias sourceArrow: arrow.source
+
+    id: customComboBox
+    width: 190 * pt
+    indicator: Image {
+        id: arrow
+        source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/ic_arrow_drop_down.png"
+        width: 24 * pt
+        height: 24 * pt
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.right
+        anchors.rightMargin: 16 * pt
+    }
+
+    background: Rectangle {
+        anchors.fill: parent
+        color: parent.popup.visible ? "#FFFFFF" : "transparent"
+        radius: 2 * pt
+    }
+
+    contentItem: Text {
+        id: headerText
+        anchors.fill: parent
+        anchors.leftMargin: 12 * pt
+        anchors.rightMargin: 48 * pt
+        anchors.topMargin: 0 * pt
+        text: parent.displayText
+        font.family: fontRobotoRegular.name
+        font.pixelSize: 14 * pt
+        color: parent.popup.visible ? "#332F49" : "#FFFFFF"
+        verticalAlignment: Text.AlignTop
+        elide: Text.ElideRight
+    }
+
+    popup: Popup {
+        y: parent.height - 1
+        width: parent.width + 1
+        implicitHeight: contentItem.implicitHeight
+        padding: 1
+
+        contentItem: ListView {
+            clip: true
+            implicitHeight: contentHeight
+            model: customComboBox.popup.visible ? customComboBox.delegateModel : null
+            currentIndex: customComboBox.highlightedIndex
+
+            ScrollIndicator.vertical: ScrollIndicator { }
+        }
+
+        background: Rectangle {
+            width: customComboBox.background.width
+
+            Rectangle {
+                id: contentCorner
+                anchors.fill: parent
+            }
+
+            DropShadow {
+                anchors.fill: parent
+                source: contentCorner
+                verticalOffset: 9 * pt
+                samples: 13 * pt
+                color: "#40000000"
+            }
+        }
+    }
+
+    DropShadow {
+        anchors.fill: parent
+        source: background
+        verticalOffset: 9 * pt
+        samples: 13 * pt
+        color: "#40000000"
+    }
+
+}

CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml

+import QtQuick 2.0
+import QtQuick.Controls 2.0
+
+ItemDelegate {
+    property string delegateContentText: ""
+
+    width: parent.width
+    height: 42 * pt
+    contentItem: DapUiQmlWidgetStatusBarContentItem {
+        anchors.fill: parent
+        anchors.topMargin: 8 * pt
+        anchors.leftMargin: 12 * pt
+        anchors.rightMargin: 16 * pt
+        verticalAlignment: Qt.AlignTop
+        text: delegateContentText
+        color: hovered ? "#FFFFFF" : "#332F49"
+    }
+
+    background: Rectangle {
+        anchors.fill: parent
+        anchors.bottomMargin: 10 * pt
+        color: hovered ? "#332F49" : "#FFFFFF"
+    }
+
+    highlighted: parent.highlightedIndex === index
+
+}

CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarContentItem.qml

+import QtQuick 2.0
+import QtQuick.Controls 2.0
+
+Text {
+    color: "#A7A7A7"
+    font.family: fontRobotoRegular.name
+    font.pixelSize: 14 * pt
+    elide: Text.ElideRight
+    verticalAlignment: Text.AlignVCenter
+}

CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml

 import QtQuick 2.0
 import QtQuick.Controls 2.0
-import "../../"
 
 Page {
-    ///Top panel in tab Exchange
-    Rectangle{
-        id:topPanelExchange
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.leftMargin: 24*pt
-        anchors.topMargin: 12*pt
-        anchors.rightMargin: 24*pt
-        height:42 * pt
-
-        ///Token ComboBox
-        Rectangle{
-            id:leftComboBox
-            anchors.top: topPanelExchange.top
-            anchors.left: topPanelExchange.left
-            width:112 * pt
-            height:parent.height
-
-            DapComboBox{
-                model: ListModel{
-                    id:сonversionList
-                    ListElement{text:"TKN1/NGD"}
-                    ListElement{text:"TKN2/NGD"}
-                    ListElement{text:"NGD/KLVN"}
-                    ListElement{text:"KLVN/USD"}
-                }
-                fontSizeComboBox: 16*pt
-                widthPopupComboBoxActive: 144 *pt
-                widthPopupComboBoxNormal: 112 *pt
-                sidePaddingActive: 16*pt
-                sidePaddingNormal: 0
-                x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
-            }
-
-        }
-
-        ///Time ComboBox
-        Rectangle{
-            id:rightComboBox
-            anchors.left: leftComboBox.right
-            anchors.leftMargin: 72*pt
-            anchors.top: topPanelExchange.top
-            width:100 * pt
-            height:parent.height
-            DapComboBox{
-                model: ListModel{
-                    ListElement{text:"1 minute"}
-                    ListElement{text:"5 minute"}
-                    ListElement{text:"15 minute"}
-                    ListElement{text:"30 minute"}
-                    ListElement{text:"1 hour"}
-                    ListElement{text:"4 hour"}
-                    ListElement{text:"12 hour"}
-                    ListElement{text:"24 hour"}
-                }
-                fontSizeComboBox: 14*pt
-                widthPopupComboBoxActive: 132 *pt
-                widthPopupComboBoxNormal: 100 *pt
-                sidePaddingActive: 16*pt
-                sidePaddingNormal: 0
-                x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
-            }
-        }
-
-        ///Value Last price
-        Rectangle{
-            id: lastPrice
-            height: parent.height
-            width: 150*pt
-            anchors.right: volume24.left
-            anchors.rightMargin: 30 * pt
 
-            Text{
-                anchors.left: lastPrice.left
-                anchors.bottom: value_lastPrice.top
-                anchors.bottomMargin: 6 * pt
-                color: "#757184"
-                font.pixelSize: 10 * pt
-                font.family: fontRobotoRegular.name
-                text: qsTr("Last price")
-
-            }
-            Text {
-                id: value_lastPrice
-                anchors.left: lastPrice.left
-                anchors.bottom: lastPrice.bottom
-                color: "#070023"
-                font.pixelSize: 12 * pt
-                font.family: fontRobotoRegular.name
-                text: qsTr("$ 10 807.35 NGD")
-            }
-            Text {
-                anchors.left: value_lastPrice.right
-                anchors.bottom: lastPrice.bottom
-                anchors.leftMargin: 6 * pt
-                color: "#6F9F00"
-                font.pixelSize: 10 * pt
-                font.family: fontRobotoRegular.name
-                text: qsTr("+3.59%")
-            }
-        }
-        ///Value 24h volume
-        Rectangle{
-            id: volume24
-
-            height: parent.height
-            width: 75*pt
-            anchors.right: topPanelExchange.right
-
-                Text{
-                    anchors.right: volume24.right
-                    anchors.bottom: value_valume24.top
-                    anchors.bottomMargin: 6 * pt
-                    color: "#757184"
-                    font.pixelSize: 10 * pt
-                    font.family: fontRobotoRegular.name
-                    text: qsTr("24h volume")
-
-                }
-                Text {
-                    id: value_valume24
-                    anchors.right: volume24.right
-                    anchors.bottom: volume24.bottom
-                    color: "#070023"
-                    font.pixelSize: 12 * pt
-                    font.family: fontRobotoRegular.name
-                    text: qsTr("9 800 TKN1")
-                }
-}
-    }
-   ///Left down panel
     Row {
         anchors.left: parent.left
         anchors.bottom: parent.bottom

CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml

 import QtQuick 2.0
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
-import "../../"
 import "../"
 
 DapUiQmlScreen {
@@ -89,45 +88,28 @@ DapUiQmlScreen {
     }
 
     Rectangle {
-           id: chooseSignatureTypeArea
-
-           height: 68 * pt
-           color: "#EDEFF2"
-           anchors.leftMargin: 1 * pt
-           anchors.left: parent.left
-           anchors.right: parent.right
-           anchors.top: chooseSignatureTypeTextArea.bottom
-
-           ///ComboBox right panel
-           Rectangle{
-               id:areaDapComboBoxRightPanel
-               anchors.fill: parent
-               anchors.leftMargin:  16*pt
-               anchors.rightMargin: 16*pt
-               anchors.topMargin:12*pt
-               anchors.bottomMargin: 12*pt
-               color: parent.color
-
-               DapComboBox{
-                   property Label fieldBalance: Label {}
-
-                   model: ListModel {
-                       id: signatureType
-                       ListElement {signatureName: "Dilithium"}
-                       ListElement {signatureName: "Bliss"}
-                       ListElement {signatureName: "Picnic"}
-                       ListElement {signatureName: "Tesla"}
-                   }
-                   normalColorText: "#070023"
-                   hilightColorText: "#FFFFFF"
-                   fontSizeComboBox: 16 * pt
-                   hilightColor: "#330F54"
-                   sidePaddingNormal: 20 * pt
-                   indicatorWidth: 20 * pt
-               }
-
-           }
-       }
+        id: chooseSignatureTypeArea
+        height: 68
+        color: "#F8F7FA"
+        anchors.leftMargin: 1
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: chooseSignatureTypeTextArea.bottom
+
+        DapUiQmlWidgetSignatureTypeComboBox {
+            id: comboBoxChooseSignatureType
+            width: 368
+            height: 20
+            anchors {
+                verticalCenter: chooseSignatureTypeArea.verticalCenter
+                fill: parent
+                topMargin: 24
+                bottomMargin: 24
+                leftMargin: 8
+                rightMargin: 32
+            }
+        }
+    }
 
     Rectangle {
         id: recoveryMethodTextArea
@@ -215,3 +197,10 @@ DapUiQmlScreen {
         }
     }
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
+

CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml

+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import "../"
+
+DapUiQmlWidgetStatusBarComboBox {
+
+    model: ListModel {
+        id: signatureType
+        ListElement {
+            signatureName: "Dilithium"
+        }
+        ListElement {
+            signatureName: "Bliss"
+        }
+        ListElement {
+            signatureName: "Picnic"
+        }
+        ListElement {
+            signatureName: "Tesla"
+        }
+    }
+
+    headerTextColor: "#070023"
+    widthArrow: 20 * pt
+    heightArrow: 20 * pt
+
+    font {
+        pointSize: 16
+        family: "Roboto"
+        styleName: "Normal"
+        weight: Font.Normal
+    }
+
+    currentIndex: 0
+    displayText: currentText
+
+    delegate: ItemDelegate {
+        width: parent.width
+        contentItem: DapUiQmlWidgetStatusBarContentItem {
+             text: signatureName
+             color: hovered ? "#FFFFFF" : "#070023"
+        }
+
+        background: Rectangle {
+            height: 32 * pt
+            color: hovered ? "#330F54" : "#FFFFFF"
+        }
+
+        highlighted: parent.highlightedIndex === index
+    }
+}

CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml

 import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
-import QtGraphicalEffects 1.0
-import QtQuick.Layouts 1.3
-import "../../"
+import QtQuick.Controls 2.0
 
 Rectangle {
     Rectangle {
@@ -28,22 +24,11 @@ Rectangle {
                 color: "#A7A7A7"
             }
 
-            DapComboBox {
+            DapUiQmlWidgetStatusBarComboBoxWallet {
                 id: comboboxWallet
-                width: 190*pt
                 anchors.top: parent.top
                 anchors.bottom: parent.bottom
-
-                property Label fieldBalance: Label {}
-                model: dapWalletModel.wallets
-
-                indicatorImageNormal:"qrc:/res/icons/ic_arrow_drop_down.png"
-                indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
-                sidePaddingNormal:12 * pt
-                normalColorText:"#FFFFFF"
-                hilightColorTopText:"#332F49"
-                hilightColor: "#332F49"
-                fontSizeComboBox: 14*px
+                fieldBalance: fieldWalletBalance
             }
 
             Label {

CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml

+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import "../"
+
+DapUiQmlWidgetStatusBarComboBoxWalletForm {
+    property Label fieldBalance: Label {}
+    model: dapWalletModel.wallets
+
+    delegate: DapUiQmlWidgetStatusBarComboBoxDelegate {
+        delegateContentText: modelData
+    }
+
+    onCurrentTextChanged: {
+        dapWalletFilterModel.setWalletFilter(currentText);
+
+    }
+}

CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml

+import QtQuick 2.0
+import "../"
+
+DapUiQmlWidgetStatusBarComboBox {
+
+}

libdap @ 483286aa

-Subproject commit 1c0614797a3a2a2f4c179630025600e177637a65
+Subproject commit 483286aa342741bc1cce8f10a880891faec1b01c

libdap-qt-ui-qml @ 257d070f

-Subproject commit 8dfd465e991656dca083c0fd3a0ff5825d61fe86
+Subproject commit 257d070fbe0228bd5c6c6be433c48160eaaefb28