aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/bitcoin-qt.pro1
-rw-r--r--src/qt/addressbookpage.cpp2
-rw-r--r--src/qt/bitcoingui.cpp2
-rw-r--r--src/qt/forms/addressbookpage.ui3
-rw-r--r--src/qt/forms/signverifymessagedialog.ui2
-rw-r--r--src/qt/receiverequestdialog.cpp2
6 files changed, 5 insertions, 7 deletions
diff --git a/contrib/bitcoin-qt.pro b/contrib/bitcoin-qt.pro
index 7087709741..6adf7650d2 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 0b364afca8..ba5de4660a 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 b210e22b63..26e823705c 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 5a92a455b1..49221f41c1 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 16cc6c2ea1..04d614a1cd 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 cb0a07fcdf..896acfd233 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>