From 7c39668eb674006f31e03a78fba7a78e17a3148a Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Tue, 29 Sep 2020 09:45:07 +0800 Subject: [PATCH] feat: display git describe version string in app if possible --- CMakeLists.txt | 3 +++ aboutdialog.cpp | 5 ++++- languages/PineapplePictures.ts | 17 +++++++++++------ languages/PineapplePictures_zh_CN.ts | 17 +++++++++++------ 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2246c621..b78b69b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,6 +116,9 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git") ) string (REGEX REPLACE "\n" "" _git_describe_long "${_git_describe_long}") ppic_set_version_via_describe(${_git_describe_long}) + target_compile_definitions(${EXE_NAME} PRIVATE + GIT_DESCRIBE_VERSION_STRING="${_git_describe_long}" + ) endif () endif () diff --git a/aboutdialog.cpp b/aboutdialog.cpp index dcba7904..119ba00a 100644 --- a/aboutdialog.cpp +++ b/aboutdialog.cpp @@ -33,6 +33,9 @@ AboutDialog::AboutDialog(QWidget *parent) QStringList aboutStr { QStringLiteral("

"), qApp->applicationDisplayName(), +#ifdef GIT_DESCRIBE_VERSION_STRING + (QStringLiteral("
") + tr("Version: %1").arg(GIT_DESCRIBE_VERSION_STRING)), +#endif // GIT_DESCRIBE_VERSION_STRING "
", tr("Built with Qt %1 (%2)").arg(QT_VERSION_STR, QSysInfo::buildCpuArchitecture()), QStringLiteral("
%2").arg("https://github.com/BLumia/pineapple-pictures", tr("Source code")), @@ -103,7 +106,7 @@ SOFTWARE. this->setLayout(mainLayout); this->setMinimumSize(361, 161); // not sure why it complain "Unable to set geometry" - this->resize(520, 320); + this->resize(520, 330); setWindowFlag(Qt::WindowContextHelpButtonHint, false); } diff --git a/languages/PineapplePictures.ts b/languages/PineapplePictures.ts index 77a8a784..af8bb9d4 100644 --- a/languages/PineapplePictures.ts +++ b/languages/PineapplePictures.ts @@ -35,36 +35,41 @@ + Version: %1 + + + + Built with Qt %1 (%2) - + Source code - + <p><i>%1</i> is released under the MIT License.</p><p>This license grants people a number of freedoms:</p><ul><li>You are free to use <i>%1</i>, for any purpose</li><li>You are free to distribute <i>%1</i></li><li>You can study how <i>%1</i> works and change it</li><li>You can distribute changed versions of <i>%1</i></li></ul><p>The MIT license guarantees you this freedom. Nobody is ever permitted to take it away.</p> - + Your Rights - + &Help - + &About - + &License diff --git a/languages/PineapplePictures_zh_CN.ts b/languages/PineapplePictures_zh_CN.ts index a83aac70..b5a246d5 100644 --- a/languages/PineapplePictures_zh_CN.ts +++ b/languages/PineapplePictures_zh_CN.ts @@ -35,36 +35,41 @@ + Version: %1 + 版本: %1 + + + Built with Qt %1 (%2) 使用 Qt %1 (%2) 进行构建 - + Source code 源代码 - + <p><i>%1</i> is released under the MIT License.</p><p>This license grants people a number of freedoms:</p><ul><li>You are free to use <i>%1</i>, for any purpose</li><li>You are free to distribute <i>%1</i></li><li>You can study how <i>%1</i> works and change it</li><li>You can distribute changed versions of <i>%1</i></li></ul><p>The MIT license guarantees you this freedom. Nobody is ever permitted to take it away.</p> <p><i>%1</i> 是在 MIT 许可协议下发布的。</p><p>此许可证赋予人们以下自由的权利：</p><ul><li>任何人都可以为了任何目的自由地使用 <i>%1</i></li><li>任何人都可以自由地分发 <i>%1</i></li><li>任何人都可以自由地研究 <i>%1</i> 的工作原理并对其进行修改</li><li>任何人都可以自由地分发修改过的 <i>%1</i> 版本</li></ul><p>此软件通过 MIT 许可证赋予用户上述自由，任何人无权剥夺。</p> - + Your Rights 用户的权利 - + &Help 帮助(&H) - + &About 关于(&A) - + &License 软件许可证(&L)