From ba4081c1fcaddf361abd61b2721994eff5475bb3 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sat, 11 Jun 2011 22:11:58 +0200 Subject: move back to original directory structure --- src/qt/bitcoingui.h | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 src/qt/bitcoingui.h (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h new file mode 100644 index 0000000000..96452ef18b --- /dev/null +++ b/src/qt/bitcoingui.h @@ -0,0 +1,88 @@ +#ifndef BITCOINGUI_H +#define BITCOINGUI_H + +#include +#include + +class TransactionTableModel; +class ClientModel; + +QT_BEGIN_NAMESPACE +class QLabel; +class QLineEdit; +class QTableView; +class QAbstractItemModel; +class QModelIndex; +QT_END_NAMESPACE + +class BitcoinGUI : public QMainWindow +{ + Q_OBJECT +public: + explicit BitcoinGUI(QWidget *parent = 0); + void setModel(ClientModel *model); + + /* Transaction table tab indices */ + enum { + AllTransactions = 0, + SentReceived = 1, + Sent = 2, + Received = 3 + } TabIndex; + +protected: + void changeEvent(QEvent *e); + void closeEvent(QCloseEvent *event); + +private: + ClientModel *model; + + QLineEdit *address; + QLabel *labelBalance; + QLabel *labelConnections; + QLabel *labelBlocks; + QLabel *labelTransactions; + + QAction *quit; + QAction *sendcoins; + QAction *addressbook; + QAction *about; + QAction *receivingAddresses; + QAction *options; + QAction *openBitcoin; + + QSystemTrayIcon *trayIcon; + QList transactionViews; + + void createActions(); + QWidget *createTabs(); + void createTrayIcon(); + void setTabsModel(QAbstractItemModel *transaction_model); + +public slots: + void setBalance(qint64 balance); + void setAddress(const QString &address); + void setNumConnections(int count); + void setNumBlocks(int count); + void setNumTransactions(int count); + void error(const QString &title, const QString &message); + /* It is currently not possible to pass a return value to another thread through + BlockingQueuedConnection, so use an indirected pointer. + http://bugreports.qt.nokia.com/browse/QTBUG-10440 + */ + void askFee(qint64 nFeeRequired, bool *payFee); + +private slots: + void sendcoinsClicked(); + void addressbookClicked(); + void optionsClicked(); + void receivingAddressesClicked(); + void aboutClicked(); + void newAddressClicked(); + void copyClipboardClicked(); + void trayIconActivated(QSystemTrayIcon::ActivationReason reason); + void transactionDetails(const QModelIndex& idx); + void incomingTransaction(const QModelIndex & parent, int start, int end); +}; + +#endif -- cgit v1.2.3 From b1ef1b24ced1e8360d1bf62b9fefbc960cdd19be Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 14 Jun 2011 21:34:51 +0200 Subject: add connection meter --- src/qt/bitcoingui.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 96452ef18b..e1b3ef1783 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -40,6 +40,7 @@ private: QLineEdit *address; QLabel *labelBalance; QLabel *labelConnections; + QLabel *labelConnectionsIcon; QLabel *labelBlocks; QLabel *labelTransactions; -- cgit v1.2.3 From 6cab66354d5523ec3f977cfe8c4028a4c42a693d Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sat, 18 Jun 2011 21:25:38 +0200 Subject: On initial block chain download, show a progress bar --- src/qt/bitcoingui.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index e1b3ef1783..b3559c3bcd 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -13,6 +13,7 @@ class QLineEdit; class QTableView; class QAbstractItemModel; class QModelIndex; +class QProgressBar; QT_END_NAMESPACE class BitcoinGUI : public QMainWindow @@ -43,6 +44,8 @@ private: QLabel *labelConnectionsIcon; QLabel *labelBlocks; QLabel *labelTransactions; + QLabel *progressBarLabel; + QProgressBar *progressBar; QAction *quit; QAction *sendcoins; -- cgit v1.2.3 From ceb6d4e11d8dab8a6778e20c433f6ed989c16221 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 28 Jun 2011 21:41:56 +0200 Subject: Implement filter row instead of tabs, allows for more expressive filters --- src/qt/bitcoingui.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index b3559c3bcd..f6241a476d 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -6,6 +6,7 @@ class TransactionTableModel; class ClientModel; +class TransactionView; QT_BEGIN_NAMESPACE class QLabel; @@ -56,12 +57,11 @@ private: QAction *openBitcoin; QSystemTrayIcon *trayIcon; - QList transactionViews; + TransactionView *transactionView; void createActions(); QWidget *createTabs(); void createTrayIcon(); - void setTabsModel(QAbstractItemModel *transaction_model); public slots: void setBalance(qint64 balance); -- cgit v1.2.3 From ef079e183bf1be9f5a61a05018ee4480db86bc45 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 30 Jun 2011 18:05:29 +0200 Subject: Split off WalletModel from ClientModel, to be able to support multi-wallets in future --- src/qt/bitcoingui.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index f6241a476d..41b665c274 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -6,6 +6,7 @@ class TransactionTableModel; class ClientModel; +class WalletModel; class TransactionView; QT_BEGIN_NAMESPACE @@ -22,7 +23,8 @@ class BitcoinGUI : public QMainWindow Q_OBJECT public: explicit BitcoinGUI(QWidget *parent = 0); - void setModel(ClientModel *model); + void setClientModel(ClientModel *clientModel); + void setWalletModel(WalletModel *walletModel); /* Transaction table tab indices */ enum { @@ -37,7 +39,8 @@ protected: void closeEvent(QCloseEvent *event); private: - ClientModel *model; + ClientModel *clientModel; + WalletModel *walletModel; QLineEdit *address; QLabel *labelBalance; -- cgit v1.2.3 From e5b47b4328ce3de8e657430bf38c8051d59df298 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 1 Jul 2011 21:41:14 +0200 Subject: Remove "default address" from main GUI screen, it only confuses people --- src/qt/bitcoingui.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 41b665c274..954953727e 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -42,7 +42,6 @@ private: ClientModel *clientModel; WalletModel *walletModel; - QLineEdit *address; QLabel *labelBalance; QLabel *labelConnections; QLabel *labelConnectionsIcon; @@ -68,7 +67,6 @@ private: public slots: void setBalance(qint64 balance); - void setAddress(const QString &address); void setNumConnections(int count); void setNumBlocks(int count); void setNumTransactions(int count); @@ -85,8 +83,6 @@ private slots: void optionsClicked(); void receivingAddressesClicked(); void aboutClicked(); - void newAddressClicked(); - void copyClipboardClicked(); void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void transactionDetails(const QModelIndex& idx); void incomingTransaction(const QModelIndex & parent, int start, int end); -- cgit v1.2.3 From bb82fdb543b90cee0026784ed32d705d468aacbb Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sat, 2 Jul 2011 10:13:29 +0200 Subject: "Receive coins" instead of "Receiving addresses" --- src/qt/bitcoingui.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 954953727e..046186c562 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -51,10 +51,10 @@ private: QProgressBar *progressBar; QAction *quit; - QAction *sendcoins; + QAction *sendCoins; QAction *addressbook; QAction *about; - QAction *receivingAddresses; + QAction *receiveCoins; QAction *options; QAction *openBitcoin; @@ -78,10 +78,10 @@ public slots: void askFee(qint64 nFeeRequired, bool *payFee); private slots: - void sendcoinsClicked(); + void sendCoinsClicked(); void addressbookClicked(); void optionsClicked(); - void receivingAddressesClicked(); + void receiveCoinsClicked(); void aboutClicked(); void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void transactionDetails(const QModelIndex& idx); -- cgit v1.2.3 From 64c8b6994881ba2715cb08f48b406aaf1f28603c Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 5 Jul 2011 22:09:39 +0200 Subject: tab reorg phase 1: split main gui into "overview" and "history" --- src/qt/bitcoingui.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 046186c562..432a9e3b04 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -8,6 +8,7 @@ class TransactionTableModel; class ClientModel; class WalletModel; class TransactionView; +class OverviewPage; QT_BEGIN_NAMESPACE class QLabel; @@ -16,6 +17,7 @@ class QTableView; class QAbstractItemModel; class QModelIndex; class QProgressBar; +class QStackedWidget; QT_END_NAMESPACE class BitcoinGUI : public QMainWindow @@ -42,7 +44,10 @@ private: ClientModel *clientModel; WalletModel *walletModel; - QLabel *labelBalance; + QStackedWidget *centralWidget; + OverviewPage *overviewPage; + QWidget *transactionsPage; + QLabel *labelConnections; QLabel *labelConnectionsIcon; QLabel *labelBlocks; @@ -50,6 +55,8 @@ private: QLabel *progressBarLabel; QProgressBar *progressBar; + QAction *overviewAction; + QAction *historyAction; QAction *quit; QAction *sendCoins; QAction *addressbook; @@ -86,6 +93,9 @@ private slots: void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void transactionDetails(const QModelIndex& idx); void incomingTransaction(const QModelIndex & parent, int start, int end); + + void gotoOverviewTab(); + void gotoHistoryTab(); }; #endif -- cgit v1.2.3 From d52a0f3bca2c8df8360308b062185d803e34f0d9 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 7 Jul 2011 10:59:00 +0200 Subject: Rename "History" tab to more logical "Transactions", move "Number of transactions" from status bar to overview page --- src/qt/bitcoingui.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 432a9e3b04..e04bcf915c 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -51,7 +51,6 @@ private: QLabel *labelConnections; QLabel *labelConnectionsIcon; QLabel *labelBlocks; - QLabel *labelTransactions; QLabel *progressBarLabel; QProgressBar *progressBar; -- cgit v1.2.3 From fbaee7a8533b23d846ee16837320f709c4e83d47 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 7 Jul 2011 14:27:16 +0200 Subject: Export functionality for transaction list --- src/qt/bitcoingui.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index e04bcf915c..a5fcc8a83a 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -63,6 +63,7 @@ private: QAction *receiveCoins; QAction *options; QAction *openBitcoin; + QAction *exportAction; QSystemTrayIcon *trayIcon; TransactionView *transactionView; @@ -92,6 +93,7 @@ private slots: void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void transactionDetails(const QModelIndex& idx); void incomingTransaction(const QModelIndex & parent, int start, int end); + void exportClicked(); void gotoOverviewTab(); void gotoHistoryTab(); -- cgit v1.2.3 From 3479849dc47acd2fb1e191ea690a0c507a97bb73 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 7 Jul 2011 17:33:15 +0200 Subject: convert to full tab-based ui --- src/qt/bitcoingui.h | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index a5fcc8a83a..8c3632a3a6 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -9,6 +9,8 @@ class ClientModel; class WalletModel; class TransactionView; class OverviewPage; +class AddressBookPage; +class SendCoinsDialog; QT_BEGIN_NAMESPACE class QLabel; @@ -45,8 +47,12 @@ private: WalletModel *walletModel; QStackedWidget *centralWidget; + OverviewPage *overviewPage; QWidget *transactionsPage; + AddressBookPage *addressBookPage; + AddressBookPage *receiveCoinsPage; + SendCoinsDialog *sendCoinsPage; QLabel *labelConnections; QLabel *labelConnectionsIcon; @@ -56,13 +62,13 @@ private: QAction *overviewAction; QAction *historyAction; - QAction *quit; - QAction *sendCoins; - QAction *addressbook; - QAction *about; - QAction *receiveCoins; - QAction *options; - QAction *openBitcoin; + QAction *quitAction; + QAction *sendCoinsAction; + QAction *addressBookAction; + QAction *aboutAction; + QAction *receiveCoinsAction; + QAction *optionsAction; + QAction *openBitcoinAction; QAction *exportAction; QSystemTrayIcon *trayIcon; @@ -85,18 +91,20 @@ public slots: void askFee(qint64 nFeeRequired, bool *payFee); private slots: - void sendCoinsClicked(); - void addressbookClicked(); + // UI pages + void gotoOverviewPage(); + void gotoHistoryPage(); + void gotoAddressBookPage(); + void gotoReceiveCoinsPage(); + void gotoSendCoinsPage(); + + // Misc actions void optionsClicked(); - void receiveCoinsClicked(); void aboutClicked(); void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void transactionDetails(const QModelIndex& idx); void incomingTransaction(const QModelIndex & parent, int start, int end); void exportClicked(); - - void gotoOverviewTab(); - void gotoHistoryTab(); }; #endif -- cgit v1.2.3 From 51d7cc07f10209ac12bd5286391e3c8b095abd34 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 8 Jul 2011 22:27:36 +0200 Subject: Add context menu on transaction list: copy label, copy address, edit label, show details --- src/qt/bitcoingui.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 8c3632a3a6..b82818aa3f 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -102,7 +102,6 @@ private slots: void optionsClicked(); void aboutClicked(); void trayIconActivated(QSystemTrayIcon::ActivationReason reason); - void transactionDetails(const QModelIndex& idx); void incomingTransaction(const QModelIndex & parent, int start, int end); void exportClicked(); }; -- cgit v1.2.3 From f54d59ba4a9136a79734ac399433b0e74b1bec00 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sat, 9 Jul 2011 10:53:55 +0200 Subject: add export functionality for address book / receiving addresses --- src/qt/bitcoingui.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index b82818aa3f..6f4ca19146 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -103,7 +103,6 @@ private slots: void aboutClicked(); void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void incomingTransaction(const QModelIndex & parent, int start, int end); - void exportClicked(); }; #endif -- cgit v1.2.3 From df5ccbd2b2c72039f1e0e69fc51957f7c2d6068d Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 11 Jul 2011 20:42:10 +0200 Subject: Show unconfirmed balance on overview page --- src/qt/bitcoingui.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 6f4ca19146..95e0eb70fe 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -79,10 +79,8 @@ private: void createTrayIcon(); public slots: - void setBalance(qint64 balance); void setNumConnections(int count); void setNumBlocks(int count); - void setNumTransactions(int count); void error(const QString &title, const QString &message); /* It is currently not possible to pass a return value to another thread through BlockingQueuedConnection, so use an indirected pointer. -- cgit v1.2.3 From 8dcffd4d0717e71226da8c3a848b7b6905074637 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sun, 17 Jul 2011 17:30:58 +0200 Subject: show rotating spinner when block download out of date, tick otherwise --- src/qt/bitcoingui.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 95e0eb70fe..4fc17dd36f 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -57,6 +57,7 @@ private: QLabel *labelConnections; QLabel *labelConnectionsIcon; QLabel *labelBlocks; + QLabel *labelBlocksIcon; QLabel *progressBarLabel; QProgressBar *progressBar; @@ -74,6 +75,8 @@ private: QSystemTrayIcon *trayIcon; TransactionView *transactionView; + QMovie *syncIconMovie; + void createActions(); QWidget *createTabs(); void createTrayIcon(); -- cgit v1.2.3 From 2351a3fc9f32568a3e90b01f6d9ee9d0cc6b281e Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 4 Aug 2011 19:04:42 +0200 Subject: minimize amount of text in status bar; show only icons, if the user wants explanation they can view the tooltip --- src/qt/bitcoingui.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 4fc17dd36f..c48fa8cfd8 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -54,9 +54,7 @@ private: AddressBookPage *receiveCoinsPage; SendCoinsDialog *sendCoinsPage; - QLabel *labelConnections; QLabel *labelConnectionsIcon; - QLabel *labelBlocks; QLabel *labelBlocksIcon; QLabel *progressBarLabel; QProgressBar *progressBar; -- cgit v1.2.3 From db7f023417eeeb96eed35c9d06541544abcd7033 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sun, 7 Aug 2011 16:04:48 +0200 Subject: Accept "bitcoin:" URL drops from browsers --- src/qt/bitcoingui.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index c48fa8cfd8..377da72611 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -20,6 +20,7 @@ class QAbstractItemModel; class QModelIndex; class QProgressBar; class QStackedWidget; +class QUrl; QT_END_NAMESPACE class BitcoinGUI : public QMainWindow @@ -41,6 +42,8 @@ public: protected: void changeEvent(QEvent *e); void closeEvent(QCloseEvent *event); + void dragEnterEvent(QDragEnterEvent *event); + void dropEvent(QDropEvent *event); private: ClientModel *clientModel; -- cgit v1.2.3 From ae8adeb90abb334b8e5712124e62461eca77c12f Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 23 Aug 2011 20:08:42 +0200 Subject: Wallet encryption part 1: show wallet encryption status --- src/qt/bitcoingui.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 377da72611..4b7131710c 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -57,6 +57,7 @@ private: AddressBookPage *receiveCoinsPage; SendCoinsDialog *sendCoinsPage; + QLabel *labelEncryptionIcon; QLabel *labelConnectionsIcon; QLabel *labelBlocksIcon; QLabel *progressBarLabel; @@ -85,6 +86,8 @@ private: public slots: void setNumConnections(int count); void setNumBlocks(int count); + void setEncryptionStatus(int status); + void error(const QString &title, const QString &message); /* It is currently not possible to pass a return value to another thread through BlockingQueuedConnection, so use an indirected pointer. -- cgit v1.2.3 From b7bcaf940d27fa8cfe89422943fbeaab7a350930 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 24 Aug 2011 22:07:26 +0200 Subject: Wallet encryption part 2: ask passphrase when needed, add menu options --- src/qt/bitcoingui.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 4b7131710c..484987ca68 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -73,6 +73,8 @@ private: QAction *optionsAction; QAction *openBitcoinAction; QAction *exportAction; + QAction *encryptWalletAction; + QAction *changePassphraseAction; QSystemTrayIcon *trayIcon; TransactionView *transactionView; @@ -108,6 +110,9 @@ private slots: void aboutClicked(); void trayIconActivated(QSystemTrayIcon::ActivationReason reason); void incomingTransaction(const QModelIndex & parent, int start, int end); + void encryptWallet(bool status); + void changePassphrase(); + void unlockWallet(); }; #endif -- cgit v1.2.3 From cf9195c8085bade8076e064c043756024fcafa5a Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sat, 3 Sep 2011 20:52:54 +0200 Subject: (k)ubuntu 10.04+ notification support (based on @zwierzak his code) --- src/qt/bitcoingui.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 484987ca68..59661350c3 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -11,6 +11,7 @@ class TransactionView; class OverviewPage; class AddressBookPage; class SendCoinsDialog; +class Notificator; QT_BEGIN_NAMESPACE class QLabel; @@ -77,6 +78,7 @@ private: QAction *changePassphraseAction; QSystemTrayIcon *trayIcon; + Notificator *notificator; TransactionView *transactionView; QMovie *syncIconMovie; -- cgit v1.2.3 From 94723e27adf04eb62b3cdb40ead503ee5f40cab4 Mon Sep 17 00:00:00 2001 From: Janne Pulkkinen Date: Sat, 3 Sep 2011 20:05:54 +0300 Subject: Pull request #21: windows fixes/cleanup by Matoking --- src/qt/bitcoingui.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 59661350c3..97af431f44 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -99,6 +99,8 @@ public slots: */ void askFee(qint64 nFeeRequired, bool *payFee); + void setWindowComposition(); + private slots: // UI pages void gotoOverviewPage(); -- cgit v1.2.3 From 83312d7c6c9536bc1500c8b738635e62d98aa39b Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sun, 11 Sep 2011 21:06:23 +0200 Subject: remove transparency effect and windows-specific code for now, it's not working as supposed --- src/qt/bitcoingui.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/qt/bitcoingui.h') diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 97af431f44..59661350c3 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -99,8 +99,6 @@ public slots: */ void askFee(qint64 nFeeRequired, bool *payFee); - void setWindowComposition(); - private slots: // UI pages void gotoOverviewPage(); -- cgit v1.2.3