Mercurial > trustbridge
diff ui/mainwindow.h @ 158:fb3b2d77518f
Merged
author | Sascha Wilde <wilde@intevation.de> |
---|---|
date | Tue, 25 Mar 2014 09:30:51 +0100 |
parents | c0fdb8d336cf |
children | 0c06a608e15f |
line wrap: on
line diff
--- a/ui/mainwindow.h Tue Mar 25 09:30:42 2014 +0100 +++ b/ui/mainwindow.h Tue Mar 25 09:30:51 2014 +0100 @@ -7,8 +7,9 @@ */ #include <QSystemTrayIcon> -#include <QDialog> +#include <QMainWindow> #include <QSettings> +#include <QMenuBar> #include "downloader.h" #include "certificatelist.h" @@ -16,7 +17,7 @@ class QAction; class QTimer; -class MainWindow : public QDialog +class MainWindow : public QMainWindow { Q_OBJECT @@ -45,6 +46,9 @@ void downloaderError(const QString &message, SSLConnection::ErrorCode error); /** @brief Trigger the appropiate action depending on the state */ void messageClicked(); + void showSettings(); + void showHelp(); + void showAbout(); private: /** @brief check the integrity of available files. @@ -58,6 +62,7 @@ void verifyAvailableData(); void createTrayIcon(); void createActions(); + void createMenuBar(); QString mCurMessage; QString mInstalledSWVersion; @@ -71,6 +76,7 @@ QAction *mCheckUpdates; QAction *mQuitAction; CurrentState mCurState; + QMenuBar *mMenuBar; CertificateList mListToInstall; };