From df1f9b0283aa7799bd2e99ccedd04988ced79593 Mon Sep 17 00:00:00 2001
From: "tatiana.novikova" <tatiana.novikova@demlabs.net>
Date: Mon, 18 May 2020 22:28:49 +0300
Subject: [PATCH] [*] Change static name of token 'KLVN' to dynamic name of
choosen token [-] Delete USD
---
.../DapInputNewWalletNameRightPanelForm.ui.qml | 2 +-
.../RightPanel/DapNewPaymentMainRightPanel.qml | 6 ++++++
.../RightPanel/DapNewPaymentMainRightPanelForm.ui.qml | 10 +++++++---
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
index e7bd1c9..a72b24f 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
@@ -22,7 +22,7 @@ DapAbstractRightPanel
id: signatureTypeWallet
ListElement
{
- name: "Dilithium in my head"
+ name: "Dilithium"
sign: "sig_dil"
}
ListElement
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
index f5a190e..59ffd4f 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
@@ -25,4 +25,10 @@ DapNewPaymentMainRightPanelForm
nextActivated("transaction created")
}
+
+ dapCmboBoxToken.onCurrentIndexChanged:
+ {
+ dapSendedToken = dapCmboBoxToken.mainLineText;
+ }
+
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
index 8790b4c..55c3618 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
@@ -14,6 +14,8 @@ DapAbstractRightPanel
property alias dapCmboBoxTokenModel: comboboxToken.model
property alias dapCmboBoxToken: comboboxToken
+ //@param dapSendedToken Name of token to send
+ property string dapSendedToken: ""
property string dapCurrentWallet
@@ -245,7 +247,8 @@ DapAbstractRightPanel
font: dapMainFonts.dapMainFontTheme.dapFontRobotoRegular16
horizontalAlignment: Text.AlignRight
color: "#070023"
- text: "KLVN"
+ text: dapSendedToken
+
}
}
Rectangle
@@ -272,7 +275,8 @@ DapAbstractRightPanel
anchors.topMargin: 16 * pt
height: textAmountConvertValue.height
color: "transparent"
- Text
+ ////////////Delete all USD
+ /*Text
{
id: textAmountConvertValue
anchors.verticalCenter: parent.verticalCenter
@@ -292,7 +296,7 @@ DapAbstractRightPanel
horizontalAlignment: Text.AlignRight
color: "#757184"
text: qsTr("USD")
- }
+ }*/
}
}
--
GitLab