twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-23 04:54:30 +00:00
Code Issues Projects Releases Wiki Activity

"Receive coins" instead of "Receiving addresses"

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2011-07-02 10:13:29 +02:00
parent f48b4c8897
commit bb82fdb543
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qt/bitcoingui.cpp
View File

@ -25,14 +25,12 @@
#include <QIcon> #include <QIcon>
#include <QTabWidget> #include <QTabWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget>
#include <QToolBar> #include <QToolBar>
#include <QStatusBar> #include <QStatusBar>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#include <QLocale> #include <QLocale>
#include <QClipboard>
#include <QMessageBox> #include <QMessageBox>
#include <QProgressBar> #include <QProgressBar>
@ -54,12 +52,12 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
// Menus // Menus
QMenu *file = menuBar()->addMenu("&File"); QMenu *file = menuBar()->addMenu("&File");
file->addAction(sendcoins); file->addAction(sendCoins);
file->addAction(receiveCoins);
file->addSeparator(); file->addSeparator();
file->addAction(quit); file->addAction(quit);
QMenu *settings = menuBar()->addMenu("&Settings"); QMenu *settings = menuBar()->addMenu("&Settings");
settings->addAction(receivingAddresses);
settings->addAction(options); settings->addAction(options);
QMenu *help = menuBar()->addMenu("&Help"); QMenu *help = menuBar()->addMenu("&Help");
@ -68,9 +66,9 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
// Toolbar // Toolbar
QToolBar *toolbar = addToolBar("Main toolbar"); QToolBar *toolbar = addToolBar("Main toolbar");
toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
toolbar->addAction(sendcoins); toolbar->addAction(sendCoins);
toolbar->addAction(receiveCoins);
toolbar->addAction(addressbook); toolbar->addAction(addressbook);
toolbar->addAction(receivingAddresses);
// Balance: <balance> // Balance: <balance>
QHBoxLayout *hbox_balance = new QHBoxLayout(); QHBoxLayout *hbox_balance = new QHBoxLayout();
@ -132,23 +130,23 @@ void BitcoinGUI::createActions()
{ {
quit = new QAction(QIcon(":/icons/quit"), tr("&Exit"), this); quit = new QAction(QIcon(":/icons/quit"), tr("&Exit"), this);
quit->setToolTip(tr("Quit application")); quit->setToolTip(tr("Quit application"));
sendcoins = new QAction(QIcon(":/icons/send"), tr("&Send coins"), this); sendCoins = new QAction(QIcon(":/icons/send"), tr("&Send coins"), this);
sendcoins->setToolTip(tr("Send coins to a bitcoin address")); sendCoins->setToolTip(tr("Send coins to a bitcoin address"));
addressbook = new QAction(QIcon(":/icons/address-book"), tr("&Address Book"), this); addressbook = new QAction(QIcon(":/icons/address-book"), tr("&Address Book"), this);
addressbook->setToolTip(tr("Edit the list of stored addresses and labels")); addressbook->setToolTip(tr("Edit the list of stored addresses and labels"));
about = new QAction(QIcon(":/icons/bitcoin"), tr("&About"), this); about = new QAction(QIcon(":/icons/bitcoin"), tr("&About"), this);
about->setToolTip(tr("Show information about Bitcoin")); about->setToolTip(tr("Show information about Bitcoin"));
receivingAddresses = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receiving Addresses..."), this); receiveCoins = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive coins"), this);
receivingAddresses->setToolTip(tr("Show the list of addresses for receiving payments")); receiveCoins->setToolTip(tr("Show the list of addresses for receiving payments"));
options = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); options = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
options->setToolTip(tr("Modify configuration options for bitcoin")); options->setToolTip(tr("Modify configuration options for bitcoin"));
openBitcoin = new QAction(QIcon(":/icons/bitcoin"), "Open &Bitcoin", this); openBitcoin = new QAction(QIcon(":/icons/bitcoin"), "Open &Bitcoin", this);
openBitcoin->setToolTip(tr("Show the Bitcoin window")); openBitcoin->setToolTip(tr("Show the Bitcoin window"));
connect(quit, SIGNAL(triggered()), qApp, SLOT(quit())); connect(quit, SIGNAL(triggered()), qApp, SLOT(quit()));
connect(sendcoins, SIGNAL(triggered()), this, SLOT(sendcoinsClicked())); connect(sendCoins, SIGNAL(triggered()), this, SLOT(sendCoinsClicked()));
connect(addressbook, SIGNAL(triggered()), this, SLOT(addressbookClicked())); connect(addressbook, SIGNAL(triggered()), this, SLOT(addressbookClicked()));
connect(receivingAddresses, SIGNAL(triggered()), this, SLOT(receivingAddressesClicked())); connect(receiveCoins, SIGNAL(triggered()), this, SLOT(receiveCoinsClicked()));
connect(options, SIGNAL(triggered()), this, SLOT(optionsClicked())); connect(options, SIGNAL(triggered()), this, SLOT(optionsClicked()));
connect(about, SIGNAL(triggered()), this, SLOT(aboutClicked())); connect(about, SIGNAL(triggered()), this, SLOT(aboutClicked()));
connect(openBitcoin, SIGNAL(triggered()), this, SLOT(show())); connect(openBitcoin, SIGNAL(triggered()), this, SLOT(show()));
@ -206,7 +204,7 @@ void BitcoinGUI::createTrayIcon()
{ {
QMenu *trayIconMenu = new QMenu(this); QMenu *trayIconMenu = new QMenu(this);
trayIconMenu->addAction(openBitcoin); trayIconMenu->addAction(openBitcoin);
trayIconMenu->addAction(sendcoins); trayIconMenu->addAction(sendCoins);
trayIconMenu->addAction(options); trayIconMenu->addAction(options);
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(quit); trayIconMenu->addAction(quit);
@ -229,7 +227,7 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
} }
} }
void BitcoinGUI::sendcoinsClicked() void BitcoinGUI::sendCoinsClicked()
{ {
SendCoinsDialog dlg; SendCoinsDialog dlg;
dlg.setModel(walletModel); dlg.setModel(walletModel);
@ -244,7 +242,7 @@ void BitcoinGUI::addressbookClicked()
dlg.exec(); dlg.exec();
} }
void BitcoinGUI::receivingAddressesClicked() void BitcoinGUI::receiveCoinsClicked()
{ {
AddressBookDialog dlg(AddressBookDialog::ForEditing); AddressBookDialog dlg(AddressBookDialog::ForEditing);
dlg.setModel(walletModel->getAddressTableModel()); dlg.setModel(walletModel->getAddressTableModel());

8
src/qt/bitcoingui.h
View File

@ -51,10 +51,10 @@ private:
QProgressBar *progressBar; QProgressBar *progressBar;
QAction *quit; QAction *quit;
QAction *sendcoins; QAction *sendCoins;
QAction *addressbook; QAction *addressbook;
QAction *about; QAction *about;
QAction *receivingAddresses; QAction *receiveCoins;
QAction *options; QAction *options;
QAction *openBitcoin; QAction *openBitcoin;
@ -78,10 +78,10 @@ public slots:
void askFee(qint64 nFeeRequired, bool *payFee); void askFee(qint64 nFeeRequired, bool *payFee);
private slots: private slots:
void sendcoinsClicked(); void sendCoinsClicked();
void addressbookClicked(); void addressbookClicked();
void optionsClicked(); void optionsClicked();
void receivingAddressesClicked(); void receiveCoinsClicked();
void aboutClicked(); void aboutClicked();
void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
void transactionDetails(const QModelIndex& idx); void transactionDetails(const QModelIndex& idx);