diff options
| author | moneromooo.monero <moneromooo.monero@users.noreply.github.com> | 2016-12-21 10:47:16 +0000 |
|---|---|---|
| committer | moneromooo.monero <moneromooo.monero@users.noreply.github.com> | 2016-12-21 10:47:16 +0000 |
| commit | 70956af7cd6aee7d453fedd95140534f503b727f (patch) | |
| tree | 5f347ceb280690af651650309812ae3b89cf547f | |
| parent | 7555502d64aeaa56a04fdf232855f342227d380d (diff) | |
| download | monzero-gui-70956af7cd6aee7d453fedd95140534f503b727f.tar.gz monzero-gui-70956af7cd6aee7d453fedd95140534f503b727f.tar.xz monzero-gui-70956af7cd6aee7d453fedd95140534f503b727f.zip | |
Add embedded monero version in settings page too
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | pages/Settings.qml | 9 |
2 files changed, 13 insertions, 2 deletions
@@ -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 } |