From d57a496c513e5f1c44a19972225d105e568f0594 Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Fri, 25 Oct 2013 14:19:44 +0200
Subject: [PATCH] [Qt] misc small fixes for #3099 (new receive flow)

- changes some strings that were forgotton or made no sense in the conext
  they are used
- remove an orphan file from the qt project file
- revert a small change in signverifymessagedialog.ui
- guard #include "bitcoin-config.h" with #if defined(HAVE_CONFIG_H)
- remove windowTitle from addressbookpage.ui
---
 contrib/bitcoin-qt.pro                  | 1 -
 src/qt/addressbookpage.cpp              | 2 +-
 src/qt/bitcoingui.cpp                   | 2 +-
 src/qt/forms/addressbookpage.ui         | 3 ---
 src/qt/forms/signverifymessagedialog.ui | 2 +-
 src/qt/receiverequestdialog.cpp         | 2 ++
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/contrib/bitcoin-qt.pro b/contrib/bitcoin-qt.pro
index 708770974..6adf7650d 100644
--- a/contrib/bitcoin-qt.pro
+++ b/contrib/bitcoin-qt.pro
@@ -4,7 +4,6 @@ FORMS += \
     ../src/qt/forms/sendcoinsentry.ui \
     ../src/qt/forms/sendcoinsdialog.ui \
     ../src/qt/forms/rpcconsole.ui \
-    ../src/qt/forms/qrcodedialog.ui \
     ../src/qt/forms/overviewpage.ui \
     ../src/qt/forms/optionsdialog.ui \
     ../src/qt/forms/intro.ui \
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index 0b364afca..ba5de4660 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -69,7 +69,7 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
     }
 
     // Context menu actions
-    QAction *copyAddressAction = new QAction(ui->copyAddress->text(), this);
+    QAction *copyAddressAction = new QAction(tr("&Copy Address"), this);
     QAction *copyLabelAction = new QAction(tr("Copy &Label"), this);
     QAction *editAction = new QAction(tr("&Edit"), this);
     deleteAction = new QAction(ui->deleteAddress->text(), this);
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b210e22b6..26e823705 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -194,7 +194,7 @@ void BitcoinGUI::createActions(bool fIsTestnet)
     tabGroup->addAction(sendCoinsAction);
 
     receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this);
-    receiveCoinsAction->setStatusTip(tr("Show the list of addresses for receiving payments"));
+    receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and bitcoin: URIs)"));
     receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip());
     receiveCoinsAction->setCheckable(true);
     receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));
diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui
index 5a92a455b..49221f41c 100644
--- a/src/qt/forms/addressbookpage.ui
+++ b/src/qt/forms/addressbookpage.ui
@@ -10,9 +10,6 @@
     <height>380</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="labelExplanation">
diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui
index 16cc6c2ea..04d614a1c 100644
--- a/src/qt/forms/signverifymessagedialog.ui
+++ b/src/qt/forms/signverifymessagedialog.ui
@@ -20,7 +20,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabSignMessage">
       <attribute name="title">
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index cb0a07fcd..896acfd23 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -16,7 +16,9 @@
 #include <QUrl>
 #endif
 
+#if defined(HAVE_CONFIG_H)
 #include "bitcoin-config.h" /* for USE_QRCODE */
+#endif
 
 #ifdef USE_QRCODE
 #include <qrencode.h>