X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Fbitcoingui.h;h=efe3e9cc6d72fc908eeec6ed9bb586b8195d77f7;hb=91d7e847e051c9aa8be87a72d2763872b6b4f385;hp=97af431f4403007633d270c78e65667fe8d73d51;hpb=94723e27adf04eb62b3cdb40ead503ee5f40cab4;p=novacoin.git

diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 97af431..efe3e9c 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -29,6 +29,8 @@ class BitcoinGUI : public QMainWindow
     Q_OBJECT
 public:
     explicit BitcoinGUI(QWidget *parent = 0);
+    ~BitcoinGUI();
+
     void setClientModel(ClientModel *clientModel);
     void setWalletModel(WalletModel *walletModel);
     
@@ -64,6 +66,7 @@ private:
     QLabel *progressBarLabel;
     QProgressBar *progressBar;
 
+    QMenuBar *appMenuBar;
     QAction *overviewAction;
     QAction *historyAction;
     QAction *quitAction;
@@ -76,6 +79,7 @@ private:
     QAction *exportAction;
     QAction *encryptWalletAction;
     QAction *changePassphraseAction;
+    QAction *aboutQtAction;
 
     QSystemTrayIcon *trayIcon;
     Notificator *notificator;
@@ -84,6 +88,8 @@ private:
     QMovie *syncIconMovie;
 
     void createActions();
+    void createMenuBar();
+    void createToolBars();
     QWidget *createTabs();
     void createTrayIcon();
 
@@ -91,16 +97,16 @@ 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);
+    void error(const QString &title, const QString &message, bool modal = false);
     /* 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);
 
-    void setWindowComposition();
-
 private slots:
     // UI pages
     void gotoOverviewPage();
@@ -112,7 +118,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();