diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-20 00:29:38 -0700 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-20 00:29:38 -0700 |
commit | 00f198c9a5d494d85a97e0bd6cdf36d9c2d5ff1f (patch) | |
tree | 0444a1d09a2d7f9fd860292c244a755e5572fa00 /src/qt/walletframe.h | |
parent | 896853a011f6681d41bc585e020d74a7f2fece88 (diff) | |
parent | 163145938ca2ff52e633136ca49e89f880f8e89b (diff) |
Merge pull request #3109 from laanwj/2013_10_remove_walletstack
qt: merge walletstack and walletframe
Diffstat (limited to 'src/qt/walletframe.h')
-rw-r--r-- | src/qt/walletframe.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index eaae053ccd..5011987963 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -8,12 +8,17 @@ #define WALLETFRAME_H #include <QFrame> +#include <QMap> class BitcoinGUI; class ClientModel; class SendCoinsRecipient; class WalletModel; -class WalletStack; +class WalletView; + +QT_BEGIN_NAMESPACE +class QStackedWidget; +QT_END_NAMESPACE class WalletFrame : public QFrame { @@ -27,7 +32,7 @@ public: bool addWallet(const QString& name, WalletModel *walletModel); bool setCurrentWallet(const QString& name); - + bool removeWallet(const QString &name); void removeAllWallets(); bool handlePaymentRequest(const SendCoinsRecipient& recipient); @@ -35,7 +40,12 @@ public: void showOutOfSyncWarning(bool fShow); private: - WalletStack *walletStack; + QStackedWidget *walletStack; + BitcoinGUI *gui; + ClientModel *clientModel; + QMap<QString, WalletView*> mapWalletViews; + + bool bOutOfSync; public slots: /** Switch to overview (home) page */ |