Browse Source

qt: remove redundant wallet methods from bitcoingui

send encryptWallet/backupWallet/changePassphrase directly to walletFrame
pull/1/head
Wladimir J. van der Laan 10 years ago
parent
commit
7e600cd92d
  1. 35
      src/qt/bitcoingui.cpp
  2. 8
      src/qt/bitcoingui.h

35
src/qt/bitcoingui.cpp

@ -77,10 +77,15 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) : @@ -77,10 +77,15 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) :
setUnifiedTitleAndToolBarOnMac(true);
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
#endif
// Create wallet frame and make it the central widget
walletFrame = new WalletFrame(this);
setCentralWidget(walletFrame);
// Accept D&D of URIs
setAcceptDrops(true);
// Create actions for the toolbar, menu bar and tray/dock icon
// Needs walletFrame to be initialized
createActions();
// Create application menu bar
@ -92,10 +97,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) : @@ -92,10 +97,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) :
// Create system tray icon and notification
createTrayIcon();
// Create wallet frame and make it the central widget
walletFrame = new WalletFrame(this);
setCentralWidget(walletFrame);
// Create status bar
statusBar();
@ -246,9 +247,9 @@ void BitcoinGUI::createActions() @@ -246,9 +247,9 @@ void BitcoinGUI::createActions()
connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
connect(toggleHideAction, SIGNAL(triggered()), this, SLOT(toggleHidden()));
connect(encryptWalletAction, SIGNAL(triggered(bool)), this, SLOT(encryptWallet(bool)));
connect(backupWalletAction, SIGNAL(triggered()), this, SLOT(backupWallet()));
connect(changePassphraseAction, SIGNAL(triggered()), this, SLOT(changePassphrase()));
connect(encryptWalletAction, SIGNAL(triggered(bool)), walletFrame, SLOT(encryptWallet(bool)));
connect(backupWalletAction, SIGNAL(triggered()), walletFrame, SLOT(backupWallet()));
connect(changePassphraseAction, SIGNAL(triggered()), walletFrame, SLOT(changePassphrase()));
connect(signMessageAction, SIGNAL(triggered()), this, SLOT(gotoSignMessageTab()));
connect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(gotoVerifyMessageTab()));
}
@ -794,26 +795,6 @@ void BitcoinGUI::setEncryptionStatus(int status) @@ -794,26 +795,6 @@ void BitcoinGUI::setEncryptionStatus(int status)
}
}
void BitcoinGUI::encryptWallet(bool status)
{
walletFrame->encryptWallet(status);
}
void BitcoinGUI::backupWallet()
{
walletFrame->backupWallet();
}
void BitcoinGUI::changePassphrase()
{
walletFrame->changePassphrase();
}
void BitcoinGUI::unlockWallet()
{
walletFrame->unlockWallet();
}
void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
{
// activateWindow() (sometimes) helps with keyboard focus on Windows

8
src/qt/bitcoingui.h

@ -186,14 +186,6 @@ private slots: @@ -186,14 +186,6 @@ private slots:
/** Handle tray icon clicked */
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
#endif
/** Encrypt the wallet */
void encryptWallet(bool status);
/** Backup the wallet */
void backupWallet();
/** Change encrypted wallet passphrase */
void changePassphrase();
/** Ask for passphrase to unlock wallet temporarily */
void unlockWallet();
/** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */
void showNormalIfMinimized(bool fToggleHidden = false);

Loading…
Cancel
Save