Improve project configuration files.

Set the TS file to update automatically.
Set to automatically generate QM files.
Adjust the configuration file reading path.
Fix the refresh logic of the configuration file.
Set icon for executable file
Improve the about page.
Adjust the configuration file reading and setting related to Key Server.

CMakeLists.txt

@@ -32,14 +32,14 @@ find_package(Git QUIET)
 if(GIT_FOUND)
     execute_process(
             COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%H
-            OUTPUT_VARIABLE COMMIT_HASH
+            OUTPUT_VARIABLE GIT_COMMIT_HASH
             OUTPUT_STRIP_TRAILING_WHITESPACE
             ERROR_QUIET
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )
     execute_process(
             COMMAND ${GIT_EXECUTABLE} symbolic-ref --short -q HEAD
-            OUTPUT_VARIABLE BRANCH_NAME
+            OUTPUT_VARIABLE GIT_BRANCH_NAME
             OUTPUT_STRIP_TRAILING_WHITESPACE
             ERROR_QUIET
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -48,10 +48,10 @@ endif()
 
 
 set(BUILD_VERSION ${PROJECT_VERSION}_${CMAKE_SYSTEM}_${CMAKE_SYSTEM_PROCESSOR}_${CMAKE_BUILD_TYPE})
-set(GIT_VERSION ${PROJECT_NAME}_${GIT_COMMIT_HASH}_${GIT_COMMIT_HASH})
+set(GIT_VERSION ${GIT_BRANCH_NAME}_${GIT_COMMIT_HASH})
 string(TIMESTAMP BUILD_TIMESTAMP "%Y-%m-%d %H:%M:%S")
 
-message("Build Timestamp ${BUILD_TIMESTAMP}")
+message(STATUS "Build Timestamp ${BUILD_TIMESTAMP}")
 message(STATUS "Build Version ${BUILD_VERSION}")
 message(STATUS "Git Version ${GIT_VERSION}")
 
@@ -110,7 +110,7 @@ if(LINUX)
 
 endif()
 
-find_package(Qt5 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED)
+find_package(Qt5 COMPONENTS Core Test Widgets PrintSupport Network LinguistTools REQUIRED)
 
 add_subdirectory(src)
 

gpgfrontend.qrc

@@ -1,3 +1,4 @@
+<!DOCTYPE RCC>
 <RCC>
     <qresource prefix="/">
         <file alias="keymgmt.png">resource/icons/keymgmt.png</file>

gpgfrontend.rc

@@ -0,0 +1 @@
+ IDI_ICON1 ICON DISCARDABLE "gpgfrontend.ico"

include/GpgFrontend.h

@@ -17,15 +17,15 @@
 
 #define PROJECT_NAME "GPGFrontend"
 #define BUILD_VERSION "1.0.0_Windows-10.0.19042_AMD64_Debug"
-#define GIT_VERSION "GPGFrontend__"
+#define GIT_VERSION "develop_8d6aad31ebdd6dcf953cba87c5e79d49e48fcf6c"
 
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_PATCH 0
 
-#define BUILD_TIMESTAMP "2021-06-18 01:49:12"
+#define BUILD_TIMESTAMP "2021-06-18 16:18:23"
 
-#define GIT_BRANCH_NAME ""
-#define GIT_COMMIT_HASH ""
+#define GIT_BRANCH_NAME "develop"
+#define GIT_COMMIT_HASH "8d6aad31ebdd6dcf953cba87c5e79d49e48fcf6c"
 
 #endif //GPGFRONTEND_H_IN

include/MainWindow.h

@@ -352,8 +352,11 @@ private slots:
     QAction *addPgpHeaderAct; /** Action for adding the PGP header */
 
     QLabel *statusBarIcon; /**< TODO */
-    QSettings settings; /**< TODO */
-    KeyList *mKeyList; /**< TODO */
+
+    QString appPath;
+    QSettings settings;
+    KeyList *mKeyList;
+
     InfoBoardWidget *infoBoard;
     Attachments *mAttachments; /**< TODO */
     GpgME::GpgContext *mCtx; /**< TODO */

include/ui/SettingsDialog.h

@@ -38,6 +38,10 @@ Q_OBJECT
     void applySettings();
 
 private:
+
+    QString appPath;
+    QSettings settings;
+
     QCheckBox *rememberPasswordCheckBox;
     [[maybe_unused]] QCheckBox *importConfirmationcheckBox{};
     QCheckBox *saveCheckedKeysCheckBox;
@@ -73,6 +77,10 @@ Q_OBJECT
     void applySettings();
 
 private:
+
+    QString appPath;
+    QSettings settings;
+
     QCheckBox *mimeParseCheckBox;
     QCheckBox *mimeQPCheckBox;
     QCheckBox *mimeOpenAttachmentCheckBox;
@@ -95,6 +103,10 @@ Q_OBJECT
     void applySettings();
 
 private:
+
+    QString appPath;
+    QSettings settings;
+
     QButtonGroup *iconStyleGroup;
     QRadioButton *iconSizeSmall;
     QRadioButton *iconSizeMedium;
@@ -122,6 +134,10 @@ Q_OBJECT
     void applySettings();
 
 private:
+
+    QString appPath;
+    QSettings settings;
+
     QComboBox *comboBox;
     QLineEdit *newKeyServerEdit;
 
@@ -146,6 +162,10 @@ Q_OBJECT
     void applySettings();
 
 private:
+
+    QString appPath;
+    QSettings settings;
+
     QCheckBox *steganoCheckBox;
 
 signals:
@@ -164,6 +184,9 @@ Q_OBJECT
 private:
     static QString getRelativePath(const QString& dir1, const QString& dir2);
 
+    QString appPath;
+    QSettings settings;
+
     QString defKeydbPath; /** The default keydb path used by gpg4usb */
     QString accKeydbPath; /** The currently used keydb path */
     QLabel *keydbLabel;

include/ui/Wizard.h

@@ -55,6 +55,8 @@ Q_OBJECT
 private:
     GpgME::GpgContext *mCtx;
     KeyMgmt *mKeyMgmt;
+    QString appPath;
+    QSettings settings;
 
 private slots:
 
@@ -75,6 +77,10 @@ Q_OBJECT
 
     [[nodiscard]] int nextId() const override;
 
+private:
+    QString appPath;
+    QSettings settings;
+
 private slots:
 
     void slotLangChange(const QString& lang);
@@ -114,6 +120,9 @@ private slots:
 private:
     [[nodiscard]] int nextId() const override;
 
+    QString appPath;
+    QSettings settings;
+
     KeyMgmt *mKeyMgmt;
     GpgME::GpgContext *mCtx;
     QCheckBox *gpg4usbKeyCheckBox;