diff --git a/build.sh b/build.sh index c962a7a2..15029262 100755 --- a/build.sh +++ b/build.sh @@ -47,7 +47,11 @@ fi # force version update get_tag -echo "var VERSION = \"$VERSIONTAG\"" > version.js +echo "var GUI_VERSION = \"$VERSIONTAG\"" > version.js +pushd "$MONERO_DIR" +get_tag +popd +echo "var GUI_MONERO_VERSION = \"$VERSIONTAG\"" >> version.js cd build qmake ../monero-wallet-gui.pro "$CONFIG" diff --git a/pages/Settings.qml b/pages/Settings.qml index 52dc4496..be8d53a3 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -350,7 +350,14 @@ Rectangle { id: guiVersion Layout.topMargin: 8 color: "#4A4949" - text: qsTr("GUI version: ") + Version.VERSION + translationManager.emptyString + text: qsTr("GUI version: ") + Version.GUI_VERSION + translationManager.emptyString + fontSize: 16 + } + + Label { + id: guiMoneroVersion + color: "#4A4949" + text: qsTr("Embedded Monero version: ") + Version.GUI_MONERO_VERSION + translationManager.emptyString fontSize: 16 }