Skip to content

Commit d57a496

Browse files
author
Philip Kaufmann
committed
[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
1 parent 081c0cd commit d57a496

File tree

6 files changed

+5
-7
lines changed

6 files changed

+5
-7
lines changed

contrib/bitcoin-qt.pro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FORMS += \
44
../src/qt/forms/sendcoinsentry.ui \
55
../src/qt/forms/sendcoinsdialog.ui \
66
../src/qt/forms/rpcconsole.ui \
7-
../src/qt/forms/qrcodedialog.ui \
87
../src/qt/forms/overviewpage.ui \
98
../src/qt/forms/optionsdialog.ui \
109
../src/qt/forms/intro.ui \

src/qt/addressbookpage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
6969
}
7070

7171
// Context menu actions
72-
QAction *copyAddressAction = new QAction(ui->copyAddress->text(), this);
72+
QAction *copyAddressAction = new QAction(tr("&Copy Address"), this);
7373
QAction *copyLabelAction = new QAction(tr("Copy &Label"), this);
7474
QAction *editAction = new QAction(tr("&Edit"), this);
7575
deleteAction = new QAction(ui->deleteAddress->text(), this);

src/qt/bitcoingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void BitcoinGUI::createActions(bool fIsTestnet)
194194
tabGroup->addAction(sendCoinsAction);
195195

196196
receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this);
197-
receiveCoinsAction->setStatusTip(tr("Show the list of addresses for receiving payments"));
197+
receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and bitcoin: URIs)"));
198198
receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip());
199199
receiveCoinsAction->setCheckable(true);
200200
receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));

src/qt/forms/addressbookpage.ui

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
<height>380</height>
1111
</rect>
1212
</property>
13-
<property name="windowTitle">
14-
<string/>
15-
</property>
1613
<layout class="QVBoxLayout" name="verticalLayout">
1714
<item>
1815
<widget class="QLabel" name="labelExplanation">

src/qt/forms/signverifymessagedialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<item>
2121
<widget class="QTabWidget" name="tabWidget">
2222
<property name="currentIndex">
23-
<number>1</number>
23+
<number>0</number>
2424
</property>
2525
<widget class="QWidget" name="tabSignMessage">
2626
<attribute name="title">

src/qt/receiverequestdialog.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#include <QUrl>
1717
#endif
1818

19+
#if defined(HAVE_CONFIG_H)
1920
#include "bitcoin-config.h" /* for USE_QRCODE */
21+
#endif
2022

2123
#ifdef USE_QRCODE
2224
#include <qrencode.h>

0 commit comments

Comments
 (0)