mirror of
https://github.com/dogecoin/dogecoin.git
synced 2026-02-25 06:39:01 +00:00
Demoting QRImageWidget to simpler QLabels.
Disabling wallet interaction when the wallet isn't enabled
This commit is contained in:
parent
b56c5b6ff5
commit
be602d7ce4
@ -13,7 +13,7 @@
|
||||
<property name="windowTitle">
|
||||
<string>Print Your Paper Wallets</string>
|
||||
</property>
|
||||
<widget class="QRImageWidget" name="privateKeyQRCode">
|
||||
<widget class="QLabel" name="privateKeyQRCode">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>524</x>
|
||||
@ -29,7 +29,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRImageWidget" name="addressQRCode">
|
||||
<widget class="QLabel" name="addressQRCode">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>47</x>
|
||||
@ -62,7 +62,7 @@
|
||||
<normaloff>:/icons/add</normaloff>:/icons/add</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRImageWidget" name="paperTemplate">
|
||||
<widget class="QLabel" name="paperTemplate">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
@ -309,11 +309,6 @@ p, li { white-space: pre-wrap; }
|
||||
<zorder>label_2</zorder>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>QRImageWidget</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>receiverequestdialog.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>VerticalLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
|
||||
@ -9,10 +9,13 @@
|
||||
#include "ui_helpmessagedialog.h"
|
||||
|
||||
#include "bitcoinunits.h"
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
#include "sendcoinsdialog.h"
|
||||
#include "sendcoinsentry.h"
|
||||
#include "coincontrol.h"
|
||||
#include "coincontroldialog.h"
|
||||
#endif
|
||||
|
||||
#include "optionsmodel.h"
|
||||
#include "bitcoingui.h"
|
||||
@ -285,6 +288,7 @@ void PaperWalletDialog::on_printButton_clicked()
|
||||
|
||||
painter.end();
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
QStringList formatted;
|
||||
|
||||
WalletModelTransaction *tx;
|
||||
@ -388,6 +392,7 @@ void PaperWalletDialog::on_printButton_clicked()
|
||||
QMessageBox::critical(this, tr("Send Coins"), tr("The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."), QMessageBox::Ok, QMessageBox::Ok);
|
||||
}
|
||||
delete tx;
|
||||
#endif
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user