Disallow duplicate windows.
This commit is contained in:
parent
536207f316
commit
5ffaaba3a1
4 changed files with 21 additions and 11 deletions
|
@ -97,6 +97,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
|
|||
trayIconMenu(0),
|
||||
notificator(0),
|
||||
rpcConsole(0),
|
||||
helpMessageDialog(0),
|
||||
prevBlocks(0),
|
||||
spinnerFrame(0),
|
||||
platformStyle(platformStyle)
|
||||
|
@ -132,6 +133,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
|
|||
#endif
|
||||
|
||||
rpcConsole = new RPCConsole(platformStyle, 0);
|
||||
helpMessageDialog = new HelpMessageDialog(this, false);
|
||||
#ifdef ENABLE_WALLET
|
||||
if(enableWallet)
|
||||
{
|
||||
|
@ -590,9 +592,7 @@ void BitcoinGUI::aboutClicked()
|
|||
|
||||
void BitcoinGUI::showHelpMessageClicked()
|
||||
{
|
||||
HelpMessageDialog *help = new HelpMessageDialog(this, false);
|
||||
help->setAttribute(Qt::WA_DeleteOnClose);
|
||||
help->show();
|
||||
helpMessageDialog->show();
|
||||
}
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
|
|
|
@ -28,6 +28,7 @@ class SendCoinsRecipient;
|
|||
class UnitDisplayStatusBarControl;
|
||||
class WalletFrame;
|
||||
class WalletModel;
|
||||
class HelpMessageDialog;
|
||||
|
||||
class CWallet;
|
||||
|
||||
|
@ -113,6 +114,7 @@ private:
|
|||
QMenu *trayIconMenu;
|
||||
Notificator *notificator;
|
||||
RPCConsole *rpcConsole;
|
||||
HelpMessageDialog *helpMessageDialog;
|
||||
|
||||
/** Keep track of previous number of blocks, to detect progress */
|
||||
int prevBlocks;
|
||||
|
|
|
@ -56,6 +56,9 @@ WalletView::WalletView(const PlatformStyle *platformStyle, QWidget *parent):
|
|||
receiveCoinsPage = new ReceiveCoinsDialog(platformStyle);
|
||||
sendCoinsPage = new SendCoinsDialog(platformStyle);
|
||||
|
||||
usedSendingAddressesPage = new AddressBookPage(platformStyle, AddressBookPage::ForEditing, AddressBookPage::SendingTab, this);
|
||||
usedReceivingAddressesPage = new AddressBookPage(platformStyle, AddressBookPage::ForEditing, AddressBookPage::ReceivingTab, this);
|
||||
|
||||
addWidget(overviewPage);
|
||||
addWidget(transactionsPage);
|
||||
addWidget(receiveCoinsPage);
|
||||
|
@ -115,6 +118,8 @@ void WalletView::setWalletModel(WalletModel *walletModel)
|
|||
overviewPage->setWalletModel(walletModel);
|
||||
receiveCoinsPage->setModel(walletModel);
|
||||
sendCoinsPage->setModel(walletModel);
|
||||
usedReceivingAddressesPage->setModel(walletModel->getAddressTableModel());
|
||||
usedSendingAddressesPage->setModel(walletModel->getAddressTableModel());
|
||||
|
||||
if (walletModel)
|
||||
{
|
||||
|
@ -273,20 +278,20 @@ void WalletView::usedSendingAddresses()
|
|||
{
|
||||
if(!walletModel)
|
||||
return;
|
||||
AddressBookPage *dlg = new AddressBookPage(platformStyle, AddressBookPage::ForEditing, AddressBookPage::SendingTab, this);
|
||||
dlg->setAttribute(Qt::WA_DeleteOnClose);
|
||||
dlg->setModel(walletModel->getAddressTableModel());
|
||||
dlg->show();
|
||||
|
||||
usedSendingAddressesPage->show();
|
||||
usedSendingAddressesPage->raise();
|
||||
usedSendingAddressesPage->activateWindow();
|
||||
}
|
||||
|
||||
void WalletView::usedReceivingAddresses()
|
||||
{
|
||||
if(!walletModel)
|
||||
return;
|
||||
AddressBookPage *dlg = new AddressBookPage(platformStyle, AddressBookPage::ForEditing, AddressBookPage::ReceivingTab, this);
|
||||
dlg->setAttribute(Qt::WA_DeleteOnClose);
|
||||
dlg->setModel(walletModel->getAddressTableModel());
|
||||
dlg->show();
|
||||
|
||||
usedReceivingAddressesPage->show();
|
||||
usedReceivingAddressesPage->raise();
|
||||
usedReceivingAddressesPage->activateWindow();
|
||||
}
|
||||
|
||||
void WalletView::showProgress(const QString &title, int nProgress)
|
||||
|
|
|
@ -18,6 +18,7 @@ class SendCoinsDialog;
|
|||
class SendCoinsRecipient;
|
||||
class TransactionView;
|
||||
class WalletModel;
|
||||
class AddressBookPage;
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QModelIndex;
|
||||
|
@ -61,6 +62,8 @@ private:
|
|||
QWidget *transactionsPage;
|
||||
ReceiveCoinsDialog *receiveCoinsPage;
|
||||
SendCoinsDialog *sendCoinsPage;
|
||||
AddressBookPage *usedSendingAddressesPage;
|
||||
AddressBookPage *usedReceivingAddressesPage;
|
||||
|
||||
TransactionView *transactionView;
|
||||
|
||||
|
|
Loading…
Reference in a new issue