Merge pull request #524 from JulianGro/macos-rebrand

Change strings, comments and folders to Vircadia rebrand

interface/CMakeLists.txt

@@ -121,14 +121,14 @@ if (APPLE)
   # configure CMake to use a custom Info.plist
   set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
 
-  set(MACOSX_BUNDLE_BUNDLE_NAME "High Fidelity")
+  set(MACOSX_BUNDLE_BUNDLE_NAME "Vircadia")
   if (PRODUCTION_BUILD)
-    set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface)
+    set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface)
   else ()
     if (DEV_BUILD)
-      set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface-dev)
+      set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-dev)
     elseif (PR_BUILD)
-      set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface-pr)
+      set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-pr)
     endif ()
   endif ()
 

launchers/darwin/CMakeLists.txt

@@ -143,13 +143,13 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
 include(CPackComponent)
 
 set(CPACK_PACKAGE_NAME "HQ Launcher")
-set(CPACK_PACKAGE_VENDOR "High Fidelity")
+set(CPACK_PACKAGE_VENDOR "Vircadia")
 set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
 set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
 
 set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
 
-set(DMG_SUBFOLDER_NAME "High Fidelity")
+set(DMG_SUBFOLDER_NAME "Vircadia")
 set(ESCAPED_DMG_SUBFOLDER_NAME "")
 set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")
 

launchers/qt/CMakeLists.txt

@@ -276,12 +276,12 @@ if (APPLE)
   include(CPackComponent)
 
   set(CPACK_PACKAGE_NAME "HQ Launcher")
-  set(CPACK_PACKAGE_VENDOR "High Fidelity")
+  set(CPACK_PACKAGE_VENDOR "Vircadia")
   set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
 
   set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
 
-  set(DMG_SUBFOLDER_NAME "High Fidelity")
+  set(DMG_SUBFOLDER_NAME "Vircadia")
   set(ESCAPED_DMG_SUBFOLDER_NAME "")
   set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc")
 

launchers/qt/resources/qml/HFControls/HFTextLogo.qml

@@ -2,7 +2,7 @@ import QtQuick 2.3
 import QtQuick 2.1
 
 Text {
-    text: "High Fidelity"
+    text: "Vircadia"
     font.bold: true
     font.family: "Graphik Semibold"
     font.pixelSize: 17

launchers/qt/src/Launcher.cpp

@@ -21,7 +21,7 @@ Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) {
     _launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get());
     _launcherWindow->rootContext()->setContextProperty("PathUtils", new PathUtils());
     _launcherWindow->rootContext()->setContextProperty("Platform", platform);
-    _launcherWindow->setTitle("High Fidelity");
+    _launcherWindow->setTitle("Vircadia");
     _launcherWindow->setFlags(Qt::FramelessWindowHint | Qt::Window);
     _launcherWindow->setLauncherStatePtr(_launcherState);
 

launchers/qt/src/LauncherInstaller_windows.cpp

@@ -253,7 +253,7 @@ void LauncherInstaller::createApplicationRegistryKeys() {
     success = insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
     success = insertRegistryKey(REGISTRY_PATH, "DisplayVersion", std::string(LAUNCHER_BUILD_VERSION));
     success = insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
-    success = insertRegistryKey(REGISTRY_PATH, "Publisher", "High Fidelity");
+    success = insertRegistryKey(REGISTRY_PATH, "Publisher", "Vircadia");
 
     auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 

launchers/qt/src/main.cpp

@@ -31,7 +31,7 @@ bool hasSuffix(const std::string& path, const std::string& suffix) {
 
 int main(int argc, char *argv[]) {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QCoreApplication::setOrganizationName("High Fidelity");
+    QCoreApplication::setOrganizationName("Vircadia");
     QCoreApplication::setApplicationName("HQ Launcher");
 
     Q_INIT_RESOURCE(resources);

launchers/win32/LauncherManager.cpp

@@ -629,7 +629,7 @@ BOOL LauncherManager::createApplicationRegistryKeys(int size) {
     success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
     success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayVersion", LauncherUtils::cStringToStd(_latestVersion));
     success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
-    success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "Publisher", "High Fidelity");
+    success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "Publisher", "Vircadia");
     success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "InstallDate", LauncherUtils::cStringToStd(CTime::GetCurrentTime().Format("%Y%m%d")));
     success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "EstimatedSize", (DWORD)size);
     success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "NoModify", (DWORD)1);

screenshare/packager.js

@@ -26,8 +26,8 @@ if (osType == "Darwin") {
     options["app-bundle-id"] = "com.highfidelity.hifi-screenshare";
 } else if (osType == "Windows_NT") {
     options["version-string"] = {
-        CompanyName: "High Fidelity, Inc.",
-        FileDescription: "High Fidelity Screenshare",
+        CompanyName: "Vircadia",
+        FileDescription: "Vircadia Screenshare",
         ProductName: NAME,
         OriginalFilename: NAME + ".exe"
     }
@@ -47,4 +47,3 @@ packager(options)
         console.error("There was an error writing the packaged console: " + error.message);
         process.exit(1);
     });
-    

tools/nitpick/src/TestRunnerDesktop.cpp

@@ -3,6 +3,7 @@
 //
 //  Created by Nissim Hadar on 1 Sept 2018.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 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
@@ -77,9 +78,9 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() {
     setWorkingFolder(_workingFolderLabel);
 
 #ifdef Q_OS_WIN
-    _installationFolder = _workingFolder + "/High Fidelity";
+    _installationFolder = _workingFolder + "/Vircadia";
 #elif defined Q_OS_MAC
-    _installationFolder = _workingFolder + "/High_Fidelity";
+    _installationFolder = _workingFolder + "/Vircadia";
 #endif
 
     nitpick->enableRunTabControls();
@@ -193,7 +194,7 @@ void TestRunnerDesktop::downloadComplete() {
         // Download of Build XML has completed
         buildXMLDownloaded = true;
 
-        // Download the High Fidelity installer
+        // Download the Vircadia installer
         QStringList urls;
         QStringList filenames;
         if (_runLatest->isChecked()) {
@@ -256,11 +257,11 @@ void TestRunnerDesktop::runInstaller() {
         QDir().mkdir(_installationFolder);
     }
 
-    // This script installs High Fidelity.  It is run as "yes | install_app.sh... so "yes" is killed at the end
+    // This script installs Vircadia.  It is run as "yes | install_app.sh... so "yes" is killed at the end
     script.write("#!/bin/sh\n\n");
     script.write("VOLUME=`hdiutil attach \"$1\" | grep Volumes | awk '{print $3}'`\n");
 
-    QString folderName {"High Fidelity"};
+    QString folderName {"Vircadia"};
     if (!_runLatest->isChecked()) {
         folderName += QString(" - ") + getPRNumberFromURL(_url->text());
     }
@@ -303,10 +304,10 @@ void TestRunnerDesktop::verifyInstallationSucceeded() {
     if (!interfaceExe.exists() || !assignmentClientExe.exists() || !domainServerExe.exists()) {
         if (_runLatest->isChecked()) {
             // On Windows, the reason is probably that UAC has blocked the installation.  This is treated as a critical error
-            QMessageBox::critical(0, "Installation of High Fidelity has failed", "Please verify that UAC has been disabled");
+            QMessageBox::critical(0, "Installation of Vircadia has failed", "Please verify that UAC has been disabled");
             exit(-1);
         } else {
-            QMessageBox::critical(0, "Installation of High Fidelity not found", "Please verify that working folder contains a proper installation");
+            QMessageBox::critical(0, "Installation of vircadia not found", "Please verify that working folder contains a proper installation");
         }
     }
 #endif
@@ -320,10 +321,10 @@ void TestRunnerDesktop::saveExistingHighFidelityAppDataFolder() {
     dataDirectory = QDir::homePath() + "/Library/Application Support";
 #endif
     if (_runLatest->isChecked()) {
-        _appDataFolder = dataDirectory + "/High Fidelity";
+        _appDataFolder = dataDirectory + "/Vircadia";
     } else {
         // We are running a PR build
-        _appDataFolder = dataDirectory + "/High Fidelity - " + getPRNumberFromURL(_url->text());
+        _appDataFolder = dataDirectory + "/Vircadia - " + getPRNumberFromURL(_url->text());
     }
 
     _savedAppDataFolder = dataDirectory + "/" + UNIQUE_FOLDER_NAME;
@@ -555,7 +556,7 @@ void TestRunnerDesktop::interfaceExecutionComplete() {
 
     evaluateResults();
 
-    // The High Fidelity AppData folder will be restored after evaluation has completed
+    // The Vircadia AppData folder will be restored after evaluation has completed
 }
 
 void TestRunnerDesktop::evaluateResults() {