X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Fbitcoingui.cpp;h=2dfcd40df3172a48612c4dcc89d82e5b9d2b0bf2;hb=6cab66354d5523ec3f977cfe8c4028a4c42a693d;hp=c08476cec3fbe0d78ff7fcd41aeeedd191ae19dc;hpb=ba4081c1fcaddf361abd61b2721994eff5475bb3;p=novacoin.git

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index c08476c..2dfcd40 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -36,6 +36,7 @@
 #include <QSortFilterProxyModel>
 #include <QClipboard>
 #include <QMessageBox>
+#include <QProgressBar>
 
 #include <QDebug>
 
@@ -71,7 +72,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
 
     // Address: <address>: New... : Paste to clipboard
     QHBoxLayout *hbox_address = new QHBoxLayout();
-    hbox_address->addWidget(new QLabel(tr("Your Bitcoin Address:")));
+    hbox_address->addWidget(new QLabel(tr("Your Bitcoin address:")));
     address = new QLineEdit();
     address->setReadOnly(true);
     address->setFont(GUIUtil::bitcoinAddressFont());
@@ -108,12 +109,12 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     
     // Create status bar
     statusBar();
-    
+
     labelConnections = new QLabel();
     labelConnections->setFrameStyle(QFrame::Panel | QFrame::Sunken);
-    labelConnections->setMinimumWidth(130);
+    labelConnections->setMinimumWidth(150);
     labelConnections->setToolTip(tr("Number of connections to other clients"));
-    
+
     labelBlocks = new QLabel();
     labelBlocks->setFrameStyle(QFrame::Panel | QFrame::Sunken);
     labelBlocks->setMinimumWidth(130);
@@ -124,10 +125,19 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     labelTransactions->setMinimumWidth(130);
     labelTransactions->setToolTip(tr("Number of transactions in your wallet"));
 
+    // Progress bar for blocks download
+    progressBarLabel = new QLabel(tr("Downloading initial data..."));
+    progressBarLabel->setVisible(false);
+    progressBar = new QProgressBar();
+    progressBar->setToolTip(tr("Initial block chain download in progress"));
+    progressBar->setVisible(false);
+
+    statusBar()->addWidget(progressBarLabel);
+    statusBar()->addWidget(progressBar);
     statusBar()->addPermanentWidget(labelConnections);
     statusBar()->addPermanentWidget(labelBlocks);
     statusBar()->addPermanentWidget(labelTransactions);
-     
+
     // Action bindings
     connect(button_new, SIGNAL(clicked()), this, SLOT(newAddressClicked()));
     connect(button_clipboard, SIGNAL(clicked()), this, SLOT(copyClipboardClicked()));
@@ -145,7 +155,7 @@ void BitcoinGUI::createActions()
     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 = new QAction(QIcon(":/icons/receiving_addresses"), tr("Your &Receiving Addresses..."), this);
     receivingAddresses->setToolTip(tr("Show the list of receiving addresses and edit their labels"));
     options = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
     options->setToolTip(tr("Modify configuration options for bitcoin"));
@@ -261,7 +271,7 @@ void BitcoinGUI::setTabsModel(QAbstractItemModel *transaction_model)
         transaction_table->verticalHeader()->hide();
 
         transaction_table->horizontalHeader()->resizeSection(
-                TransactionTableModel::Status, 120);
+                TransactionTableModel::Status, 23);
         transaction_table->horizontalHeader()->resizeSection(
                 TransactionTableModel::Date, 120);
         transaction_table->horizontalHeader()->setResizeMode(
@@ -285,7 +295,7 @@ void BitcoinGUI::sendcoinsClicked()
 
 void BitcoinGUI::addressbookClicked()
 {
-    AddressBookDialog dlg;
+    AddressBookDialog dlg(AddressBookDialog::ForEditing);
     dlg.setModel(model->getAddressTableModel());
     dlg.setTab(AddressBookDialog::SendingTab);
     dlg.exec();
@@ -293,7 +303,7 @@ void BitcoinGUI::addressbookClicked()
 
 void BitcoinGUI::receivingAddressesClicked()
 {
-    AddressBookDialog dlg;
+    AddressBookDialog dlg(AddressBookDialog::ForEditing);
     dlg.setModel(model->getAddressTableModel());
     dlg.setTab(AddressBookDialog::ReceivingTab);
     dlg.exec();
@@ -345,11 +355,35 @@ void BitcoinGUI::setAddress(const QString &addr)
 
 void BitcoinGUI::setNumConnections(int count)
 {
-    labelConnections->setText(QLocale::system().toString(count)+" "+tr("connections(s)", "", count));
+    QString icon;
+    switch(count)
+    {
+    case 0: icon = ":/icons/connect_0"; break;
+    case 1: case 2: case 3: icon = ":/icons/connect_1"; break;
+    case 4: case 5: case 6: icon = ":/icons/connect_2"; break;
+    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+"\"> " + QLocale::system().toString(count)+" "+tr("connection(s)", "", count));
 }
 
 void BitcoinGUI::setNumBlocks(int count)
 {
+    int total = model->getTotalBlocksEstimate();
+    if(count < total)
+    {
+        progressBarLabel->setVisible(true);
+        progressBar->setVisible(true);
+        progressBar->setMaximum(total);
+        progressBar->setValue(count);
+    }
+    else
+    {
+        progressBarLabel->setVisible(false);
+        progressBar->setVisible(false);
+    }
+
     labelBlocks->setText(QLocale::system().toString(count)+" "+tr("block(s)", "", count));
 }
 
@@ -419,7 +453,7 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
 
 void BitcoinGUI::transactionDetails(const QModelIndex& idx)
 {
-    /* A transaction is doubleclicked */
+    // A transaction is doubleclicked
     TransactionDescDialog dlg(idx);
     dlg.exec();
 }
@@ -431,9 +465,10 @@ void BitcoinGUI::incomingTransaction(const QModelIndex & parent, int start, int
                     .data(Qt::EditRole).toULongLong();
     qint64 debit = ttm->index(start, TransactionTableModel::Debit, parent)
                     .data(Qt::EditRole).toULongLong();
-    if((credit+debit)>0)
+    if((credit+debit)>0 && !model->inInitialBlockDownload())
     {
-        /* On incoming transaction, make an info balloon */
+        // On incoming transaction, make an info balloon
+        // Unless the initial block download is in progress, to prevent balloon-spam
         QString date = ttm->index(start, TransactionTableModel::Date, parent)
                         .data().toString();
         QString description = ttm->index(start, TransactionTableModel::Description, parent)