Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include commit Number in About Companion page #1415

Merged
merged 3 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion companion/src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1024,8 +1024,12 @@ void MainWindow::about()
aboutStr.append(tr("If you've found this program useful, please support by <a href='%1'>donating</a>").arg(DONATE_STR));
aboutStr.append("<br/><br/>");
aboutStr.append(QString("Version %1 \"%2\", %3").arg(VERSION).arg(CODENAME).arg(__DATE__));
aboutStr.append("<br/>");
aboutStr.append(QString("Commit <a href='%1'>%2</a>").arg("https://github.com/EdgeTX/edgetx/commit/" GIT_STR).arg(GIT_STR));
aboutStr.append("<br/><br/>");
aboutStr.append(tr("Copyright") + QString(" &copy; 2021 EdgeTX<br/>"));
aboutStr.append(tr("File new <a href='%1'>Issue or Request</a>").arg("https://github.com/EdgeTX/edgetx/issues/new/choose"));
aboutStr.append("<br/><br/>");
aboutStr.append(tr("Copyright") + QString(" &copy; 2022 EdgeTX<br/>"));
// aboutStr.append(tr("Copyright") + QString(" &copy; 2021-%1 EdgeTX<br/>").arg(QString(__DATE__).right(4)));

QMessageBox msgBox(this);
Expand Down
1 change: 1 addition & 0 deletions companion/src/version.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#define VERSION_REVISION @VERSION_REVISION@
#define VERSION_SUFFIX "@VERSION_SUFFIX@"
#define CODENAME "@CODENAME@"
#define GIT_STR "@GIT_STR@"

#define VERSION_NUMBER ((VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | VERSION_REVISION)

Expand Down