From df2af0f2bf57db007c6282b2a574f253050d7e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sun, 8 Nov 2020 21:51:38 +0100 Subject: [PATCH] Display software version in about dialog --- Software/PC_Application/Application.pro | 1 + Software/PC_Application/appwindow.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro index 4d3ebdd..cb73783 100644 --- a/Software/PC_Application/Application.pro +++ b/Software/PC_Application/Application.pro @@ -128,3 +128,4 @@ RESOURCES += \ CONFIG += c++14 REVISION = $$system(git rev-parse HEAD) DEFINES += GITHASH=\\"\"$$REVISION\\"\" +DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\" diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp index 45676f2..5b185e8 100644 --- a/Software/PC_Application/appwindow.cpp +++ b/Software/PC_Application/appwindow.cpp @@ -104,7 +104,9 @@ AppWindow::AppWindow(QWidget *parent) connect(ui->actionAbout, &QAction::triggered, [=](){ auto commit = QString(GITHASH); commit.truncate(7); - QMessageBox::about(this, "About", "More information: github.com/jankae/VNA2\n\nVersion: " + commit); + QMessageBox::about(this, "About", "More information: github.com/jankae/VNA2\n" + "\nVersion: " + QString::number(FW_MAJOR) + "." + QString::number(FW_MINOR) + + "." + QString::number(FW_PATCH) + FW_SUFFIX + " ("+ commit+")"); }); setWindowTitle("VNA");