diff options
author | Saturn&Eric <[email protected]> | 2022-01-05 20:02:19 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2022-01-05 20:02:19 +0000 |
commit | a3ca1bf1d4404327d68d3d49127085638c272152 (patch) | |
tree | deb10c33977e5002fa6e9b434f2b07d2719a4e31 /src/ui/MainWindow.h | |
parent | Merge pull request #37 from saturneric/document (diff) | |
parent | <doc>(navbar): take repository and GitHub apart. (diff) | |
download | GpgFrontend-a3ca1bf1d4404327d68d3d49127085638c272152.tar.gz GpgFrontend-a3ca1bf1d4404327d68d3d49127085638c272152.zip |
Merge pull request #36 from saturneric/developv2.0.4
v2.0.4
Diffstat (limited to 'src/ui/MainWindow.h')
-rw-r--r-- | src/ui/MainWindow.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 68b062ce..5f9d9b50 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -29,7 +29,6 @@ #include "gpg/result_analyse/DecryptResultAnalyse.h" #include "gpg/result_analyse/EncryptResultAnalyse.h" #include "gpg/result_analyse/SignResultAnalyse.h" -#include "ui/FileEncryptionDialog.h" #include "ui/FindWidget.h" #include "ui/GpgFrontendUI.h" #include "ui/KeyMgmt.h" @@ -245,8 +244,7 @@ class MainWindow : public QMainWindow { /** * @details called when need to upgrade. */ - void slotVersionUpgrade(const QString& currentVersion, - const QString& latestVersion); + void slotVersionUpgrade(const SoftwareVersion& version); private: /** @@ -323,7 +321,7 @@ class MainWindow : public QMainWindow { QMenu* viewMenu{}; /** Submenu for view operations */ QMenu* importKeyMenu{}; /** Sumenu for import operations */ #ifdef SMTP_SUPPORT - QMenu* emailMenu{}; /** Sumenu for email operations */ + QMenu* emailMenu{}; /** Sumenu for email operations */ #endif QMenu* steganoMenu{}; /** Submenu for steganographic operations*/ @@ -332,6 +330,7 @@ class MainWindow : public QMainWindow { QToolBar* editToolBar{}; /** Toolbar holding edit actions */ QToolBar* specialEditToolBar{}; /** Toolbar holding special edit actions */ QToolBar* keyToolBar{}; /** Toolbar holding key operations */ + QToolBar* emailToolBar{}; /** Toolbar holding key operations */ QToolButton* importButton{}; /** Toolbutton for import dropdown menu in toolbar */ QDockWidget* keyListDock{}; /** Encrypt Dock*/ @@ -399,6 +398,7 @@ class MainWindow : public QMainWindow { bool attachmentDockCreated{}; bool restartNeeded{}; + bool prohibit_update_checking_ = false; }; } // namespace GpgFrontend::UI |