diff options
| author | Saturneric <[email protected]> | 2021-07-20 14:14:26 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2021-07-20 14:14:26 +0000 |
| commit | 7be23e45d895e4bc4bb8b169ca5b07d84e4c5b85 (patch) | |
| tree | 882c60bf7b977aaed1b0e272952c9ed5df7a0c8e | |
| parent | Merge pull request #14 from saturneric/develop (diff) | |
| parent | Fix problem that macos cannot use multi-languages. (diff) | |
| download | GpgFrontend-7be23e45d895e4bc4bb8b169ca5b07d84e4c5b85.tar.gz GpgFrontend-7be23e45d895e4bc4bb8b169ca5b07d84e4c5b85.zip | |
Merge branch 'develop'
Diffstat (limited to '')
| -rw-r--r-- | include/GpgFrontend.h.in | 2 | ||||
| -rw-r--r-- | include/GpgFrontendBuildInfo.h.in | 3 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/ui/Wizard.cpp | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/include/GpgFrontend.h.in b/include/GpgFrontend.h.in index b0001f2e..555f4589 100644 --- a/include/GpgFrontend.h.in +++ b/include/GpgFrontend.h.in @@ -47,6 +47,8 @@ #define RELEASE 0 #define DEBUG 1 +#define OS_PLATFORM @OS_PLATFORM@ + #if OS_PLATFORM == MACOS && BUILD_FLAG == RELEASE # define RESOURCE_DIR(appDir) (appDir + "/../Resources/") #elif OS_PLATFORM == LINUX && BUILD_FLAG == RELEASE diff --git a/include/GpgFrontendBuildInfo.h.in b/include/GpgFrontendBuildInfo.h.in index 4457ea98..1da57de9 100644 --- a/include/GpgFrontendBuildInfo.h.in +++ b/include/GpgFrontendBuildInfo.h.in @@ -35,10 +35,9 @@ #define PROJECT_NAME "@PROJECT_NAME@" #define BUILD_VERSION "@BUILD_VERSION@" #define GIT_VERSION "@GIT_VERSION@" -#define OS_PLATFORM @OS_PLATFORM@ #define BUILD_FLAG @BUILD_FLAG@ #define BUILD_TIMESTAMP "@BUILD_TIMESTAMP@" -#endif // GPGFRONTEND_BUILD_INFO_H_IN
\ No newline at end of file +#endif // GPGFRONTEND_BUILD_INFO_H_IN diff --git a/src/main.cpp b/src/main.cpp index 3e14a425..ff3b0bb4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) { QTranslator translator, translator2; int return_from_event_loop_code; - qDebug() << settings.fileName(); + qDebug() << "Resource Directory" << RESOURCE_DIR(appPath); do { QApplication::removeTranslator(&translator); diff --git a/src/ui/Wizard.cpp b/src/ui/Wizard.cpp index ff6e296c..b0486cc9 100644 --- a/src/ui/Wizard.cpp +++ b/src/ui/Wizard.cpp @@ -130,9 +130,9 @@ IntroPage::IntroPage(QWidget *parent) languages = SettingsDialog::listLanguages(); auto *langSelectBox = new QComboBox(); - foreach(QString l, languages) { - langSelectBox->addItem(l); - } + for(const auto &l : languages) { + langSelectBox->addItem(l); + } // selected entry from config QString langKey = settings.value("int/lang").toString(); QString langValue = languages.value(langKey); |