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

This commit is contained in:
Aditya Kulkarni
2019-03-25 16:27:13 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -40,7 +40,7 @@ void RequestDialog::setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog*
req->cmbMyAddress->setCurrentText(main->getRPC()->getDefaultSaplingAddress());
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
@@ -77,7 +77,7 @@ void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI
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) {
main->payZcashURI(paymentURI, req.cmbMyAddress->currentText());

View File

@@ -204,7 +204,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_5">
<widget class="QLabel" name="lblPixmap">
<property name="text">
<string>TextLabel</string>
</property>
@@ -214,7 +214,7 @@
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QLabel" name="label_6">
<widget class="QLabel" name="lblHeader">
<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>
</property>