X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Fbitcoingui.h;h=1338998a98c9e4d9e2f725a6378e414bae839d35;hb=41cde5bbdcf76bda63cb7c55675340726c73b7fc;hp=484987ca68aab3e7b85acaec6a87dfbbef1b6412;hpb=b7bcaf940d27fa8cfe89422943fbeaab7a350930;p=novacoin.git

diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 484987c..1338998 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;
@@ -28,6 +29,8 @@ class BitcoinGUI : public QMainWindow
     Q_OBJECT
 public:
     explicit BitcoinGUI(QWidget *parent = 0);
+    ~BitcoinGUI();
+
     void setClientModel(ClientModel *clientModel);
     void setWalletModel(WalletModel *walletModel);
     
@@ -51,6 +54,8 @@ private:
 
     QStackedWidget *centralWidget;
 
+    QWidget *dummyWidget;
+
     OverviewPage *overviewPage;
     QWidget *transactionsPage;
     AddressBookPage *addressBookPage;
@@ -63,6 +68,7 @@ private:
     QLabel *progressBarLabel;
     QProgressBar *progressBar;
 
+    QMenuBar *appMenuBar;
     QAction *overviewAction;
     QAction *historyAction;
     QAction *quitAction;
@@ -75,13 +81,17 @@ private:
     QAction *exportAction;
     QAction *encryptWalletAction;
     QAction *changePassphraseAction;
+    QAction *aboutQtAction;
 
     QSystemTrayIcon *trayIcon;
+    Notificator *notificator;
     TransactionView *transactionView;
 
     QMovie *syncIconMovie;
 
     void createActions();
+    void createMenuBar();
+    void createToolBars();
     QWidget *createTabs();
     void createTrayIcon();
 
@@ -89,6 +99,8 @@ public slots:
     void setNumConnections(int count);
     void setNumBlocks(int count);
     void setEncryptionStatus(int status);
+    /** Set the status bar text if there are any warnings (removes sync progress bar if applicable) */
+    void refreshStatusBar();
 
     void error(const QString &title, const QString &message);
     /* It is currently not possible to pass a return value to another thread through
@@ -97,6 +109,8 @@ public slots:
     */
     void askFee(qint64 nFeeRequired, bool *payFee);
 
+    void showNormal();
+
 private slots:
     // UI pages
     void gotoOverviewPage();
@@ -108,7 +122,9 @@ private slots:
     // Misc actions
     void optionsClicked();
     void aboutClicked();
+#ifndef Q_WS_MAC
     void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
+#endif
     void incomingTransaction(const QModelIndex & parent, int start, int end);
     void encryptWallet(bool status);
     void changePassphrase();