#include <QProgressBar>
#include <QStackedWidget>
#include <QDateTime>
+#include <QMovie>
#include <QDebug>
QVBoxLayout *vbox = new QVBoxLayout();
transactionView = new TransactionView(this);
- connect(transactionView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(transactionDetails(const QModelIndex&)));
+ connect(transactionView, SIGNAL(doubleClicked(const QModelIndex&)), transactionView, SLOT(showDetails()));
vbox->addWidget(transactionView);
transactionsPage = new QWidget(this);
// Create status bar
statusBar();
+ // Status bar "Connections" notification
+ QFrame *frameConnections = new QFrame();
+ frameConnections->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+ frameConnections->setMinimumWidth(150);
+ frameConnections->setMaximumWidth(150);
+ QHBoxLayout *frameConnectionsLayout = new QHBoxLayout(frameConnections);
+ frameConnectionsLayout->setContentsMargins(3,0,3,0);
+ frameConnectionsLayout->setSpacing(3);
+ labelConnectionsIcon = new QLabel();
+ labelConnectionsIcon->setToolTip(tr("Number of connections to other clients"));
+ frameConnectionsLayout->addWidget(labelConnectionsIcon);
labelConnections = new QLabel();
- labelConnections->setFrameStyle(QFrame::Panel | QFrame::Sunken);
- labelConnections->setMinimumWidth(150);
- labelConnections->setMaximumWidth(150);
labelConnections->setToolTip(tr("Number of connections to other clients"));
-
+ frameConnectionsLayout->addWidget(labelConnections);
+ frameConnectionsLayout->addStretch();
+
+ // Status bar "Blocks" notification
+ QFrame *frameBlocks = new QFrame();
+ frameBlocks->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+ frameBlocks->setMinimumWidth(150);
+ frameBlocks->setMaximumWidth(150);
+ QHBoxLayout *frameBlocksLayout = new QHBoxLayout(frameBlocks);
+ frameBlocksLayout->setContentsMargins(3,0,3,0);
+ frameBlocksLayout->setSpacing(3);
+ labelBlocksIcon = new QLabel();
+ frameBlocksLayout->addWidget(labelBlocksIcon);
labelBlocks = new QLabel();
- labelBlocks->setFrameStyle(QFrame::Panel | QFrame::Sunken);
- labelBlocks->setMinimumWidth(150);
- labelBlocks->setMaximumWidth(150);
- labelBlocks->setToolTip(tr("Number of blocks in the block chain"));
+ frameBlocksLayout->addWidget(labelBlocks);
+ frameBlocksLayout->addStretch();
// Progress bar for blocks download
progressBarLabel = new QLabel(tr("Synchronizing with network..."));
statusBar()->addWidget(progressBarLabel);
statusBar()->addWidget(progressBar);
- statusBar()->addPermanentWidget(labelConnections);
- statusBar()->addPermanentWidget(labelBlocks);
+ statusBar()->addPermanentWidget(frameConnections);
+ statusBar()->addPermanentWidget(frameBlocks);
createTrayIcon();
+ syncIconMovie = new QMovie(":/movies/update_spinner", "mng", this);
+
gotoOverviewPage();
}
connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
connect(openBitcoinAction, SIGNAL(triggered()), this, SLOT(show()));
- connect(exportAction, SIGNAL(triggered()), this, SLOT(exportClicked()));
}
void BitcoinGUI::setClientModel(ClientModel *clientModel)
{
this->walletModel = walletModel;
- // Keep up to date with wallet
- setBalance(walletModel->getBalance());
- connect(walletModel, SIGNAL(balanceChanged(qint64)), this, SLOT(setBalance(qint64)));
-
- setNumTransactions(walletModel->getNumTransactions());
- connect(walletModel, SIGNAL(numTransactionsChanged(int)), this, SLOT(setNumTransactions(int)));
-
// Report errors from wallet thread
connect(walletModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString)));
// Put transaction list in tabs
- transactionView->setModel(walletModel->getTransactionTableModel());
+ transactionView->setModel(walletModel);
+ overviewPage->setModel(walletModel);
addressBookPage->setModel(walletModel->getAddressTableModel());
receiveCoinsPage->setModel(walletModel->getAddressTableModel());
sendCoinsPage->setModel(walletModel);
dlg.exec();
}
-void BitcoinGUI::setBalance(qint64 balance)
-{
- overviewPage->setBalance(balance);
-}
-
void BitcoinGUI::setNumConnections(int count)
{
QString icon;
case 7: case 8: case 9: icon = ":/icons/connect_3"; break;
default: icon = ":/icons/connect_4"; break;
}
- labelConnections->setTextFormat(Qt::RichText);
- labelConnections->setText("<img src=\""+icon+"\">" + tr("%n connection(s)", "", count));
+ labelConnectionsIcon->setPixmap(QIcon(icon).pixmap(16,16));
+ labelConnections->setText(tr("%n connection(s)", "", count));
}
void BitcoinGUI::setNumBlocks(int count)
{
int total = clientModel->getTotalBlocksEstimate();
+ QString tooltip;
+
if(count < total)
{
progressBarLabel->setVisible(true);
progressBar->setVisible(true);
progressBar->setMaximum(total);
progressBar->setValue(count);
+ tooltip = tr("Downloaded %1 of %2 blocks of transaction history.").arg(count).arg(total);
}
else
{
progressBarLabel->setVisible(false);
progressBar->setVisible(false);
+ tooltip = tr("Downloaded %1 blocks of transaction history.").arg(count);
}
QDateTime now = QDateTime::currentDateTime();
QDateTime lastBlockDate = clientModel->getLastBlockDate();
int secs = lastBlockDate.secsTo(now);
QString text;
- QString icon = ":/icons/notsynced";
+ bool spinning = true;
// "Up to date" icon, and outdated icon
if(secs < 30*60)
{
text = "Up to date";
- icon = ":/icons/synced";
+ spinning = false;
}
else if(secs < 60*60)
{
{
text = tr("%n day(s) ago","",secs/(60*60*24));
}
+ tooltip += QString("\n");
+ tooltip += tr("Last received block was generated %1.").arg(text);
- labelBlocks->setText("<img src=\""+icon+"\"> " + text);
- labelBlocks->setToolTip(tr("%n block(s) in total, last block was generated %1", "", count)
- .arg(QLocale::system().toString(lastBlockDate)));
-}
+ if(spinning)
+ {
+ labelBlocksIcon->setMovie(syncIconMovie);
+ syncIconMovie->start();
+ }
+ else
+ {
+ labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(16,16));
+ }
+ labelBlocks->setText(text);
-void BitcoinGUI::setNumTransactions(int count)
-{
- overviewPage->setNumTransactions(count);
+ labelBlocksIcon->setToolTip(tooltip);
+ labelBlocks->setToolTip(tooltip);
+ progressBarLabel->setToolTip(tooltip);
+ progressBar->setToolTip(tooltip);
}
void BitcoinGUI::error(const QString &title, const QString &message)
*payFee = (retval == QMessageBox::Yes);
}
-void BitcoinGUI::transactionDetails(const QModelIndex& idx)
-{
- // A transaction is doubleclicked
- TransactionDescDialog dlg(idx);
- dlg.exec();
-}
-
void BitcoinGUI::incomingTransaction(const QModelIndex & parent, int start, int end)
{
TransactionTableModel *ttm = walletModel->getTransactionTableModel();
qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent)
.data(Qt::EditRole).toULongLong();
- if(amount>0 && !clientModel->inInitialBlockDownload())
+ if(!clientModel->inInitialBlockDownload())
{
// On incoming transaction, make an info balloon
// Unless the initial block download is in progress, to prevent balloon-spam
QString address = ttm->index(start, TransactionTableModel::ToAddress, parent)
.data().toString();
- trayIcon->showMessage(tr("Incoming transaction"),
+ trayIcon->showMessage((amount)<0 ? tr("Sent transaction") :
+ tr("Incoming transaction"),
tr("Date: ") + date + "\n" +
tr("Amount: ") + GUIUtil::formatMoney(amount, true) + "\n" +
tr("Type: ") + type + "\n" +
{
overviewAction->setChecked(true);
centralWidget->setCurrentWidget(overviewPage);
+
exportAction->setEnabled(false);
+ disconnect(exportAction, SIGNAL(triggered()), 0, 0);
}
void BitcoinGUI::gotoHistoryPage()
{
historyAction->setChecked(true);
centralWidget->setCurrentWidget(transactionsPage);
+
exportAction->setEnabled(true);
+ disconnect(exportAction, SIGNAL(triggered()), 0, 0);
+ connect(exportAction, SIGNAL(triggered()), transactionView, SLOT(exportClicked()));
}
void BitcoinGUI::gotoAddressBookPage()
{
addressBookAction->setChecked(true);
centralWidget->setCurrentWidget(addressBookPage);
- exportAction->setEnabled(false); // TODO
+
+ exportAction->setEnabled(true);
+ disconnect(exportAction, SIGNAL(triggered()), 0, 0);
+ connect(exportAction, SIGNAL(triggered()), addressBookPage, SLOT(exportClicked()));
}
void BitcoinGUI::gotoReceiveCoinsPage()
{
receiveCoinsAction->setChecked(true);
centralWidget->setCurrentWidget(receiveCoinsPage);
- exportAction->setEnabled(false); // TODO
+
+ exportAction->setEnabled(true);
+ disconnect(exportAction, SIGNAL(triggered()), 0, 0);
+ connect(exportAction, SIGNAL(triggered()), receiveCoinsPage, SLOT(exportClicked()));
}
void BitcoinGUI::gotoSendCoinsPage()
{
sendCoinsAction->setChecked(true);
+ sendCoinsPage->clear();
centralWidget->setCurrentWidget(sendCoinsPage);
- exportAction->setEnabled(false);
-}
-void BitcoinGUI::exportClicked()
-{
- // Redirect to the right view, as soon as export for other views
- // (such as address book) is implemented.
- transactionView->exportClicked();
+ exportAction->setEnabled(false);
+ disconnect(exportAction, SIGNAL(triggered()), 0, 0);
}
git://git.novaco.in / novacoin.git / blobdiff