monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 16:28:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add embedded monero version in settings page too

Browse source
This commit is contained in:
moneromooo.monero 2016-12-21 10:47:16 +00:00
parent 7555502d64
commit 70956af7cd
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.sh
View file

@ -47,7 +47,11 @@ fi
# force version update # force version update
get_tag 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 cd build
qmake ../monero-wallet-gui.pro "$CONFIG" qmake ../monero-wallet-gui.pro "$CONFIG"

9
pages/Settings.qml
View file

@ -350,7 +350,14 @@ Rectangle {
id: guiVersion id: guiVersion
Layout.topMargin: 8 Layout.topMargin: 8
color: "#4A4949" 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 fontSize: 16
} }