Merge branch 'develop' into develop-ci

1 files changed, 16 insertions, 5 deletions

diff --git a/include/MainWindow.h b/include/MainWindow.h
index 418a56db..20f9a0b5 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -26,12 +26,11 @@
 #define __GPGWIN_H__
 
 #include "gpg/GpgConstants.h"
-#include "ui/widgets/Attachments.h"
 #include "ui/KeyMgmt.h"
 #include "ui/widgets/TextEdit.h"
 #include "ui/FileEncryptionDialog.h"
 #include "ui/SettingsDialog.h"
-#include "ui/AboutDialog.h"
+#include "ui/help/AboutDialog.h"
 #include "ui/widgets/InfoBoardWidget.h"
 #include "ui/FindWidget.h"
 #include "ui/Wizard.h"
@@ -217,6 +216,11 @@ private slots:
     void slotAbout();
 
     /**
+     * @details Open check-update-tab in about-dialog.
+     */
+    void slotCheckUpdate();
+
+    /**
      * @details Open File Opera Tab
      */
     void slotOpenFileTab();
@@ -258,6 +262,11 @@ private slots:
      */
     void slotSetRestartNeeded(bool needed);
 
+    /**
+     * @details called when need to upgrade.
+     */
+    void slotVersionUpgrade(const QString &currentVersion, const QString &latestVersion);
+
 private:
     /**
      * @details Create actions for the main-menu and the context-menu of the keylist.
@@ -363,6 +372,7 @@ private:
     QAction *zoomInAct; /** Action to zoom in */
     QAction *zoomOutAct; /** Action to zoom out */
     QAction *aboutAct; /** Action to open about dialog */
+    QAction *checkUpdateAct; /** Action to open about dialog */
     QAction *fileEncryptAct; /** Action to open dialog for encrypting file */
     QAction *fileDecryptAct; /** Action to open dialog for decrypting file */
     QAction *fileSignAct; /** Action to open dialog for signing file */
@@ -382,11 +392,12 @@ private:
     KeyList *mKeyList;
 
     InfoBoardWidget *infoBoard;
-    Attachments *mAttachments; /**< TODO */
-    GpgME::GpgContext *mCtx; /**< TODO */
-    KeyMgmt *keyMgmt; /**< TODO */
+    GpgME::GpgContext *mCtx;
+    KeyMgmt *keyMgmt;
     KeyServerImportDialog *importDialog; /**< TODO */
 
+    QNetworkAccessManager *networkAccessManager;
+
     bool attachmentDockCreated;
     bool restartNeeded;
 };