[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
This commit is contained in:
parent
081c0cdeb2
commit
d57a496c51
@ -4,7 +4,6 @@ FORMS += \
|
|||||||
../src/qt/forms/sendcoinsentry.ui \
|
../src/qt/forms/sendcoinsentry.ui \
|
||||||
../src/qt/forms/sendcoinsdialog.ui \
|
../src/qt/forms/sendcoinsdialog.ui \
|
||||||
../src/qt/forms/rpcconsole.ui \
|
../src/qt/forms/rpcconsole.ui \
|
||||||
../src/qt/forms/qrcodedialog.ui \
|
|
||||||
../src/qt/forms/overviewpage.ui \
|
../src/qt/forms/overviewpage.ui \
|
||||||
../src/qt/forms/optionsdialog.ui \
|
../src/qt/forms/optionsdialog.ui \
|
||||||
../src/qt/forms/intro.ui \
|
../src/qt/forms/intro.ui \
|
||||||
|
@ -69,7 +69,7 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Context menu actions
|
// 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 *copyLabelAction = new QAction(tr("Copy &Label"), this);
|
||||||
QAction *editAction = new QAction(tr("&Edit"), this);
|
QAction *editAction = new QAction(tr("&Edit"), this);
|
||||||
deleteAction = new QAction(ui->deleteAddress->text(), this);
|
deleteAction = new QAction(ui->deleteAddress->text(), this);
|
||||||
|
@ -194,7 +194,7 @@ void BitcoinGUI::createActions(bool fIsTestnet)
|
|||||||
tabGroup->addAction(sendCoinsAction);
|
tabGroup->addAction(sendCoinsAction);
|
||||||
|
|
||||||
receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this);
|
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->setToolTip(receiveCoinsAction->statusTip());
|
||||||
receiveCoinsAction->setCheckable(true);
|
receiveCoinsAction->setCheckable(true);
|
||||||
receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));
|
receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));
|
||||||
|
@ -10,9 +10,6 @@
|
|||||||
<height>380</height>
|
<height>380</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labelExplanation">
|
<widget class="QLabel" name="labelExplanation">
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tabSignMessage">
|
<widget class="QWidget" name="tabSignMessage">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
|
@ -16,7 +16,9 @@
|
|||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_CONFIG_H)
|
||||||
#include "bitcoin-config.h" /* for USE_QRCODE */
|
#include "bitcoin-config.h" /* for USE_QRCODE */
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef USE_QRCODE
|
#ifdef USE_QRCODE
|
||||||
#include <qrencode.h>
|
#include <qrencode.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user