#include "addressbookpage.h"
#include "sendcoinsdialog.h"
#include "signverifymessagedialog.h"
+#include "multisigdialog.h"
#include "optionsdialog.h"
#include "aboutdialog.h"
#include "clientmodel.h"
aboutQtAction(0),
trayIcon(0),
notificator(0),
- rpcConsole(0)
+ rpcConsole(0),
+ aboutDialog(0)
{
resize(850, 550);
setWindowTitle(tr("NovaCoin") + " - " + tr("Wallet"));
signVerifyMessageDialog = new SignVerifyMessageDialog(this);
+ multisigPage = new MultisigDialog(this);
+
centralWidget = new QStackedWidget(this);
centralWidget->addWidget(overviewPage);
centralWidget->addWidget(transactionsPage);
// Double-clicking on a transaction on the transaction history page shows details
connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
- rpcConsole = new RPCConsole(this);
+ rpcConsole = new RPCConsole(0);
connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));
+ aboutDialog = new AboutDialog(0);
+
// Clicking on "Verify Message" in the address book sends you to the verify message tab
connect(addressBookPage, SIGNAL(verifyMessage(QString)), this, SLOT(gotoVerifyMessageTab(QString)));
// Clicking on "Sign Message" in the receive coins page sends you to the sign message tab
#ifdef Q_OS_MAC
delete appMenuBar;
#endif
+
+ delete rpcConsole;
+ delete aboutDialog;
}
void BitcoinGUI::createActions()
addressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));
tabGroup->addAction(addressBookAction);
+ multisigAction = new QAction(QIcon(":/icons/send"), tr("Multisig"), this);
+ tabGroup->addAction(multisigAction);
+
connect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage()));
connect(sendCoinsAction, 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()));
+ connect(multisigAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
+ connect(multisigAction, SIGNAL(triggered()), this, SLOT(gotoMultisigPage()));
quitAction = new QAction(QIcon(":/icons/quit"), tr("E&xit"), this);
quitAction->setToolTip(tr("Quit application"));
file->addAction(exportAction);
file->addAction(signMessageAction);
file->addAction(verifyMessageAction);
+ file->addAction(multisigAction);
file->addSeparator();
file->addAction(quitAction);
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)));
receiveCoinsPage->setModel(walletModel->getAddressTableModel());
sendCoinsPage->setModel(walletModel);
signVerifyMessageDialog->setModel(walletModel);
+ multisigPage->setModel(walletModel);
setEncryptionStatus(walletModel->getEncryptionStatus());
connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SLOT(setEncryptionStatus(int)));
#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->addAction(toggleHideAction);
trayIconMenu->addSeparator();
trayIconMenu->addAction(sendCoinsAction);
+ trayIconMenu->addAction(multisigAction);
trayIconMenu->addAction(receiveCoinsAction);
trayIconMenu->addSeparator();
trayIconMenu->addAction(signMessageAction);
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);
+ trayIconMenu->addAction(quitAction);
#endif
-
- notificator = new Notificator(qApp->applicationName(), trayIcon);
+ notificator = new Notificator(QApplication::applicationName(), trayIcon, this);
}
#ifndef Q_OS_MAC
void BitcoinGUI::aboutClicked()
{
- AboutDialog dlg;
- dlg.setModel(clientModel);
- dlg.exec();
+ aboutDialog->setModel(clientModel);
+ aboutDialog->setWindowModality(Qt::ApplicationModal);
+ aboutDialog->show();
}
void BitcoinGUI::setNumConnections(int count)
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));
- uint64 nNetworkWeight = clientModel->getPoSKernelPS();
+ uint64_t 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(nNetworkWeight));
+ labelMiningIcon->setToolTip(QString("<nobr>")+tr("Stake miner is active<br>Kernel rate is %1 k/s<br>CD rate is %2 CD/s<br>Network weight is %3").arg(nKernelsRate).arg(nCoinDaysRate).arg(nNetworkWeight)+QString("<\nobr>"));
}
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();
}
#endif
}
+ // close rpcConsole in case it was open to make some space for the shutdown window
+ rpcConsole->close();
+
QMainWindow::closeEvent(event);
}
signVerifyMessageDialog->setAddress_VM(addr);
}
+void BitcoinGUI::gotoMultisigPage()
+{
+ multisigPage->show();
+ multisigPage->setFocus();
+}
+
void BitcoinGUI::dragEnterEvent(QDragEnterEvent *event)
{
// Accept only URIs
// activateWindow() (sometimes) helps with keyboard focus on Windows
if (isHidden())
{
+ // Make sure the window is not minimized
+ setWindowState(windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
+ // Then show it
show();
+ raise();
activateWindow();
}
else if (isMinimized())
{
showNormal();
+ raise();
activateWindow();
}
else if (GUIUtil::isObscured(this))
{
raise();
activateWindow();
+ if(fToggleHidden)
+ {
+ Sleep(1);
+ if (GUIUtil::isObscured(this))
+ hide();
+ }
}
else if(fToggleHidden)
hide();
git://git.novaco.in / novacoin.git / blobdiff