Merge pull request #3148 from Diapolo/misc

[Qt] misc small fixes for #3099 (new receive flow)

Author: laanwj

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 \

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);

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));

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">

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">

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>