zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Qt, Trivial] misc minor string changes 

- write "Bitcoins" uppercase
- replace secure/insecure for payment requests with
  authenticated/unauthenticated
- change a translatable string for payment request expiry to match another
  existing string to only get ONE resulting string to translate
This commit is contained in:
Philip Kaufmann 2015-03-18 11:22:27 +01:00 committed by Wladimir J. van der Laan
parent c0555dc8eb
commit 985ec17eee
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qt/forms/sendcoinsentry.ui
View File

@ -195,7 +195,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QFrame" name="SendCoins_InsecurePaymentRequest"> <widget class="QFrame" name="SendCoins_UnauthenticatedPaymentRequest">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
@ -612,7 +612,7 @@
</palette> </palette>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>This is an unverified payment request.</string> <string>This is an unauthenticated payment request.</string>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>true</bool> <bool>true</bool>
@ -700,7 +700,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QFrame" name="SendCoins_SecurePaymentRequest"> <widget class="QFrame" name="SendCoins_AuthenticatedPaymentRequest">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
@ -1144,7 +1144,7 @@
</palette> </palette>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>This is a verified payment request.</string> <string>This is an authenticated payment request.</string>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>true</bool> <bool>true</bool>

4
src/qt/sendcoinsdialog.cpp
View File

@ -274,11 +274,11 @@ void SendCoinsDialog::on_sendButton_clicked()
recipientElement = tr("%1 to %2").arg(amount, address); recipientElement = tr("%1 to %2").arg(amount, address);
} }
} }
else if(!rcp.authenticatedMerchant.isEmpty()) // secure payment request else if(!rcp.authenticatedMerchant.isEmpty()) // authenticated payment request
{ {
recipientElement = tr("%1 to %2").arg(amount, GUIUtil::HtmlEscape(rcp.authenticatedMerchant)); recipientElement = tr("%1 to %2").arg(amount, GUIUtil::HtmlEscape(rcp.authenticatedMerchant));
} }
else // insecure payment request else // unauthenticated payment request
{ {
recipientElement = tr("%1 to %2").arg(amount, address); recipientElement = tr("%1 to %2").arg(amount, address);
} }

12
src/qt/sendcoinsentry.cpp
View File

@ -99,11 +99,11 @@ void SendCoinsEntry::clear()
ui->messageTextLabel->clear(); ui->messageTextLabel->clear();
ui->messageTextLabel->hide(); ui->messageTextLabel->hide();
ui->messageLabel->hide(); ui->messageLabel->hide();
// clear UI elements for insecure payment request // clear UI elements for unauthenticated payment request
ui->payTo_is->clear(); ui->payTo_is->clear();
ui->memoTextLabel_is->clear(); ui->memoTextLabel_is->clear();
ui->payAmount_is->clear(); ui->payAmount_is->clear();
// clear UI elements for secure payment request // clear UI elements for authenticated payment request
ui->payTo_s->clear(); ui->payTo_s->clear();
ui->memoTextLabel_s->clear(); ui->memoTextLabel_s->clear();
ui->payAmount_s->clear(); ui->payAmount_s->clear();
@ -190,21 +190,21 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
if (recipient.paymentRequest.IsInitialized()) // payment request if (recipient.paymentRequest.IsInitialized()) // payment request
{ {
if (recipient.authenticatedMerchant.isEmpty()) // insecure if (recipient.authenticatedMerchant.isEmpty()) // unauthenticated
{ {
ui->payTo_is->setText(recipient.address); ui->payTo_is->setText(recipient.address);
ui->memoTextLabel_is->setText(recipient.message); ui->memoTextLabel_is->setText(recipient.message);
ui->payAmount_is->setValue(recipient.amount); ui->payAmount_is->setValue(recipient.amount);
ui->payAmount_is->setReadOnly(true); ui->payAmount_is->setReadOnly(true);
setCurrentWidget(ui->SendCoins_InsecurePaymentRequest); setCurrentWidget(ui->SendCoins_UnauthenticatedPaymentRequest);
} }
else // secure else // authenticated
{ {
ui->payTo_s->setText(recipient.authenticatedMerchant); ui->payTo_s->setText(recipient.authenticatedMerchant);
ui->memoTextLabel_s->setText(recipient.message); ui->memoTextLabel_s->setText(recipient.message);
ui->payAmount_s->setValue(recipient.amount); ui->payAmount_s->setValue(recipient.amount);
ui->payAmount_s->setReadOnly(true); ui->payAmount_s->setReadOnly(true);
setCurrentWidget(ui->SendCoins_SecurePaymentRequest); setCurrentWidget(ui->SendCoins_AuthenticatedPaymentRequest);
} }
} }
else // normal payment else // normal payment