diff --git a/CellFrameDashboardGUI/DapScreenHistoryModel.cpp b/CellFrameDashboardGUI/DapScreenHistoryModel.cpp
index 2e8762934555624a0837f8f8bb94c8c767baaeea..428b272bc68e8c4d53c13910d48149a3387ace60 100644
--- a/CellFrameDashboardGUI/DapScreenHistoryModel.cpp
+++ b/CellFrameDashboardGUI/DapScreenHistoryModel.cpp
@@ -99,6 +99,8 @@ QVariant DapScreenHistoryModel::data(const QModelIndex &index, int role) const
QDateTime currentTime = QDateTime::currentDateTime();
QDateTime itemDate = m_elementList.at(index.row()).Date;
if(currentTime.date() == itemDate.date()) return QString("Today");
+ else if(currentTime.daysTo(itemDate) == -1) return QString("Yesterday");
+ else if(currentTime.date().year() < itemDate.date().year()) return itemDate.toString(MASK_FOR_MODEL_WITH_YEAR);
return itemDate.toString(MASK_FOR_MODEL);
}
case DisplayNameTokenRole: return m_elementList.at(index.row()).TokenName;
diff --git a/CellFrameDashboardGUI/DapScreenHistoryModel.h b/CellFrameDashboardGUI/DapScreenHistoryModel.h
index 5df298d2c73bdc75b83623842599fa406b74371c..cb1b833a58fb06aa47d0e8923ae0e5b839f614fe 100644
--- a/CellFrameDashboardGUI/DapScreenHistoryModel.h
+++ b/CellFrameDashboardGUI/DapScreenHistoryModel.h
@@ -10,7 +10,8 @@
#include "DapHistoryType.h"
#include "DapChainConvertor.h"
-#define MASK_FOR_MODEL QString("MMMM, dd")
+#define MASK_FOR_MODEL QString("MMMM, d")
+#define MASK_FOR_MODEL_WITH_YEAR QString("MMMM, d, yyyy")
class DapScreenHistoryModel : public QAbstractListModel
{
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png b/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png
deleted file mode 100644
index f13e0fe2fc2b6f13a405c8c3b00f2a198896a204..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark.png b/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark.png
deleted file mode 100644
index f77b306db21a7c6b369f053a3238326bb5ee2cd6..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark_hover.png b/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark_hover.png
deleted file mode 100644
index 1e5eefb36de77731b84c7e1519880c1582b6c1b0..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark_hover.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/main.cpp b/CellFrameDashboardGUI/main.cpp
index 942af0aef38cbcc1f7a0c536dfb3170244940b4d..5551f314584da2b900c747d295db3cff93dd3ed7 100644
--- a/CellFrameDashboardGUI/main.cpp
+++ b/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
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 5993bd3449c19e40bdabf74cee07a0dcfe0ca7a6..0eea336228eea0018f352218e666c1b01f09ccae 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -1,6 +1,8 @@
<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>
@@ -51,7 +53,6 @@
<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>
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ac87aaa588bca2ae4b208cab2e93b3606f7b1e3
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fe34c8940c90afcecbe24eefd9a9db045be19fb
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png differ
diff --git a/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
index 0bd82d2d613ea0a26f0b18c50afa85d1ca572b17..80ba4c1e9dda6a762ea6758420b9f4f92b49588a 100644
--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.13
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
import QtQuick.Controls 1.4
import "../"
diff --git a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
index 9ecd40b1c0a91863d13099c374fd12df7df7b6c7..7212aea3df94b45996d3a7e5374b037e353c00db 100644
--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.13
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
Rectangle {
property alias textAreaCmdHistory: txtCommand
diff --git a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
index 1b3ac691dd07cd3d8da0550e27978bac1292eacf..11e70fdd7840145da7e339148a43c565bd03f8e7 100644
--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
@@ -1,7 +1,3 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.13
-
DapUiQmlWidgetConsole {
textAreaCmdHistory.color: "#707070"
textAreaCmdHistory.font.family: "Roboto"
diff --git a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
index 9a54cf094185d62b1d7b50a43d80abf22dc1c110..17e8f93d98517b6cf18faa45e99608d5503f2a10 100644
--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
@@ -1,6 +1,5 @@
import QtQuick 2.0
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.13
+import QtQuick.Layouts 1.0
Component {
ColumnLayout {
diff --git a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
index d59b10cbf67f751d8cf8f55c7f13a5ea84409e8e..fb91d3c759d23cde06ce5c2fc2dbe4a9e2806bc3 100644
--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
@@ -1,6 +1,5 @@
import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.13
+import QtQuick.Controls 2.0
import "../LastAction"
DapUiQmlWidgetLastActions {
diff --git a/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml b/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
index ad714740099b3d5169997e49c13d31800bcff8f5..455b8755ccb3679e3f4d73585be9cffa19cc7592 100644
--- a/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick 2.0
import "LastAction"
Rectangle {
diff --git a/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
index a1ab023fc352024fc799a083ddb8978003627cd5..a6a212e8d85c88a3eaedc62d39631e9c140ba92c 100644
--- a/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick 2.0
import QtQuick.Controls 1.4
DapUiQmlScreenMainWindowForm {
diff --git a/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
index 7858fad9b66d9b28c6ce193a529fa8f43eecb8e9..fefed83756ee79698c3ccb54fd451a3f8c68fa3e 100644
--- a/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.0
+import QtQuick.Controls 2.0
import "./StatusBar"
import "./LastAction"
diff --git a/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml b/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
index d470646efc6f1f4b8a9a444dcf72767a5c9dd0ce..aceff54ef2e5e24cb3ac7c5b789d5fcbd5466f69 100644
--- a/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
+++ b/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
@@ -1,9 +1,6 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import CellFrameDashboard 1.0
-import QtQml 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
import "../"
DapUiQmlScreen {
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
index 886f88e9ba2b1f4fccba3f1def00eaffaad81171..ef5bb59b8eacc9fed794355edfa00916237934e6 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
@@ -1,10 +1,140 @@
-import QtQuick 2.12
-import QtQml 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
+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
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml
index fef680a80689e2c520e8aea2af322b9a714b1b71..f80eacb5749526abee545f6cdfe3b74725a07a83 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick 2.0
+import QtQuick.Controls 2.0
Page {
id: dapUiQmlWidgetChainExchanges
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
index d85a8a71cf3b9adecae3c3825ec3c580656ff263..5ef9c277d0322d9fcff6eeaf5a7a33530c7d2022 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.12
-import QtQml 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
Button {
property alias buttonFont: buttonText.font.family
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
index be2e895fc8157631d9e83a19ca3d80c9a27579ef..1012b953e45edd89921123e52712a35ccbdf32a7 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.12
-import QtQml 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
Item {
property string contentFont: ""
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml
index 0f23637175f6f3c6557015c9d25a9f9011f3ff07..7a50232f592b70bcdd3996a08709b597918c6f10 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.12
-import QtQml 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
Item {
property alias titleOrder: orderTitle.orderText
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
index a90eb4096a863a238ba3cd91048decb89f341133..9a2214ba6830b855139690f417ee5c103a85cfa2 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.12
-import QtQml 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
Item {
property alias orderText: textOrder.text
diff --git a/CellFrameDashboardGUI/screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml b/CellFrameDashboardGUI/screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml
index a32806736472840c0d238087938f21feb7ed15dc..7a539b1f1571bff36d23097df4e7f57c38043df7 100644
--- a/CellFrameDashboardGUI/screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml
+++ b/CellFrameDashboardGUI/screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.2
-import QtQuick.Dialogs 1.2
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Dialogs 1.0
+import QtQuick.Layouts 1.0
import NodeNetworkExplorer 1.0
Page {
diff --git a/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistory.qml b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistory.qml
index 7882a45eb782960dfb11d8e37ce98df8df64ea5a..ca52da30f07fa93d754f56c0258a34c302b158bd 100644
--- a/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistory.qml
+++ b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistory.qml
@@ -1,8 +1,6 @@
-import QtQuick 2.9
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
-import DapTransactionHistory 1.0
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
DapUiQmlScreenHistoryForm {
id: dapUiQmlScreenHistory
diff --git a/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistoryForm.ui.qml b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistoryForm.ui.qml
index 91671e853fa742e64f637f22e47deeb4bf9681fb..66a634150d0e4880ba76169cf1beab3397441a18 100644
--- a/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistoryForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistoryForm.ui.qml
@@ -1,10 +1,6 @@
-import QtQuick 2.9
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
-import DapTransactionHistory 1.0
-import "../"
+import QtQuick 2.0
+import "../"
DapUiQmlScreen {
ListView {
id: dapListView
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
index d091ab1c8439e1398b1d7df6b63bb34fd21d2a92..de8e3fd1e1492e66faf34cf7fe9641a6422398cd 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.1
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
import "../"
DapUiQmlScreen {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
index 5004ee2bf0ac87d5ba5d4471c000bb60b1c4e33c..acbde1d7e0c73af38198fb1a30e0bc60b403e0de 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
@@ -1,6 +1,6 @@
import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
Rectangle {
property alias pressedNextButton: nextButton.pressed
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
index 2b86a29f2b199fdb2ec1f564516f9a2611de9644..6a9f2951d84c616a7a61b7bede92869340dd3e70 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
@@ -1,5 +1,4 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick 2.0
DapUiQmlScreenDialogAddWalletForm {
id: dialogAddWallet
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index e764661472cb13b29a059c97aba91ca59ff60f30..f10c8afe1bb55c56ec521a141301f95eb3636ad6 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -1,6 +1,7 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.1
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
+import "../../"
import "../"
DapUiQmlScreen {
@@ -88,12 +89,50 @@ DapUiQmlScreen {
Rectangle {
id: chooseSignatureTypeArea
+
height: 68 * pt
- color: "#F8F7FA"
+ 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
+ }
+ }
}
Rectangle {
@@ -188,4 +227,3 @@ Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
-
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
index 3bb7c7ba9fd682c179271f59fbf03a4fd07746ba..86d8f1f6ac39ec4193c387099b40387beab827c2 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
@@ -1,6 +1,5 @@
import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts 1.0
import "../"
DapUiQmlScreen {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreated.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreated.qml
index e336476f69312a539cf308f26bdaedecdd33d1a5..4d63a96cd7af1f0456a14cca762991a2c46add20 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreated.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreated.qml
@@ -1,4 +1,3 @@
-import QtQuick 2.0
DapUiQmlWalletCreatedForm {
buttonDone.onClicked: {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
index 1916866f93a64f856f87b9c18c47d0df363c8a63..e57fd327b1d9d48024dfccdf62cfed3af87f6967 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
@@ -1,6 +1,5 @@
import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0
import "../"
DapUiQmlScreen {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActions.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActions.qml
index 57853a3aa5ed1ce052c417880aa16d51e9c77954..ad20a2e62db3f0565b82415a6a23052f36b8c544 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActions.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActions.qml
@@ -1,9 +1,6 @@
-import QtQuick 2.9
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
-
-import DapTransactionHistory 1.0
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
DapUiQmlWidgetLastActionsForm {
@@ -48,3 +45,6 @@ DapUiQmlWidgetLastActionsForm {
}
}
}
+
+
+
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml
index 56694c6f41dc0ca2e177d20ab3db5d31cc0b4ae9..6e27cba5f79be254e598b99643e4b72d4652cf17 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.9
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
Item {
id: buttonScroll
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml
index b6c9f37df3005285cc785497a34dd5da1dda3417..139d9a51fee5ee84747005d6107ab547ef831de6 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.9
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
Component {
Rectangle {
@@ -10,55 +9,52 @@ Component {
height: 50 * pt
color: "transparent"
- Rectangle {
- id: dapData
- width: childrenRect.width
- height: childrenRect.height
- Layout.alignment: Qt.AlignVCenter
- anchors.left: dapContentDelegate.left
+ RowLayout {
+ anchors.fill: parent
+ anchors.rightMargin: 20 * pt
anchors.leftMargin: 16 * pt
- anchors.top: parent.top
- anchors.topMargin: 13
- Column {
- anchors.fill: parent
+ ColumnLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
spacing: 2
Text {
+ Layout.fillWidth: true
text: tokenName
- color: "#5F5F63"
- font.family: "Roboto Regular"
+ color: "#3E3853"
+ font.family: fontRobotoRegular.name
font.pixelSize: 14 * pt
+ elide: Text.ElideRight
}
Text {
+ Layout.fillWidth: true
text: txStatus
- color: "#A7A7A7"
- font.family: "Roboto"
+ color: "#757184"
+ font.family: fontRobotoRegular.name
font.pixelSize: 12 * pt
}
}
+
+ Text {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+ horizontalAlignment: Qt.AlignRight
+ verticalAlignment: Qt.AlignVCenter
+ color: "#3E3853"
+ text: cryptocurrency;
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ }
}
- Text {
- anchors.left: dapData.right
- anchors.top: parent.top
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- anchors.rightMargin: 20 * pt
- horizontalAlignment: Qt.AlignRight
- verticalAlignment: Qt.AlignVCenter
- color: "#505559"
- text: cryptocurrency;
- font.family: "Roboto"
- font.pixelSize: 14 * pt
- }
Rectangle {
width: parent.width
- height: 1 * pt
- color: "#C7C9CC"
+ height: 1
+ color: "#E3E2E6"
anchors.bottom: parent.bottom
}
}
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
index 7648b3a8cefb5f12585e52c214eccafc46a4daee..e229e22b23099654cdc0c1af97075df7e6f298bc 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.0
Rectangle {
color: "transparent"
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml
index a8a3b4b957687faa2cde7e93284bf8da78b8c0cd..404fc15780e5ffd8b5c8ce2129e4719dbf282e1e 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.9
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
Rectangle {
height: 36 * pt
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml
index 6ea635c49f0a9b3a23f3f3e6f0b4e18a1ba1b930..f727800ceb1d74b1f08dec140f32cb1d7106ca19 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.9
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
Rectangle {
color: "#757184"
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanel.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanel.qml
index 8169b7b84e59d2ac450307732050b75b26857448..3df84643164c853bbd64c0bb48f4536f7e05ef2f 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanel.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanel.qml
@@ -1,4 +1,3 @@
-import QtQuick 2.4
DapUiQmlWidgetRightPanelForm {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
index 27a6895a22036f5606c4365771adc66e5ba95d7e..809cebb4d5b0dc287a6d19f92b1185a97673b17e 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.13
+import QtQuick 2.0
+import QtQuick.Controls 2.0
Rectangle {
id: rightPanel
diff --git a/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogs.qml b/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogs.qml
index 5a2d7bdb21d48f2152ac83dd1e417ca33d8e5ba8..3f17469031870a6ef6ecc992b08708f9e23bb367 100644
--- a/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogs.qml
+++ b/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogs.qml
@@ -1,6 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 1.4
-import CellFrameDashboard 1.0
+import QtQuick 2.6
+import QtQuick.Controls 2.0
DapUiQmlWidgetChainNodeLogsForm {
id: dapQmlWidgetChainNodeLogs
diff --git a/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml b/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml
index 3620bae882f94039297bae73af51a46d8c4752ed..3e6150702825c04e9f66928026d4bd115d93fd4b 100644
--- a/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.11
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-import CellFrameDashboard 1.0
+import QtQuick 2.0
+import QtQuick.Controls 2.0
Page {
id: dapUiQmlWidgetChainNodeLogs
diff --git a/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettings.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettings.qml
index f2a1bd322860c8bfcfc87a2b5562fa94b8646070..bc70bd9d79052342aef18408c9db4647d2b334de 100644
--- a/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettings.qml
+++ b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettings.qml
@@ -1,5 +1,4 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.12
+import QtQuick 2.0
DapUiQmlScreenSettingsForm {
anchors.fill: parent
diff --git a/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsForm.ui.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsForm.ui.qml
index 9faa0c04d692a727610d3084348cf081ae43d72a..1cb9affd0dd57cd2696f8de326100b8c1b86f434 100644
--- a/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsForm.ui.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.0
Item {
anchors.fill: parent
diff --git a/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetwork.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetwork.qml
index b73c03d6c3d61fa71dd5b3dd9e75e6854ad7559c..250c192d5e637f3c9804e407daa6f912510718df 100644
--- a/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetwork.qml
+++ b/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetwork.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
DapUiQmlWidgetSettingsNetworkForm {
width: parent.width
diff --git a/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml
index 96a8ae4f5771e1ed409dbaa2ffc4afbcc2382791..3cd8bed4d10a45cb1609edaef0c05721f2fb9a0b 100644
--- a/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.0
Item {
width: 400
diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
index f3f0684adaee4f38e59dc155e6df53aad37ae010..780b25739ffced391709288e6bf638cc6e142575 100644
--- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
+++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
@@ -1,8 +1,9 @@
import QtQuick 2.0
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.0
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.3
+import "../../"
Rectangle {
Rectangle {
@@ -11,10 +12,7 @@ Rectangle {
color: "transparent"
Row {
- anchors.top: parent.top
- anchors.left: parent.left
- anchors.bottom: parent.bottom
- anchors.right: statusBarAddWalletButton.left
+ anchors.fill: parent
anchors.leftMargin: 30 * pt
anchors.topMargin: 10 * pt
anchors.bottomMargin: 10 * pt
@@ -29,7 +27,23 @@ Rectangle {
font.pixelSize: 12 * pt
color: "#A7A7A7"
}
+ DapComboBox {
+ 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
+ }
Label {
id: titleWalletBalance
anchors.top: parent.top
diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
index 585b24ec1f9931c250c6a4d8bb99a186b097d6e5..98505bf33863462d6fb296019f060fc699782349 100644
--- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.0
Button {
property alias name: templateText.text
diff --git a/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpnForm.ui.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpnForm.ui.qml
index 2a848acb739d1529933eba872bf311d096612308..6bfede46a7f598f63bb3cd8da945345ca61bd6d4 100644
--- a/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpnForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpnForm.ui.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.0
+import QtQuick.Controls 2.0
import QtGraphicalEffects 1.0
-import QtQuick.Layouts 1.12
+import QtQuick.Layouts 1.0
Item {
width: 400
diff --git a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpn.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpn.qml
index d8d1cccb01d64291326ade967d539ca959d259c9..e9749d485cec3f527d860532c471b0e3255af5b8 100644
--- a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpn.qml
+++ b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpn.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.0
DapUiQmlWidgetSettingsVpnForm {
Column {
diff --git a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml
index 3651997ceb88c62df61fcd9a4866c1fc82c9abef..627986a8a472ab0fbfc0725d3787994594319793 100644
--- a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml
+++ b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.0
DapUiQmlWidgetSettingsVpnComboBoxForm {
diff --git a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
index fa2b6d69636b2c54f4930b1e6334491d8c6836ce..488dd2be40e0b50535b63289d64f7d4aca497c29 100644
--- a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.5
+import QtQuick 2.0
+import QtQuick.Controls 2.0
import QtGraphicalEffects 1.0
ComboBox {
diff --git a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml
index 86a170a0ae976cc400dcf7bfed4ef6fb825ea7f8..e65c6c0b0b84f25bc88be1360168670874efae8b 100644
--- a/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.0
Item {
width: 400
diff --git a/CellFrameDashboardGUI/screen/main.qml b/CellFrameDashboardGUI/screen/main.qml
old mode 100644
new mode 100755
index 7458e4c24c54e4baefae574f232f5e7cf125c120..fb71b1e26af350fc97b4a4c720d057e9bed21683
--- a/CellFrameDashboardGUI/screen/main.qml
+++ b/CellFrameDashboardGUI/screen/main.qml
@@ -1,10 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Window 2.0
-import QtQuick.Controls.Styles 1.3
-import QtQuick.Controls.Styles 1.4
-import Qt.labs.platform 1.0
+import QtQuick 2.0
+import QtQuick.Controls 2.0
ApplicationWindow {
id: window
diff --git a/libdap b/libdap
index 483286aa342741bc1cce8f10a880891faec1b01c..1c0614797a3a2a2f4c179630025600e177637a65 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 483286aa342741bc1cce8f10a880891faec1b01c
+Subproject commit 1c0614797a3a2a2f4c179630025600e177637a65
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index 257d070fbe0228bd5c6c6be433c48160eaaefb28..8dfd465e991656dca083c0fd3a0ff5825d61fe86 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit 257d070fbe0228bd5c6c6be433c48160eaaefb28
+Subproject commit 8dfd465e991656dca083c0fd3a0ff5825d61fe86