[systemdialog] add neptune release version to version information

Change-Id: I3db64bcc20e6a65b4597b8947d6cd72698a8bbe4
Reviewed-by: Lukáš Tinkl <ltinkl@luxoft.com>

11 files changed, 16 insertions, 13 deletions

diff --git a/Main.qml b/Main.qml
index bb365ae9..ec32ab5e 100644
--- a/Main.qml
+++ b/Main.qml
@@ -256,7 +256,7 @@ Window {
             function saveFile(fileUrl, text) {
                 var request = new XMLHttpRequest();
                 request.open("PUT", fileUrl);
-                request.send("Neptune 3: " + Qt.application.version + "\n" +
+                request.send("Neptune 3: %1 %2".arg(Qt.application.version).arg(neptuneInfo) + "\n" +
                              "Qt Application Manager: %1".arg(qtamVersion) + "\n" +
                              "Qt IVI: %1".arg(qtiviVersion) + "\n\n" +
                              text);
diff --git a/imports/assets/translations/cs_CZ.ts b/imports/assets/translations/cs_CZ.ts
index 1c8e2564..30352290 100644
--- a/imports/assets/translations/cs_CZ.ts
+++ b/imports/assets/translations/cs_CZ.ts
@@ -884,8 +884,8 @@ UX na cestu</translation>
         <translation>Qt IVI: %1</translation>
     </message>
     <message>
-        <source>Neptune 3: %1</source>
-        <translation>Neptune 3: %1</translation>
+        <source>Neptune 3: %1 %2</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/imports/assets/translations/de_DE.ts b/imports/assets/translations/de_DE.ts
index 3ae23a7a..4a426a1d 100644
--- a/imports/assets/translations/de_DE.ts
+++ b/imports/assets/translations/de_DE.ts
@@ -675,7 +675,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Neptune 3: %1</source>
+        <source>Neptune 3: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/imports/assets/translations/en_GB.ts b/imports/assets/translations/en_GB.ts
index 87d40a2c..319160dd 100644
--- a/imports/assets/translations/en_GB.ts
+++ b/imports/assets/translations/en_GB.ts
@@ -505,7 +505,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Neptune 3: %1</source>
+        <source>Neptune 3: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/imports/assets/translations/en_US.ts b/imports/assets/translations/en_US.ts
index 4921c405..36bfd5de 100644
--- a/imports/assets/translations/en_US.ts
+++ b/imports/assets/translations/en_US.ts
@@ -505,7 +505,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Neptune 3: %1</source>
+        <source>Neptune 3: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/imports/assets/translations/ja_JP.ts b/imports/assets/translations/ja_JP.ts
index 3a1f2af7..fb27951f 100644
--- a/imports/assets/translations/ja_JP.ts
+++ b/imports/assets/translations/ja_JP.ts
@@ -718,7 +718,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Neptune 3: %1</source>
+        <source>Neptune 3: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/imports/assets/translations/ko_KR.ts b/imports/assets/translations/ko_KR.ts
index 239404ec..81878a9a 100644
--- a/imports/assets/translations/ko_KR.ts
+++ b/imports/assets/translations/ko_KR.ts
@@ -725,7 +725,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Neptune 3: %1</source>
+        <source>Neptune 3: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/imports/assets/translations/zh_CN.ts b/imports/assets/translations/zh_CN.ts
index c0e859c6..32526e47 100644
--- a/imports/assets/translations/zh_CN.ts
+++ b/imports/assets/translations/zh_CN.ts
@@ -746,7 +746,7 @@ If it is wrong, you can just delete first two charactor, just ues &quot;源&quot
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Neptune 3: %1</source>
+        <source>Neptune 3: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/neptune3-ui/main.cpp b/src/neptune3-ui/main.cpp
index d492a6fd..b5694dc2 100644
--- a/src/neptune3-ui/main.cpp
+++ b/src/neptune3-ui/main.cpp
@@ -76,7 +76,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     QCoreApplication::setApplicationName(qSL("Neptune UI"));
     QCoreApplication::setOrganizationName(qSL("Pelagicore AG"));
     QCoreApplication::setOrganizationDomain(qSL("pelagicore.com"));
-    QCoreApplication::setApplicationVersion(NEPTUNE_VERSION);
+    QCoreApplication::setApplicationVersion(STR(NEPTUNE_VERSION));
 
     Logging::initialize();
 
@@ -112,6 +112,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
         a.showWindow(cfg.fullscreen() && !cfg.noFullscreen());
 
         auto ctx = a.qmlEngine()->rootContext();
+        ctx->setContextProperty("neptuneInfo", STR(NEPTUNE_INFO));
         ctx->setContextProperty("qtamVersion", QTAPPMANCOMMON_VERSION_STR);
         ctx->setContextProperty("qtiviVersion", QTIVICORE_VERSION_STR);
 
diff --git a/src/neptune3-ui/neptune3-ui.pro b/src/neptune3-ui/neptune3-ui.pro
index f794c151..a8ecaa90 100644
--- a/src/neptune3-ui/neptune3-ui.pro
+++ b/src/neptune3-ui/neptune3-ui.pro
@@ -1,3 +1,4 @@
+VERSION  = 5.11.0
 TEMPLATE = app
 TARGET   = neptune3-ui
 
@@ -8,7 +9,6 @@ CONFIG *= no_private_qt_headers_warning link_pkgconfig
 
 QT *= appman_main-private testlib gui-private
 
-#TODO: Make it work also on macOS (or test whether the code below just works there)
 unix:exists($$SOURCE_DIR/.git):GIT_REVISION=$$system(cd "$$SOURCE_DIR" && git describe --tags --always 2>/dev/null)
 
 isEmpty(GIT_REVISION) {
@@ -18,7 +18,9 @@ isEmpty(GIT_REVISION) {
     GIT_COMMITTER_DATE=$$system(cd "$$SOURCE_DIR" && git show "$$GIT_REVISION" --pretty=format:"%ci" --no-patch 2>/dev/null)
 }
 
-DEFINES *= NEPTUNE_VERSION=\""\\\"$$GIT_REVISION, $$GIT_COMMITTER_DATE\\\""\"
+DEFINES *= "NEPTUNE_VERSION=$$VERSION"
+
+DEFINES *= NEPTUNE_INFO=\""\\\"$$GIT_REVISION, $$GIT_COMMITTER_DATE\\\""\"
 
 SOURCES = main.cpp
 
diff --git a/sysui/procmon/MonitorView.qml b/sysui/procmon/MonitorView.qml
index 80bc771b..881f7d2e 100644
--- a/sysui/procmon/MonitorView.qml
+++ b/sysui/procmon/MonitorView.qml
@@ -116,7 +116,7 @@ ColumnLayout {
 
             MonitorListItem {
                 title: qsTr("Version")
-                subtitle: qsTr("Neptune 3: %1").arg(Qt.application.version) + "\n" +
+                subtitle: qsTr("Neptune 3: %1 %2").arg(Qt.application.version).arg(neptuneInfo) + "\n" +
                           qsTr("Qt Application Manager: %1").arg(qtamVersion) + "\n" +
                           qsTr("Qt IVI: %1").arg(qtiviVersion)
             }