From 8abfe2ead01f69a9d78925e4f968216dbc03bf31 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 1 Feb 2021 03:42:24 -0500 Subject: [PATCH 1/7] Add releaseName property to About namespace. --- interface/src/AboutUtil.cpp | 5 +++++ interface/src/AboutUtil.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/interface/src/AboutUtil.cpp b/interface/src/AboutUtil.cpp index b9bea2d85c..d1424d4642 100644 --- a/interface/src/AboutUtil.cpp +++ b/interface/src/AboutUtil.cpp @@ -4,6 +4,7 @@ // // Created by Vlad Stelmahovsky on 15/5/2018. // Copyright 2018 High Fidelity, Inc. +// Copyright 2021 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -40,6 +41,10 @@ QString AboutUtil::getBuildVersion() const { return BuildInfo::VERSION; } +QString AboutUtil::getReleaseName() const { + return BuildInfo::RELEASE_NAME; +} + QString AboutUtil::getQtVersion() const { return qVersion(); } diff --git a/interface/src/AboutUtil.h b/interface/src/AboutUtil.h index 8cc76dad1e..f072ae8b4a 100644 --- a/interface/src/AboutUtil.h +++ b/interface/src/AboutUtil.h @@ -30,12 +30,14 @@ * Read-only. * @property {string} buildDate - The build date of Interface that is currently running. Read-only. * @property {string} buildVersion - The build version of Interface that is currently running. Read-only. + * @property {string} releaseName - The release codename of the version that Interface is currently running. Read-only. * @property {string} qtVersion - The Qt version used in Interface that is currently running. Read-only. * * @example Report information on the version of Interface currently running. * print("Interface platform: " + About.platform); * print("Interface build date: " + About.buildDate); * print("Interface version: " + About.buildVersion); + * print("Interface release name: " + About.releaseName); * print("Qt version: " + About.qtVersion); */ @@ -66,6 +68,7 @@ class AboutUtil : public QObject { Q_PROPERTY(QString platform READ getPlatformName CONSTANT) Q_PROPERTY(QString buildDate READ getBuildDate CONSTANT) Q_PROPERTY(QString buildVersion READ getBuildVersion CONSTANT) + Q_PROPERTY(QString releaseName READ getReleaseName CONSTANT) Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT) public: static AboutUtil* getInstance(); @@ -74,6 +77,7 @@ public: QString getPlatformName() const { return "Vircadia"; } QString getBuildDate() const; QString getBuildVersion() const; + QString getReleaseName() const; QString getQtVersion() const; public slots: From 2287aba7fa18e18a49d6263463f98ce571f55daf Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 1 Feb 2021 05:10:45 -0500 Subject: [PATCH 2/7] Update installer names and images "Alpha" -> "" --- .github/workflows/master_build.yml | 6 +++--- .github/workflows/pr_build.yml | 4 ++-- android/build_android.sh | 2 +- cmake/installer/installer-header.bmp | Bin 102654 -> 102654 bytes cmake/installer/uninstaller-header.bmp | Bin 102654 -> 102654 bytes cmake/macros/GenerateInstallers.cmake | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 2caddef182..ee6ef88d0e 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -83,15 +83,15 @@ jobs: shell: bash run: | echo "${{ steps.buildenv1.outputs.symbols_archive }}" - echo "ARTIFACT_PATTERN=Vircadia-Alpha-*.$INSTALLER_EXT" >> $GITHUB_ENV + echo "ARTIFACT_PATTERN=Vircadia-*.$INSTALLER_EXT" >> $GITHUB_ENV # Build type variables echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV if [ "${{ matrix.build_type }}" = "full" ]; then echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV - echo "INSTALLER=Vircadia-Alpha-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV + echo "INSTALLER=Vircadia-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV else echo "CLIENT_ONLY=TRUE" >> $GITHUB_ENV - echo "INSTALLER=Vircadia-Alpha-Interface-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV + echo "INSTALLER=Vircadia-Interface-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV fi - name: Clear working directory if: startsWith(matrix.os, 'windows') diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 8a3dce98ec..9d6984b5b2 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -86,9 +86,9 @@ jobs: echo "${{ steps.buildenv1.outputs.symbols_archive }}" echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV if [[ "${{ matrix.build_type }}" != "android" ]]; then - echo "ARTIFACT_PATTERN=Vircadia-Alpha-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV + echo "ARTIFACT_PATTERN=Vircadia-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV # Build type variables - echo "INSTALLER=Vircadia-Alpha-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV + echo "INSTALLER=Vircadia-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV else echo "ARTIFACT_PATTERN=*.$INSTALLER_EXT" >> $GITHUB_ENV fi diff --git a/android/build_android.sh b/android/build_android.sh index 9cf1b9e2ab..d3c79afdbe 100755 --- a/android/build_android.sh +++ b/android/build_android.sh @@ -17,7 +17,7 @@ fi ANDROID_APP=interface ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE} ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk -ANDROID_APK_NAME=Vircadia-Alpha-${ANDROID_APK_SUFFIX} +ANDROID_APK_NAME=Vircadia-${ANDROID_APK_SUFFIX} ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET} cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME} diff --git a/cmake/installer/installer-header.bmp b/cmake/installer/installer-header.bmp index de8448ed44c17f3b918e47d1715a83058d1b9a53..a9519f02551c964b0b6229f8f24d45e59672bf67 100644 GIT binary patch literal 102654 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 Date: Mon, 1 Feb 2021 05:10:54 -0500 Subject: [PATCH 3/7] Update about dialog. --- .../qml/hifi/dialogs/TabletAboutDialog.qml | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml index f7a4061f45..92fd86e2b5 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml @@ -14,7 +14,7 @@ import stylesUit 1.0 Rectangle { width: 480 - height: 706 + height: 950 color: "#404040" @@ -30,11 +30,16 @@ Rectangle { } Item { height: 30; width: 1 } Column { - id: buildColumm + id: buildColumn anchors.left: parent.left - anchors.leftMargin: 70 + anchors.leftMargin: 0 RalewayRegular { - text: "Build " + About.buildVersion + text: "Interface (Codename Athena)" + size: 16 + color: "white" + } + RalewayRegular { + text: "Build " + About.buildVersion + " " + About.releaseName size: 16 color: "white" } @@ -54,10 +59,21 @@ Rectangle { textFormat: Text.StyledText linkColor: "#00B4EF" color: "white" - text: "Vircadia Github." + text: "Website" size: 20 onLinkActivated: { - About.openUrl("https:/github.com/vircadia/vircadia"); + About.openUrl("https://vircadia.com"); + } + + } + RalewayRegular { + textFormat: Text.StyledText + linkColor: "#00B4EF" + color: "white" + text: "Source" + size: 20 + onLinkActivated: { + About.openUrl("https://github.com/vircadia/vircadia"); } } @@ -117,7 +133,7 @@ Rectangle { Item { height: 20; width: 1 } RalewayRegular { color: "white" - text: "© 2019-2020 Vircadia contributors." + text: "© 2019-2021 Vircadia contributors." size: 14 } RalewayRegular { @@ -135,5 +151,23 @@ Rectangle { About.openUrl("http://www.apache.org/licenses/LICENSE-2.0.html"); } } + Item { height: 40; width: 1 } + RalewayRegular { + color: "white" + text: "In memoriam," + size: 14 + } + RalewayRegular { + color: "white" + text: "2012 - 2019 the High Fidelity virtual reality project." + size: 14 + } + Item { height: 5; width: 1 } + Image { + id: hifiLogo + width: 200; height: 50 + fillMode: Image.PreserveAspectFit + source: "../../../images/about-highfidelity.png" + } } } From 9ea1e7e464c1ddbdadc5eed6cccf92d8174ccd2d Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 1 Feb 2021 06:00:55 -0500 Subject: [PATCH 4/7] Update about dialog. --- LICENSE | 2 +- .../qml/hifi/dialogs/TabletAboutDialog.qml | 48 ++++++++++++++++--- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 8dfe384174..d5ca6ae075 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2013-2019, High Fidelity, Inc. -Copyright (c) 2019-2020, Vircadia contributors. +Copyright (c) 2019-2021, Vircadia contributors. All rights reserved. https://vircadia.com diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml index f7a4061f45..92fd86e2b5 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml @@ -14,7 +14,7 @@ import stylesUit 1.0 Rectangle { width: 480 - height: 706 + height: 950 color: "#404040" @@ -30,11 +30,16 @@ Rectangle { } Item { height: 30; width: 1 } Column { - id: buildColumm + id: buildColumn anchors.left: parent.left - anchors.leftMargin: 70 + anchors.leftMargin: 0 RalewayRegular { - text: "Build " + About.buildVersion + text: "Interface (Codename Athena)" + size: 16 + color: "white" + } + RalewayRegular { + text: "Build " + About.buildVersion + " " + About.releaseName size: 16 color: "white" } @@ -54,10 +59,21 @@ Rectangle { textFormat: Text.StyledText linkColor: "#00B4EF" color: "white" - text: "Vircadia Github." + text: "Website" size: 20 onLinkActivated: { - About.openUrl("https:/github.com/vircadia/vircadia"); + About.openUrl("https://vircadia.com"); + } + + } + RalewayRegular { + textFormat: Text.StyledText + linkColor: "#00B4EF" + color: "white" + text: "Source" + size: 20 + onLinkActivated: { + About.openUrl("https://github.com/vircadia/vircadia"); } } @@ -117,7 +133,7 @@ Rectangle { Item { height: 20; width: 1 } RalewayRegular { color: "white" - text: "© 2019-2020 Vircadia contributors." + text: "© 2019-2021 Vircadia contributors." size: 14 } RalewayRegular { @@ -135,5 +151,23 @@ Rectangle { About.openUrl("http://www.apache.org/licenses/LICENSE-2.0.html"); } } + Item { height: 40; width: 1 } + RalewayRegular { + color: "white" + text: "In memoriam," + size: 14 + } + RalewayRegular { + color: "white" + text: "2012 - 2019 the High Fidelity virtual reality project." + size: 14 + } + Item { height: 5; width: 1 } + Image { + id: hifiLogo + width: 200; height: 50 + fillMode: Image.PreserveAspectFit + source: "../../../images/about-highfidelity.png" + } } } From ea88d29145c26257e2d5a788eb2baddf8ad16644 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 1 Feb 2021 17:34:09 -0500 Subject: [PATCH 5/7] CR --- interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml index 92fd86e2b5..bb38fd4360 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml @@ -34,7 +34,7 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: 0 RalewayRegular { - text: "Interface (Codename Athena)" + text: "Interface" size: 16 color: "white" } @@ -133,7 +133,7 @@ Rectangle { Item { height: 20; width: 1 } RalewayRegular { color: "white" - text: "© 2019-2021 Vircadia contributors." + text: "© 2019 - 2021 Vircadia contributors." size: 14 } RalewayRegular { From 897c28075d2c365b71a60d4107b2ac8d082bdd64 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 1 Feb 2021 18:07:55 -0500 Subject: [PATCH 6/7] Update installer images. --- cmake/installer/installer-header.bmp | Bin 102654 -> 102654 bytes cmake/installer/uninstaller-header.bmp | Bin 102654 -> 102654 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/cmake/installer/installer-header.bmp b/cmake/installer/installer-header.bmp index a9519f02551c964b0b6229f8f24d45e59672bf67..99862ffdb4cc44abf26edc44ebb743cdd0950ffe 100644 GIT binary patch literal 102654 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 LMx)Vanl}FrOFS}V delta 8403 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 LMx)Vanl}FrOFS}V delta 8403 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 Date: Mon, 1 Feb 2021 21:51:18 -0500 Subject: [PATCH 7/7] Adjust spacing on about tablet dialog. --- .../resources/qml/hifi/dialogs/TabletAboutDialog.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml index bb38fd4360..d8f157c813 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml @@ -14,7 +14,7 @@ import stylesUit 1.0 Rectangle { width: 480 - height: 950 + height: 706 color: "#404040" @@ -28,7 +28,7 @@ Rectangle { fillMode: Image.PreserveAspectFit source: "../../../images/vircadia-banner.svg" } - Item { height: 30; width: 1 } + Item { height: 25; width: 1 } Column { id: buildColumn anchors.left: parent.left @@ -77,7 +77,7 @@ Rectangle { } } - Item { height: 40; width: 1 } + Item { height: 25; width: 1 } Row { spacing: 5 Image { @@ -151,7 +151,7 @@ Rectangle { About.openUrl("http://www.apache.org/licenses/LICENSE-2.0.html"); } } - Item { height: 40; width: 1 } + Item { height: 35; width: 1 } RalewayRegular { color: "white" text: "In memoriam,"