Add build number to log and about dialog

This commit is contained in:
Dan Paulat 2025-05-18 00:13:46 -05:00
parent 60d52b5c59
commit 699f60d399
3 changed files with 8 additions and 10 deletions

View file

@ -55,8 +55,9 @@ int main(int argc, char* argv[])
auto& logManager = scwx::qt::manager::LogManager::Instance();
logManager.Initialize();
logger_->info("Supercell Wx v{} ({})",
logger_->info("Supercell Wx v{}.{} ({})",
scwx::qt::main::kVersionString_,
scwx::qt::main::kBuildNumber_,
scwx::qt::main::kCommitString_);
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);

View file

@ -3,17 +3,12 @@
#include <cstdint>
#include <string>
namespace scwx
{
namespace qt
{
namespace main
namespace scwx::qt::main
{
const std::uint32_t kBuildNumber_ {${build_number}u};
const std::string kCommitString_ {"${commit_string}"};
const std::uint16_t kCopyrightYear_ {${copyright_year}u};
const std::string kVersionString_ {"${version_string}"};
} // namespace main
} // namespace qt
} // namespace scwx
} // namespace scwx::qt::main

View file

@ -45,7 +45,9 @@ AboutDialog::AboutDialog(QWidget* parent) :
}
ui->versionLabel->setText(
tr("Version %1").arg(QString::fromStdString(main::kVersionString_)));
tr("Version %1 (Build %2)")
.arg(QString::fromStdString(main::kVersionString_))
.arg(main::kBuildNumber_));
ui->revisionLabel->setText(
tr("Git Revision <a href=\"%1\">%2</a>")
.arg(repositoryUrl)