diff --git a/digilent-agent.pro b/digilent-agent.pro index 5aaeaf5..b4372ea 100755 --- a/digilent-agent.pro +++ b/digilent-agent.pro @@ -26,7 +26,8 @@ TEMPLATE = app CONFIG += qt CONFIG(debug, debug|release) { - #CONFIG+=console + DEFINES += AGENT_BUILD_NOTE=\\\"DEBUG\\\" + CONFIG+=console } @@ -78,8 +79,7 @@ DISTFILES += \ lib/digilent/qtSerial/LICENSE \ lib/digilent/qtSerial/README.md \ lib/digilent/pgm/.gitignore \ - lib/digilent/pgm/LICENSE \ - qt.conf + lib/digilent/pgm/LICENSE OTHER_FILES += diff --git a/installer/debug-build.txt b/installer/debug-build.txt index c9ee1ff..b20972c 100755 --- a/installer/debug-build.txt +++ b/installer/debug-build.txt @@ -1 +1 @@ -debug build 0.3.28 +debug build 1.0.1 diff --git a/src/core/agent.cpp b/src/core/agent.cpp index f2a25d1..1ac9333 100755 --- a/src/core/agent.cpp +++ b/src/core/agent.cpp @@ -20,6 +20,10 @@ Agent::Agent(QObject *parent) : QObject(parent) this->minorVersion = 0; this->patchVersion = 1; +#ifdef AGENT_BUILD_NOTE + this->buildNote = AGENT_BUILD_NOTE; +#endif + this->firmwareUploadStatus = "idle"; //Initialize devices array with null pointers @@ -84,6 +88,10 @@ int Agent::getPatchVersion() { return this->patchVersion; } +QString Agent::getBuildNote() { + return this->buildNote; +} + bool Agent::launchWfl() { //Todo - Launch Electron Version If It Exists diff --git a/src/core/agent.h b/src/core/agent.h index fe1cbdc..f6e0c8b 100755 --- a/src/core/agent.h +++ b/src/core/agent.h @@ -30,6 +30,7 @@ class Agent : public QObject int getMajorVersion(); int getMinorVersion(); int getPatchVersion(); + QString getBuildNote(); QString getFirmwareUploadStatus(); int getFirmwareUploadProgress(); bool launchWfl(); @@ -59,7 +60,8 @@ public slots: bool httpCapable; int majorVersion; int minorVersion; - int patchVersion; + int patchVersion; + QString buildNote; QString firmwareUploadStatus; DigilentPgm *pgm; diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp index 4157331..a459e9b 100755 --- a/src/mainWindow.cpp +++ b/src/mainWindow.cpp @@ -51,7 +51,11 @@ MainWindow::~MainWindow() void MainWindow::createWindowActions() { +#ifdef AGENT_BUILD_NOTE + versionAction = new QAction(QString("Agent Version: ") + QString(this->agent->getVersion()) + " - " + this->agent->getBuildNote(), this); +#else versionAction = new QAction(QString("Agent Version: ") + QString(this->agent->getVersion()), this); +#endif versionAction->setEnabled(false); #ifdef _WIN32