#include "guiutil.h"
#include "ui_interface.h"
#include "rpcconsole.h"
+#include "mintingview.h"
#ifdef Q_OS_MAC
#include "macdockiconhandler.h"
#endif
#include <QApplication>
+#if QT_VERSION < 0x050000
#include <QMainWindow>
+#endif
#include <QMenuBar>
#include <QMenu>
#include <QIcon>
#include <QDateTime>
#include <QMovie>
#include <QFileDialog>
+#if QT_VERSION < 0x050000
#include <QDesktopServices>
+#else
+#include <QStandardPaths>
+#endif
#include <QTimer>
#include <QDragEnterEvent>
+#if QT_VERSION < 0x050000
#include <QUrl>
+#endif
#include <QStyle>
+#include <QMimeData>
#include <iostream>
+extern bool fWalletUnlockMintOnly;
+
BitcoinGUI::BitcoinGUI(QWidget *parent):
QMainWindow(parent),
clientModel(0),
walletModel(0),
encryptWalletAction(0),
+ lockWalletAction(0),
+ unlockWalletAction(0),
+ unlockWalletMiningAction(0),
changePassphraseAction(0),
aboutQtAction(0),
trayIcon(0),
vbox->addWidget(transactionView);
transactionsPage->setLayout(vbox);
+ mintingPage = new QWidget(this);
+ QVBoxLayout *vboxMinting = new QVBoxLayout();
+ mintingView = new MintingView(this);
+ vboxMinting->addWidget(mintingView);
+ mintingPage->setLayout(vboxMinting);
+
addressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab);
receiveCoinsPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab);
centralWidget = new QStackedWidget(this);
centralWidget->addWidget(overviewPage);
centralWidget->addWidget(transactionsPage);
+ centralWidget->addWidget(mintingPage);
centralWidget->addWidget(addressBookPage);
centralWidget->addWidget(receiveCoinsPage);
centralWidget->addWidget(sendCoinsPage);
historyAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));
tabGroup->addAction(historyAction);
+ mintingAction = new QAction(QIcon(":/icons/history"), tr("&Minting"), this);
+ mintingAction->setToolTip(tr("Show your minting capacity"));
+ mintingAction->setCheckable(true);
+ mintingAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));
+ tabGroup->addAction(mintingAction);
+
addressBookAction = new QAction(QIcon(":/icons/address-book"), tr("&Address Book"), this);
addressBookAction->setToolTip(tr("Edit the list of stored addresses and labels"));
addressBookAction->setCheckable(true);
- addressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));
+ addressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));
tabGroup->addAction(addressBookAction);
connect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(receiveCoinsAction, SIGNAL(triggered()), this, SLOT(gotoReceiveCoinsPage()));
connect(historyAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage()));
+ connect(mintingAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
+ connect(mintingAction, SIGNAL(triggered()), this, SLOT(gotoMintingPage()));
connect(addressBookAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(addressBookAction, SIGNAL(triggered()), this, SLOT(gotoAddressBookPage()));
aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About NovaCoin"), this);
aboutAction->setToolTip(tr("Show information about NovaCoin"));
aboutAction->setMenuRole(QAction::AboutRole);
+#if QT_VERSION < 0x050000
aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
+#else
+ aboutQtAction = new QAction(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
+#endif
aboutQtAction->setToolTip(tr("Show information about Qt"));
aboutQtAction->setMenuRole(QAction::AboutQtRole);
optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
signMessageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this);
verifyMessageAction = new QAction(QIcon(":/icons/transaction_0"), tr("&Verify message..."), this);
+ lockWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Lock wallet"), this);
+ lockWalletAction->setToolTip(tr("Lock wallet"));
+ lockWalletAction->setCheckable(true);
+
+ unlockWalletAction = new QAction(QIcon(":/icons/lock_open"), tr("Unlo&ck wallet"), this);
+ unlockWalletAction->setToolTip(tr("Unlock wallet"));
+ unlockWalletAction->setCheckable(true);
+
+ unlockWalletMiningAction = new QAction(QIcon(":/icons/mining_active"), tr("Unlo&ck wallet for mining"), this);
+ unlockWalletMiningAction->setToolTip(tr("Unlock wallet for mining"));
+ unlockWalletMiningAction->setCheckable(true);
+
exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this);
exportAction->setToolTip(tr("Export the data in the current tab to a file"));
openRPCConsoleAction = new QAction(QIcon(":/icons/debugwindow"), tr("&Debug window"), this);
connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
connect(toggleHideAction, SIGNAL(triggered()), this, SLOT(toggleHidden()));
connect(encryptWalletAction, SIGNAL(triggered(bool)), this, SLOT(encryptWallet(bool)));
+ connect(lockWalletAction, SIGNAL(triggered(bool)), this, SLOT(lockWallet()));
+ connect(unlockWalletAction, SIGNAL(triggered(bool)), this, SLOT(unlockWallet()));
+ connect(unlockWalletMiningAction, SIGNAL(triggered(bool)), this, SLOT(unlockWalletMining(bool)));
connect(backupWalletAction, SIGNAL(triggered()), this, SLOT(backupWallet()));
connect(dumpWalletAction, SIGNAL(triggered()), this, SLOT(dumpWallet()));
connect(importWalletAction, SIGNAL(triggered()), this, SLOT(importWallet()));
file->addAction(quitAction);
QMenu *settings = appMenuBar->addMenu(tr("&Settings"));
- settings->addAction(encryptWalletAction);
- settings->addAction(changePassphraseAction);
- settings->addSeparator();
+ QMenu *securityMenu = settings->addMenu(QIcon(":/icons/key"), tr("&Wallet security"));
+ securityMenu->addAction(encryptWalletAction);
+ securityMenu->addAction(changePassphraseAction);
+ securityMenu->addAction(unlockWalletAction);
+ securityMenu->addAction(unlockWalletMiningAction);
+ securityMenu->addAction(lockWalletAction);
settings->addAction(optionsAction);
QMenu *help = appMenuBar->addMenu(tr("&Help"));
toolbar->addAction(sendCoinsAction);
toolbar->addAction(receiveCoinsAction);
toolbar->addAction(historyAction);
+ toolbar->addAction(mintingAction);
toolbar->addAction(addressBookAction);
QToolBar *toolbar2 = addToolBar(tr("Actions toolbar"));
toolbar2->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
toolbar2->addAction(exportAction);
+ toolbar2->setVisible(false);
+
}
void BitcoinGUI::setClientModel(ClientModel *clientModel)
setNumBlocks(clientModel->getNumBlocks(), clientModel->getNumBlocksOfPeers());
connect(clientModel, SIGNAL(numBlocksChanged(int,int)), this, SLOT(setNumBlocks(int,int)));
- connect(clientModel, SIGNAL(numBlocksChanged(int,int)), this, SLOT(updateMining()));
+
+ QTimer *timer = new QTimer(this);
+ connect(timer, SIGNAL(timeout()), this, SLOT(updateMining()));
+ timer->start(10*1000); //10 seconds
// Report errors from network/worker thread
connect(clientModel, SIGNAL(error(QString,QString,bool)), this, SLOT(error(QString,QString,bool)));
// Put transaction list in tabs
transactionView->setModel(walletModel);
+ mintingView->setModel(walletModel);
overviewPage->setModel(walletModel);
addressBookPage->setModel(walletModel->getAddressTableModel());
#else
// Note: On Mac, the dock icon is used to provide the tray's functionality.
MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance();
+ dockIconHandler->setMainWindow((QMainWindow *)this);
trayIconMenu = dockIconHandler->dockMenu();
#endif
trayIconMenu->addSeparator();
trayIconMenu->addAction(optionsAction);
trayIconMenu->addAction(openRPCConsoleAction);
-#ifndef Q_OS_MAC // This is built-in on Mac
+#ifndef Q_OS_MAC
+ // This is built-in on Mac
trayIconMenu->addSeparator();
trayIconMenu->addAction(quitAction);
-#endif
- notificator = new Notificator(qApp->applicationName(), trayIcon);
+ notificator = new Notificator(qApp->applicationName(), trayIcon, 0);
+#endif
}
#ifndef Q_OS_MAC
return;
}
- uint64 nMinWeight = 0, nMaxWeight = 0, nTotalWeight = 0;
- walletModel->getStakeWeight(nMinWeight, nMaxWeight, nTotalWeight);
+ float nKernelsRate = 0, nCoinDaysRate = 0;
+ walletModel->getStakeStats(nKernelsRate, nCoinDaysRate);
- if (nTotalWeight > 0)
+ if (nKernelsRate > 0)
{
labelMiningIcon->setPixmap(QIcon(":/icons/mining_active").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
- double dNetworkWeight = clientModel->getPoSKernelPS();
+ uint64 nNetworkWeight = clientModel->getPoSKernelPS();
/*
double dDifficulty = clientModel->getDifficulty(true);
QString msg;
labelMiningIcon->setToolTip(tr("Stake miner is active\nYour current stake weight is %1\nNetwork weight is %2\nAverage block generation time is %3").arg(nTotalWeight).arg(dNetworkWeight).arg(msg));
*/
- labelMiningIcon->setToolTip(tr("Stake miner is active\nYour current stake weight is %1\nNetwork weight is %2").arg(nTotalWeight).arg(dNetworkWeight));
+ labelMiningIcon->setToolTip(tr("Stake miner is active\nKernel rate is %1 k/s\nCD rate is %2 CD/s\nNetwork weight is %3").arg(nKernelsRate).arg(nCoinDaysRate).arg(nNetworkWeight));
}
else
labelMiningIcon->setToolTip(tr("No suitable inputs were found"));
if(clientModel)
{
#ifndef Q_OS_MAC // Ignored on Mac
- if(!clientModel->getOptionsModel()->getMinimizeToTray() &&
- !clientModel->getOptionsModel()->getMinimizeOnClose())
+ if(!clientModel->getOptionsModel()->getMinimizeOnClose())
{
qApp->quit();
}
connect(exportAction, SIGNAL(triggered()), transactionView, SLOT(exportClicked()));
}
+void BitcoinGUI::gotoMintingPage()
+{
+ mintingAction->setChecked(true);
+ centralWidget->setCurrentWidget(mintingPage);
+
+ exportAction->setEnabled(true);
+ disconnect(exportAction, SIGNAL(triggered()), 0, 0);
+ connect(exportAction, SIGNAL(triggered()), mintingView, SLOT(exportClicked()));
+}
+
+
void BitcoinGUI::gotoAddressBookPage()
{
addressBookAction->setChecked(true);
labelEncryptionIcon->hide();
encryptWalletAction->setChecked(false);
changePassphraseAction->setEnabled(false);
+ lockWalletAction->setEnabled(false);
+ unlockWalletAction->setEnabled(false);
+ unlockWalletMiningAction->setEnabled(false);
encryptWalletAction->setEnabled(true);
break;
case WalletModel::Unlocked:
encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true);
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
+
+ lockWalletAction->setEnabled(true);
+ lockWalletAction->setChecked(false);
+ unlockWalletAction->setEnabled(false);
+ unlockWalletMiningAction->setEnabled(false);
+
+ if (fWalletUnlockMintOnly)
+ unlockWalletMiningAction->setChecked(true);
+ else
+ unlockWalletAction->setChecked(true);
+
break;
case WalletModel::Locked:
labelEncryptionIcon->show();
encryptWalletAction->setChecked(true);
changePassphraseAction->setEnabled(true);
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
+
+ lockWalletAction->setChecked(true);
+ unlockWalletAction->setChecked(false);
+ unlockWalletMiningAction->setChecked(false);
+
+ lockWalletAction->setEnabled(false);
+ unlockWalletAction->setEnabled(true);
+ unlockWalletMiningAction->setEnabled(true);
break;
}
}
setEncryptionStatus(walletModel->getEncryptionStatus());
}
+void BitcoinGUI::unlockWalletMining(bool status)
+{
+ if(!walletModel)
+ return;
+
+ // Unlock wallet when requested by wallet model
+ if(walletModel->getEncryptionStatus() == WalletModel::Locked)
+ {
+ AskPassphraseDialog dlg(AskPassphraseDialog::UnlockMining, this);
+ dlg.setModel(walletModel);
+ dlg.exec();
+ }
+}
+
void BitcoinGUI::backupWallet()
{
+#if QT_VERSION < 0x050000
QString saveDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+#else
+ QString saveDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+#endif
QString filename = QFileDialog::getSaveFileName(this, tr("Backup Wallet"), saveDir, tr("Wallet Data (*.dat)"));
if(!filename.isEmpty()) {
if(!walletModel->backupWallet(filename)) {
}
}
+void BitcoinGUI::lockWallet()
+{
+ if(!walletModel)
+ return;
+
+ walletModel->setWalletLocked(true);
+}
+
void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
{
// activateWindow() (sometimes) helps with keyboard focus on Windows
git://git.novaco.in / novacoin.git / blobdiff