From be602d7ce4f4ece4fa6a971a558fc7ded8b8c7eb Mon Sep 17 00:00:00 2001
From: Andymeows <andy.mornes@gmail.com>
Date: Fri, 22 Aug 2014 00:42:04 -0500
Subject: [PATCH] Demoting QRImageWidget to simpler QLabels. Disabling wallet
 interaction when the wallet isn't enabled

---
 src/qt/forms/paperwalletdialog.ui | 11 +++--------
 src/qt/utilitydialog.cpp          |  5 +++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/qt/forms/paperwalletdialog.ui b/src/qt/forms/paperwalletdialog.ui
index 4b10c85d2..c55102e0a 100644
--- a/src/qt/forms/paperwalletdialog.ui
+++ b/src/qt/forms/paperwalletdialog.ui
@@ -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>
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index e5dff8f96..cb52a7d2a 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -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;
 
 }