Update file for The shield special installer

audioengine.cpp

@@ -82,7 +82,7 @@ void AudioEngine::init()
             tempformat = format;
         }
 #ifdef QT_DEBUG
-        qDebug()<< tr("Using playback device) ") << info.deviceName();
+        qDebug()<< tr("Using playback device ") << info.deviceName();
 #endif
         m_out = new QAudioOutput(info, tempformat, this);
         m_out->setBufferSize(1600);

dudestar.cpp

@@ -28,6 +28,7 @@
 #include <QFileDialog>
 #include <QSerialPortInfo>
 #include <time.h>
+#include "tools/version.h"
 
 #define ENDLINE "\n"
 
@@ -222,7 +223,9 @@ void DudeStar::init_gui()
     ui->comboModule->setStyleSheet("combobox-popup: 0;");
     //ui->comboPlayback->setStyleSheet("combobox-popup: 0;");
     //ui->comboCapture->setStyleSheet("combobox-popup: 0;");
-    ui->textAbout->setHtml(tr("<p>DUDE-Star git build %1</p><p>Copyright (C) 2019 Doug McLain AD8DP</p>"
+    ui->textAbout->setHtml(tr("<p>%1 Version %2.%3 Build %4</p>"
+                              "<p>Adapted by Artemia76 for TheShield Network</p>"
+                              "<p>Copyright (C) 2019 Doug McLain AD8DP</p>"
                               "<p>This program is free software; you can redistribute it "
                               "and/or modify it under the terms of the GNU General Public "
                               "License as published by the Free Software Foundation; "
@@ -232,7 +235,7 @@ void DudeStar::init_gui()
                               "PARTICULAR PURPOSE. See the GNU General Public License for "
                               "more details.\n\nYou should have received a copy of the GNU "
                               "General Public License along with this program. "
-                              "If not, see <a href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</a></p>").arg(GIT_VERSION));
+                              "If not, see <a href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</a></p>").arg(APP_NAME).arg(APP_MAJOR).arg(APP_MINOR).arg(APP_BUILD));
     m_uitimer = new QTimer();
     connect(m_uitimer, SIGNAL(timeout()), this, SLOT(update_ui()));
     m_uitimer->start(10);

dudestar.iss

@@ -10,10 +10,10 @@
 #define ApplicationExeName "dudestar.exe"
 #define ApplicationFullPath BaseDir + ApplicationExeName
 #expr ParseVersion(ApplicationFullPath, Major, Minor,Build,Dummy)
-#define ApplicationVersion Str(Major) + "." + Str(Minor) + "." + Str(Build)
-#define ApplicationPublisher "F4IKZ"
+#define ApplicationVersion Str(Major) + "." + Str(Minor)
+#define ApplicationPublisher "Artemia76"
 #define ApplicationURL "https://github.com/Artemia76/dudestar"
-#define InstallFileName "dudestar_" + str(Major) +"_" + str(Minor) + "_" + str(Build) + "_win"
+#define InstallFileName "dudestar_" + str(Major) +"_" + str(Minor) + "_win"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -32,16 +32,14 @@ DisableProgramGroupPage=yes
 LicenseFile=gpl-2.0.md
 OutputDir=.\
 OutputBaseFilename= {#InstallFileName}
-SetupIconFile=.\images\dstar.ico
+SetupIconFile=.\dstar.ico
 Compression=lzma
 SolidCompression=yes
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
 
-[Components]
-Name: "program"; Description: "Main Program"
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
@@ -51,11 +49,11 @@ source: "{#BaseDir}vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: nocompression cr
 Source: "{#ApplicationFullPath}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BaseDir}Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BaseDir}Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BaseDir}Qt5Multimedia.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BaseDir}Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion
-;Source: "{#BaseDir}Qt5Sql.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BaseDir}Qt5SerialPort.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BaseDir}Qt5Svg.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BaseDir}Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
-;Source: "{#BaseDir}Qt5Xml.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BaseDir}translations\*"; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#BaseDir}platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#BaseDir}iconengines\*"; DestDir: "{app}\iconengines"; Flags: ignoreversion recursesubdirs createallsubdirs

dudestar.pro

@@ -5,8 +5,10 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 #Extract Git version from Tag
 win32 {
     GIT_VERSION=$$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --abbrev=0 --tags)
+    GIT_COMMIT=$$system(git rev-parse --short HEAD)
 } else {
     GIT_VERSION='$(shell cd $$PWD;git --work-tree $$PWD describe --abbrev=0 --tags)'
+    GIT_COMMIT='$(shell cd $$PWD;git rev-parse --short HEAD)'
 }
 
 isEmpty(GIT_VERSION) {
@@ -18,16 +20,14 @@ isEmpty(GIT_VERSION) {
   VERSIONS = $$split(GIT_VERSION, ".")
   VERSION_MAJOR = $$member(VERSIONS, 0)
   VERSION_MINOR = $$member(VERSIONS, 1)
-  VERSION_BUILD = $$member(VERSIONS, 2)
+  VERSION_BUILD = $${GIT_COMMIT}
   message(Find Git Version : $$VERSIONS)
 }
 
 DEFINES += APP_NAME=\\\"$${TARGET}\\\"
 DEFINES += APP_MAJOR=$$VERSION_MAJOR
 DEFINES += APP_MINOR=$$VERSION_MINOR
-DEFINES += APP_BUILD=$$VERSION_BUILD
-
-DEFINES += GIT_VERSION=\"\\\"$${GIT_VERSION}\\\"\"
+DEFINES += APP_BUILD=\\\"$${VERSION_BUILD}\\\"
 
 QMAKE_EXTRA_TARGETS += versionTarget
 
@@ -82,6 +82,9 @@ macx {
 # Print values when running qmake
 !isEqual(QUIET, "true") {
 message(-----------------------------------)
+message(VERSION_MAJOR: $$VERSION_MAJOR)
+message(VERSION_MINOR: $$VERSION_MINOR)
+message(VERSION_BUILD: $$VERSION_BUILD)
 message(DEPLOY_BASE: $$DEPLOY_BASE)
 message(DEFINES: $$DEFINES)
 message(INCLUDEPATH: $$INCLUDEPATH)
@@ -402,7 +405,7 @@ win32 {
     #deploy.commands += xcopy /Y $$p($$PWD/*.txt) $$p($$DEPLOY_BASE/$$TARGET_NAME) &&
     deploy.commands += xcopy /Y $$p($$PWD/gpl-2.0.md) $$p($$DEPLOY_BASE/$$TARGET_NAME) &&
     deploy.commands += xcopy /Y $$p($$PWD/dudestar.iss) $$p($$DEPLOY_BASE/$$TARGET_NAME) &&
-    deploy.commands += xcopy /Y $$p($$PWD/gfx/dstar.ico) $$p($$DEPLOY_BASE/$$TARGET_NAME) &&
+    deploy.commands += xcopy /Y $$p($$PWD/images/dstar.ico) $$p($$DEPLOY_BASE/$$TARGET_NAME) &&
     deploy.commands += $$p($$[QT_INSTALL_BINS]/windeployqt) $$WINDEPLOY_FLAGS $$p($$DEPLOY_BASE/$$TARGET_NAME) &&
     deploy.commands += compil32 /cc $$p($$DEPLOY_BASE/$$TARGET_NAME/dudestar.iss)
 }

httpmanager.cpp

@@ -22,7 +22,7 @@ void HttpManager::process()
 
 void HttpManager::doRequest()
 {
-    m_qnam->get(QNetworkRequest(QUrl("http://www.dudetronics.com/ar-dns" + m_filename)));
+    m_qnam->get(QNetworkRequest(QUrl("http://theshield.site/" + m_filename)));
 #ifdef QT_DEBUG
     qDebug() << "doRequest() called m_filename == " << m_filename;
 #endif

tools/version.h

@@ -35,8 +35,8 @@
 #define VER_COMPANYNAME_STR         "DUDESTAR"
 #define VER_FILEDESCRIPTION_STR     "dudestar"
 #define VER_INTERNALNAME_STR        "dudestar"
-#define VER_LEGALCOPYRIGHT_STR      ""
-#define VER_LEGALTRADEMARKS1_STR    ""
+#define VER_LEGALCOPYRIGHT_STR      "DUDESTAR"
+#define VER_LEGALTRADEMARKS1_STR    "DUDESTAR"
 #define VER_LEGALTRADEMARKS2_STR    VER_LEGALTRADEMARKS1_STR
 #define VER_ORIGINALFILENAME_STR    "dudestar.exe"
 #define VER_PRODUCTNAME_STR         "DudeStar"