Merge branch 'master' into bugs-2797

CellFrameDashboardGUI/main.cpp

@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("dapWalletFilterModel", &DapWalletFilterModel::instance());
     engine.rootContext()->setContextProperty("dapWalletModel", &DapChainWalletModel::instance());
     engine.rootContext()->setContextProperty("clipboard", &DapClipboard::instance());
-    engine.rootContext()->setContextProperty("pt", 1.3);
+    engine.rootContext()->setContextProperty("pt", 1.0);
     engine.load(QUrl("qrc:/screen/main.qml"));
 
     if (engine.rootObjects().isEmpty())

CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml

 import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.0
 import "../"
 

CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml

-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.0
+import QtQuick.Controls 2.0
 
 RadioButton {
     property alias textButton: nameButton.text
@@ -23,7 +23,7 @@ RadioButton {
 
     spacing: 16 * pt
     checked: false
-    display: AbstractButton.TextBesideIcon
+//    display: AbstractButton.TextBesideIcon
     autoExclusive: true
 }
 

CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml

@@ -42,7 +42,7 @@ Rectangle {
                 normalColorText:"#FFFFFF"
                 hilightColorTopText:"#332F49"
                 hilightColor: "#332F49"
-                fontSizeComboBox: 14*px
+                fontSizeComboBox: 14*pt
             }
             Label {
                 id: titleWalletBalance