#include "addresstablemodel.h"
#include "transactionview.h"
-#include "headers.h"
-
#include <QApplication>
#include <QMainWindow>
#include <QMenuBar>
#include <QIcon>
#include <QTabWidget>
#include <QVBoxLayout>
-#include <QWidget>
#include <QToolBar>
#include <QStatusBar>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QLocale>
-#include <QClipboard>
#include <QMessageBox>
#include <QProgressBar>
// Menus
QMenu *file = menuBar()->addMenu("&File");
- file->addAction(sendcoins);
+ file->addAction(sendCoins);
+ file->addAction(receiveCoins);
file->addSeparator();
file->addAction(quit);
QMenu *settings = menuBar()->addMenu("&Settings");
- settings->addAction(receivingAddresses);
settings->addAction(options);
QMenu *help = menuBar()->addMenu("&Help");
// Toolbar
QToolBar *toolbar = addToolBar("Main toolbar");
toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- toolbar->addAction(sendcoins);
+ toolbar->addAction(sendCoins);
+ toolbar->addAction(receiveCoins);
toolbar->addAction(addressbook);
- // Address: <address>: New... : Paste to clipboard
- QHBoxLayout *hbox_address = new QHBoxLayout();
- hbox_address->addWidget(new QLabel(tr("Your Bitcoin address:")));
- address = new QLineEdit();
- address->setReadOnly(true);
- address->setFont(GUIUtil::bitcoinAddressFont());
- address->setToolTip(tr("Your current default receiving address"));
- hbox_address->addWidget(address);
-
- QPushButton *button_new = new QPushButton(tr("&New address..."));
- button_new->setToolTip(tr("Create new receiving address"));
- button_new->setIcon(QIcon(":/icons/add"));
- QPushButton *button_clipboard = new QPushButton(tr("&Copy to clipboard"));
- button_clipboard->setToolTip(tr("Copy current receiving address to the system clipboard"));
- button_clipboard->setIcon(QIcon(":/icons/editcopy"));
- hbox_address->addWidget(button_new);
- hbox_address->addWidget(button_clipboard);
-
// Balance: <balance>
QHBoxLayout *hbox_balance = new QHBoxLayout();
hbox_balance->addWidget(new QLabel(tr("Balance:")));
hbox_balance->addStretch(1);
QVBoxLayout *vbox = new QVBoxLayout();
- vbox->addLayout(hbox_address);
vbox->addLayout(hbox_balance);
transactionView = new TransactionView(this);
statusBar()->addPermanentWidget(labelBlocks);
statusBar()->addPermanentWidget(labelTransactions);
- // Action bindings
- connect(button_new, SIGNAL(clicked()), this, SLOT(newAddressClicked()));
- connect(button_clipboard, SIGNAL(clicked()), this, SLOT(copyClipboardClicked()));
-
createTrayIcon();
}
{
quit = new QAction(QIcon(":/icons/quit"), tr("&Exit"), this);
quit->setToolTip(tr("Quit application"));
- sendcoins = new QAction(QIcon(":/icons/send"), tr("&Send coins"), this);
- sendcoins->setToolTip(tr("Send coins to a bitcoin address"));
+ sendCoins = new QAction(QIcon(":/icons/send"), tr("&Send coins"), this);
+ sendCoins->setToolTip(tr("Send coins to a bitcoin address"));
addressbook = new QAction(QIcon(":/icons/address-book"), tr("&Address Book"), this);
addressbook->setToolTip(tr("Edit the list of stored addresses and labels"));
about = new QAction(QIcon(":/icons/bitcoin"), tr("&About"), this);
about->setToolTip(tr("Show information about Bitcoin"));
- receivingAddresses = new QAction(QIcon(":/icons/receiving_addresses"), tr("Your &Receiving Addresses..."), this);
- receivingAddresses->setToolTip(tr("Show the list of receiving addresses and edit their labels"));
+ receiveCoins = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive coins"), this);
+ receiveCoins->setToolTip(tr("Show the list of addresses for receiving payments"));
options = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
options->setToolTip(tr("Modify configuration options for bitcoin"));
openBitcoin = new QAction(QIcon(":/icons/bitcoin"), "Open &Bitcoin", this);
openBitcoin->setToolTip(tr("Show the Bitcoin window"));
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(receivingAddresses, SIGNAL(triggered()), this, SLOT(receivingAddressesClicked()));
+ connect(receiveCoins, SIGNAL(triggered()), this, SLOT(receiveCoinsClicked()));
connect(options, SIGNAL(triggered()), this, SLOT(optionsClicked()));
connect(about, SIGNAL(triggered()), this, SLOT(aboutClicked()));
connect(openBitcoin, SIGNAL(triggered()), this, SLOT(show()));
setNumTransactions(walletModel->getNumTransactions());
connect(walletModel, SIGNAL(numTransactionsChanged(int)), this, SLOT(setNumTransactions(int)));
- setAddress(walletModel->getAddressTableModel()->getDefaultAddress());
- connect(walletModel->getAddressTableModel(), SIGNAL(defaultAddressChanged(QString)), this, SLOT(setAddress(QString)));
-
// Report errors from wallet thread
connect(walletModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString)));
{
QMenu *trayIconMenu = new QMenu(this);
trayIconMenu->addAction(openBitcoin);
- trayIconMenu->addAction(sendcoins);
+ trayIconMenu->addAction(sendCoins);
trayIconMenu->addAction(options);
trayIconMenu->addSeparator();
trayIconMenu->addAction(quit);
}
}
-void BitcoinGUI::sendcoinsClicked()
+void BitcoinGUI::sendCoinsClicked()
{
SendCoinsDialog dlg;
dlg.setModel(walletModel);
dlg.exec();
}
-void BitcoinGUI::receivingAddressesClicked()
+void BitcoinGUI::receiveCoinsClicked()
{
AddressBookDialog dlg(AddressBookDialog::ForEditing);
dlg.setModel(walletModel->getAddressTableModel());
void BitcoinGUI::aboutClicked()
{
AboutDialog dlg;
+ dlg.setModel(clientModel);
dlg.exec();
}
-void BitcoinGUI::newAddressClicked()
-{
- EditAddressDialog dlg(EditAddressDialog::NewReceivingAddress);
- dlg.setModel(walletModel->getAddressTableModel());
- if(dlg.exec())
- {
- QString newAddress = dlg.saveCurrentRow();
- }
-}
-
-void BitcoinGUI::copyClipboardClicked()
-{
- // Copy text in address to clipboard
- QApplication::clipboard()->setText(address->text());
-}
-
void BitcoinGUI::setBalance(qint64 balance)
{
- labelBalance->setText(QString::fromStdString(FormatMoney(balance)) + QString(" BTC"));
-}
-
-void BitcoinGUI::setAddress(const QString &addr)
-{
- address->setText(addr);
+ labelBalance->setText(GUIUtil::formatMoney(balance) + QString(" BTC"));
}
void BitcoinGUI::setNumConnections(int count)
QString strMessage =
tr("This transaction is over the size limit. You can still send it for a fee of %1, "
"which goes to the nodes that process your transaction and helps to support the network. "
- "Do you want to pay the fee?").arg(QString::fromStdString(FormatMoney(nFeeRequired)));
+ "Do you want to pay the fee?").arg(GUIUtil::formatMoney(nFeeRequired));
QMessageBox::StandardButton retval = QMessageBox::question(
this, tr("Sending..."), strMessage,
QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Yes);
trayIcon->showMessage(tr("Incoming transaction"),
tr("Date: ") + date + "\n" +
- tr("Amount: ") + QString::fromStdString(FormatMoney(amount, true)) + "\n" +
+ tr("Amount: ") + GUIUtil::formatMoney(amount, true) + "\n" +
tr("Type: ") + type + "\n" +
tr("Address: ") + address + "\n",
QSystemTrayIcon::Information);
git://git.novaco.in / novacoin.git / blobdiff