LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #3148 from Diapolo/misc

Browse source 
[Qt] misc small fixes for #3099 (new receive flow)
This commit is contained in:
Wladimir J. van der Laan 2013-10-25 05:36:04 -07:00
commit 7cd8623883
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/bitcoin-qt.pro
View file

@ -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 \

2
src/qt/addressbookpage.cpp
View file

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

2
src/qt/bitcoingui.cpp
View file

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

3
src/qt/forms/addressbookpage.ui
View file

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

2
src/qt/forms/signverifymessagedialog.ui
View file

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

2
src/qt/receiverequestdialog.cpp
View file

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