DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of github.com:adityapk00/zec-qt-wallet

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-03-25 16:27:13 -07:00
parent 8bfafadf27 117fb45059
commit 46598a2a25
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/requestdialog.cpp
View File

@@ -40,7 +40,7 @@ void RequestDialog::setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog*
req->cmbMyAddress->setCurrentText(main->getRPC()->getDefaultSaplingAddress()); req->cmbMyAddress->setCurrentText(main->getRPC()->getDefaultSaplingAddress());
QIcon icon(":/icons/res/paymentreq.gif"); QIcon icon(":/icons/res/paymentreq.gif");
req->label_5->setPixmap(icon.pixmap(48, 48)); req->lblPixmap->setPixmap(icon.pixmap(48, 48));
} }
// Static method that shows an incoming payment request and prompts the user to pay it // Static method that shows an incoming payment request and prompts the user to pay it
@@ -77,7 +77,7 @@ void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI
req.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Pay")); req.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Pay"));
req.label_6->setText(tr("You are paying a payment request. Your address will not be visible to the person requesting this payment.")); req.lblHeader->setText(tr("You are paying a payment request. Your address will not be visible to the person requesting this payment."));
if (d.exec() == QDialog::Accepted) { if (d.exec() == QDialog::Accepted) {
main->payZcashURI(paymentURI, req.cmbMyAddress->currentText()); main->payZcashURI(paymentURI, req.cmbMyAddress->currentText());

4
src/requestdialog.ui
View File

@@ -204,7 +204,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="lblPixmap">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
@@ -214,7 +214,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="2"> <item row="0" column="2" colspan="2">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="lblHeader">
<property name="text"> <property name="text">
<string>Request payment from a Sapling address. You'll send a ZEC 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you.</string> <string>Request payment from a Sapling address. You'll send a ZEC 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you.</string>
</property> </property>