From 96047d7536e2f71a0c6ee9ef3efa9131f626f77c Mon Sep 17 00:00:00 2001 From: Marcus Llewellyn Date: Tue, 31 Mar 2020 14:33:08 -0500 Subject: [PATCH] Attempt find/replace all "High Fidleity" strings with "Vircadia" Also updates most URLs to point to Vircadia resources with the exception of the serverless domain tutorial. Branched from `v0.86.0-k2` --- server-console/package.json | 6 +++--- server-console/packager.js | 6 +++--- server-console/src/content-update.html | 4 ++-- server-console/src/downloader.html | 2 +- server-console/src/main.js | 22 +++++++++++----------- server-console/src/modules/hf-app.js | 10 +++++----- server-console/src/splash.html | 12 ++++++------ 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/server-console/package.json b/server-console/package.json index 6824d1d9cf..ed01a9c89e 100644 --- a/server-console/package.json +++ b/server-console/package.json @@ -1,6 +1,6 @@ { - "name": "HighFidelityConsole", - "description": "High Fidelity Console", + "name": "VircadiaConsole", + "description": "Vircadia Console", "author": "High Fidelity", "license": "Apache-2.0", "version": "1.0.0", @@ -13,7 +13,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/highfidelity/hifi.git" + "url": "https://github.com/kasenvr/project-athena.git" }, "main": "src/main.js", "scripts": { diff --git a/server-console/packager.js b/server-console/packager.js index 60aff6c540..dadc306bbf 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -28,15 +28,15 @@ var options = { const EXEC_NAME = "server-console"; var SHORT_NAME = argv.client_only ? "Console" : "Sandbox"; -var FULL_NAME = argv.client_only ? "High Fidelity Console" : "High Fidelity Sandbox"; +var FULL_NAME = argv.client_only ? "Vircadia Console" : "Vircadia Sandbox"; // setup per OS options if (osType == "Darwin") { - options["app-bundle-id"] = "com.highfidelity.server-console" + (argv.production ? "" : "-dev") + options["app-bundle-id"] = "com.vircadia.server-console" + (argv.production ? "" : "-dev") options["name"] = SHORT_NAME } else if (osType == "Windows_NT") { options["version-string"] = { - CompanyName: "High Fidelity, Inc.", + CompanyName: "Vircadia", FileDescription: FULL_NAME, ProductName: FULL_NAME, OriginalFilename: EXEC_NAME + ".exe" diff --git a/server-console/src/content-update.html b/server-console/src/content-update.html index 9298cd53e6..7c6b4c9971 100644 --- a/server-console/src/content-update.html +++ b/server-console/src/content-update.html @@ -1,7 +1,7 @@ - High Fidelity Sandbox + Vircadia Sandbox @@ -45,7 +45,7 @@
-

For more information about managing your high Fidelity Sandbox Server, check out our docs: wiki.highfidelity.com/wiki/Sandbox +

For more information about managing your Vircadia Sandbox Server, check out our docs: docs.vircadia.com

diff --git a/server-console/src/downloader.html b/server-console/src/downloader.html index 07d3392246..f1f7a2024c 100644 --- a/server-console/src/downloader.html +++ b/server-console/src/downloader.html @@ -1,7 +1,7 @@ - High Fidelity + Vircadia diff --git a/server-console/src/main.js b/server-console/src/main.js index 5adb4be4cb..d8d6fea4bf 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -113,7 +113,7 @@ function isInterfaceInstalled () { // the executable to a random location before starting it // which makes finding the interface near impossible using // relative paths. For now, as there are no server-only - // installs, we just assume the interface is installed here + // installs, we just assume the interface is installed here return true; } else { return interfacePath; @@ -134,7 +134,7 @@ function shutdown() { dialog.showMessageBox({ type: 'question', buttons: ['Yes', 'No'], - title: 'Stopping High Fidelity Sandbox', + title: 'Stopping Vircadia Sandbox', message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?' }, shutdownCallback); } else { @@ -280,7 +280,7 @@ function binaryMissingMessage(displayName, executableName, required) { var message = "The " + displayName + " executable was not found.\n"; if (required) { - message += "It is required for the High Fidelity Sandbox to run.\n\n"; + message += "It is required for the Vircadia Sandbox to run.\n\n"; } else { message += "\n"; } @@ -293,7 +293,7 @@ function binaryMissingMessage(displayName, executableName, required) { message += paths.join("\n"); } else { message += "It is expected to be found beside this executable.\n"; - message += "You may need to re-install the High Fidelity Sandbox."; + message += "You may need to re-install the Vircadia Sandbox."; } return message; @@ -337,10 +337,10 @@ var notificationState = NotificationState.UNNOTIFIED; function setNotificationState (notificationType, pending = undefined) { if (pending !== undefined) { - if ((notificationType === HifiNotificationType.TRANSACTIONS || + if ((notificationType === HifiNotificationType.TRANSACTIONS || notificationType === HifiNotificationType.ITEMS)) { // special case, because we want to clear the indicator light - // on INVENTORY when either Transactions or Items are + // on INVENTORY when either Transactions or Items are // clicked on in the notification popup, we detect that case // here and force both to be unnotified. pendingNotifications[HifiNotificationType.TRANSACTIONS] = pending; @@ -399,7 +399,7 @@ function visitSandboxClicked() { StartInterface('hifi://localhost'); } else { // show an error to say that we can't go home without an interface instance - dialog.showErrorBox("Client Not Found", binaryMissingMessage("High Fidelity client", "Interface", false)); + dialog.showErrorBox("Client Not Found", binaryMissingMessage("Vircadia client", "Interface", false)); } } @@ -613,7 +613,7 @@ function updateTrayMenu(serverState) { tray.setImage(trayIcons[notificationState]); tray.setContextMenu(Menu.buildFromTemplate(menuArray)); if (isShuttingDown) { - tray.setToolTip('High Fidelity - Shutting Down'); + tray.setToolTip('Vircadia - Shutting Down'); } } } @@ -868,7 +868,7 @@ function onContentLoaded() { notifier.notify({ icon: notificationIcon, title: 'An update is available!', - message: 'High Fidelity version ' + latestVersion + ' is available', + message: 'Vircadia version ' + latestVersion + ' is available', wait: true, appID: buildInfo.appUserModelId, url: url @@ -941,7 +941,7 @@ app.on('ready', function() { // Create tray icon tray = new Tray(trayIcons[NotificationState.UNNOTIFIED]); - tray.setToolTip('High Fidelity'); + tray.setToolTip('Vircadia'); tray.on('click', function() { tray.popUpContextMenu(tray.menu); @@ -951,7 +951,7 @@ app.on('ready', function() { trayNotifications.startPolling(); } updateTrayMenu(ProcessGroupStates.STOPPED); - + if (isServerInstalled()) { maybeInstallDefaultContentSet(onContentLoaded); } diff --git a/server-console/src/modules/hf-app.js b/server-console/src/modules/hf-app.js index af6c38cdb3..cdb744e5e6 100644 --- a/server-console/src/modules/hf-app.js +++ b/server-console/src/modules/hf-app.js @@ -34,8 +34,8 @@ exports.getBuildInfo = function() { buildIdentifier: "dev", buildNumber: "0", stableBuild: "0", - organization: "High Fidelity - dev", - appUserModelId: "com.highfidelity.console" + organization: "Vircadia - dev", + appUserModelId: "com.vircadia.console" }; var buildInfo = DEFAULT_BUILD_INFO; @@ -63,11 +63,11 @@ exports.startInterface = function(url) { // do this as a workaround for app translocation on osx, which makes // it nearly impossible to find the interface executable - var bundle_id = 'com.highfidelity.interface-dev'; + var bundle_id = 'com.vircadia.interface-dev'; if (buildInfo.releaseType == 'PR') { - bundle_id = 'com.highfidelity.interface-pr'; + bundle_id = 'com.vircadia.interface-pr'; } else if (buildInfo.releaseType == 'PRODUCTION') { - bundle_id = 'com.highfidelity.interface'; + bundle_id = 'com.vircadia.interface'; } childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url); } else { diff --git a/server-console/src/splash.html b/server-console/src/splash.html index d93b742181..f273ef16b7 100644 --- a/server-console/src/splash.html +++ b/server-console/src/splash.html @@ -1,7 +1,7 @@ - High Fidelity + Vircadia @@ -19,7 +19,7 @@

What now?

-High Fidelity is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes. +Vircadia is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes.

@@ -28,13 +28,13 @@ You can make your home yours by uploading your own models and scripts.

- To get started exploring and creating, check out our Quick-start Guide + To get started exploring and creating, check out our Quick-start Guide

How do I use it?

- You can manage your server by clicking on the High Fidelity icon in your + You can manage your server by clicking on the Vircadia icon in your