diff --git a/KelvinDashboardGUI/DapQmlScreenAbout.qml b/KelvinDashboardGUI/DapQmlScreenAbout.qml index da8d3cd2915cd57c254a86ede9637e2122eb3bc4..5e97667eb1d885d7ec4767f90f4d9825b559dc8c 100755 --- a/KelvinDashboardGUI/DapQmlScreenAbout.qml +++ b/KelvinDashboardGUI/DapQmlScreenAbout.qml @@ -1,5 +1,5 @@ import QtQuick 2.9 -import QtQml 2.11 +import QtQml 2.3 import QtQuick.Controls 2.2 import KelvinDashboard 1.0 diff --git a/KelvinDashboardGUI/DapUiQmlScreenChangeWidget.qml b/KelvinDashboardGUI/DapUiQmlScreenChangeWidget.qml index 4ff8f4e2fdf9d14124c70534ba37e5334733a914..8eed111a00b6511ae3db287541ba255a1ca3dd0b 100755 --- a/KelvinDashboardGUI/DapUiQmlScreenChangeWidget.qml +++ b/KelvinDashboardGUI/DapUiQmlScreenChangeWidget.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 -import QtQml 2.11 +import QtQml 2.3 import QtQuick.Controls 1.4 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 import QtQml.Models 2.2 import KelvinDashboard 1.0 diff --git a/KelvinDashboardGUI/DapUiQmlScreenDialog.qml b/KelvinDashboardGUI/DapUiQmlScreenDialog.qml index 15b1490d1116cac6050aee79bb10e8df4c541bfa..98b903eb12867843898e4c09555d6018915d510a 100644 --- a/KelvinDashboardGUI/DapUiQmlScreenDialog.qml +++ b/KelvinDashboardGUI/DapUiQmlScreenDialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import KelvinDashboard 1.0 Page { diff --git a/KelvinDashboardGUI/DapUiQmlScreenDialogAddWallet.qml b/KelvinDashboardGUI/DapUiQmlScreenDialogAddWallet.qml index 54517ffacb6d17132da87496daab3046486e2af4..4b0a360de89d2f0d13e5aaf8972eab432c962e74 100644 --- a/KelvinDashboardGUI/DapUiQmlScreenDialogAddWallet.qml +++ b/KelvinDashboardGUI/DapUiQmlScreenDialogAddWallet.qml @@ -1,5 +1,5 @@ import QtQuick 2.9 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.2 import KelvinDashboard 1.0 Dialog { diff --git a/KelvinDashboardGUI/DapUiQmlScreenDialogSendToken.qml b/KelvinDashboardGUI/DapUiQmlScreenDialogSendToken.qml index bd4e547dab97d85ced075d0a15c08612a55ae0ad..960c3f397e1163346be83596556845157880b2db 100755 --- a/KelvinDashboardGUI/DapUiQmlScreenDialogSendToken.qml +++ b/KelvinDashboardGUI/DapUiQmlScreenDialogSendToken.qml @@ -1,6 +1,6 @@ import QtQuick 2.9 import QtQuick.Controls 1.4 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.2 //import QtQuick.Controls 2.5 import KelvinDashboard 1.0 @@ -159,14 +159,16 @@ Dialog { onClicked: { - let wallet = listViewWallet.model.get(listViewWallet.currentIndex).name; - let token = comboBoxToken.currentText; - let amount = textFieldAmount.realValue.toString(); - let receiver = comboBoxAddressWallet.editText; + var wallet = listViewWallet.model.get(listViewWallet.currentIndex).name; + var token = comboBoxToken.currentText; + var amount = textFieldAmount.realValue.toString(); + var receiver = comboBoxAddressWallet.editText; if (wallet && token && amount && receiver) { console.log("Send " + token + "(" + amount + ") to address " + receiver + " from wallet " + wallet ); dapServiceController.sendToken(wallet, receiver, token, amount); + dapChainWalletsModel.clear(); + dapServiceController.getWallets(); } else { console.log("There's error!"); console.log(amount); diff --git a/KelvinDashboardGUI/DapUiQmlScreenMainWindow.ui.qml b/KelvinDashboardGUI/DapUiQmlScreenMainWindow.ui.qml index edc520024fe0c426c223257aabc8d72763a3dc28..4f6d67ec1377c3aaf98d75915fa1422af5ff32fd 100644 --- a/KelvinDashboardGUI/DapUiQmlScreenMainWindow.ui.qml +++ b/KelvinDashboardGUI/DapUiQmlScreenMainWindow.ui.qml @@ -1,6 +1,6 @@ import QtQuick 2.9 import QtQuick.Controls 1.4 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.2 Page { diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.qml b/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.qml index fda575952da1aed0aa82fe1d69fc804f125bd0cb..313d385dff6f41b465ce6286fa627db98326c1ab 100755 --- a/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.qml +++ b/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.qml @@ -1,6 +1,6 @@ import QtQuick 2.9 import QtQuick.Controls 1.4 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.2 import QtQuick.Window 2.0 import QtQuick.Controls.Styles 1.3 import QtQuick.Controls.Styles 1.4 @@ -45,7 +45,10 @@ DapUiQmlWidgetChainWalletForm { } function updateBalanceText() { - let value = listViewTokens.currentIndex > -1 ? listViewWallet.model.get(listViewWallet.currentIndex).balance[listViewTokens.currentIndex] : ""; + var value = ""; + if (listViewTokens.currentIndex > -1) { + value = listViewWallet.model.get(listViewWallet.currentIndex).balance[listViewTokens.currentIndex]; + } if (value) textBalance.text = value.replace(/[^\d.-]/g, ''); else diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml b/KelvinDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml index aefc757462c75df4673c9f021f3ecdd77f09c2e2..54b51460d4df1b12f669c472245ba55510444298 100755 --- a/KelvinDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml +++ b/KelvinDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml @@ -1,4 +1,4 @@ -import QtQuick 2.11 +import QtQuick 2.9 import QtGraphicalEffects 1.0 import QtQuick.Controls 2.2 import QtQuick.Controls.Styles 1.4 diff --git a/KelvinDashboardGUI/DapUiQmlWidgetDelegate.qml b/KelvinDashboardGUI/DapUiQmlWidgetDelegate.qml index 607a49ad604901c412cf8142dd676b18e3af0d20..d8ccef85e08a2b8492302b1663e199591e020f40 100644 --- a/KelvinDashboardGUI/DapUiQmlWidgetDelegate.qml +++ b/KelvinDashboardGUI/DapUiQmlWidgetDelegate.qml @@ -1,4 +1,4 @@ -import QtQuick 2.4 +import QtQuick 2.2 DapUiQmlWidgetDelegateForm { } diff --git a/KelvinDashboardGUI/main.qml b/KelvinDashboardGUI/main.qml index 1f58d9190aa1e7a060b6545894c504e31dafe1d4..01c5752c530bbf26f2c93a0e8d76a5bef67730aa 100755 --- a/KelvinDashboardGUI/main.qml +++ b/KelvinDashboardGUI/main.qml @@ -1,6 +1,6 @@ import QtQuick 2.9 import QtQuick.Controls 1.4 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.2 import QtQuick.Window 2.0 import QtQuick.Controls.Styles 1.3 import QtQuick.Controls.Styles 1.4