Merge pull request #427 from kasenvr/feature/further-rebranding

Feature/further rebranding

CMakeLists.txt

@@ -97,7 +97,7 @@ endif()
 
 option(VCPKG_APPLOCAL_DEPS OFF)
 
-project(athena)
+project(vircadia)
 include("cmake/init.cmake")
 include("cmake/compiler.cmake")
 option(VCPKG_APPLOCAL_DEPS OFF)

interface/resources/html/tabletHelp.html

@@ -79,7 +79,7 @@
             var count = 3;
             var handControllerRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#vr-controls";
             var keyboardRefURL = "https://docs.vircadia.dev/explore/get-started/desktop.html#movement-controls";
-			var gamepadRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#gamepad";
+            var gamepadRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#gamepad";
 
             function showKbm() {
                 document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");

interface/resources/qml/LoginDialog.qml

@@ -85,7 +85,9 @@ FocusScope {
         Image {
             id: banner
             anchors.centerIn: parent
-            source: "../images/project-athena-banner-color2.svg"
+            sourceSize.width: 500
+            sourceSize.height: 91
+            source: "../images/vircadia-logo.svg"
             horizontalAlignment: Image.AlignHCenter
         }
     }

interface/resources/qml/LoginDialog/SignUpBody.qml

@@ -23,7 +23,7 @@ Item {
     clip: true
     height: root.height
     width: root.width
-    readonly property string termsContainerText: qsTr("By signing up, you agree to Project Athena's Terms of Service")
+    readonly property string termsContainerText: qsTr("By signing up, you agree to Vircadia's Terms of Service")
     property int textFieldHeight: 31
     property string fontFamily: "Raleway"
     property int fontSize: 15

interface/resources/qml/LoginDialog/UsernameCollisionBody.qml

@@ -19,7 +19,7 @@ import TabletScriptingInterface 1.0
 Item {
     id: usernameCollisionBody
     clip: true
-    readonly property string termsContainerText: qsTr("By creating this user profile, you agree to Project Athena's Terms of Service")
+    readonly property string termsContainerText: qsTr("By creating this user profile, you agree to Vircadia's Terms of Service")
     width: root.width
     height: root.height
     readonly property string fontFamily: "Raleway"

interface/resources/qml/dialogs/TabletLoginDialog.qml

@@ -129,7 +129,9 @@ FocusScope {
         Image {
             id: banner
             anchors.centerIn: parent
-            source: "../../images/project-athena-banner-color2.svg"
+            sourceSize.width: 400
+            sourceSize.height: 73
+            source: "../../images/vircadia-logo.svg"
             horizontalAlignment: Image.AlignHCenter
         }
     }

interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml

@@ -23,9 +23,9 @@ Rectangle {
         spacing: 5
 
         Image {
-            sourceSize.width: 295
-            sourceSize.height: 75
-            source: "../../../images/about-projectathena.png"
+            width: 400; height: 73
+            fillMode: Image.PreserveAspectFit
+            source: "../../../images/vircadia-logo.svg"
         }
         Item { height: 30; width: 1 }
         Column {

interface/src/Application.cpp

@@ -656,8 +656,8 @@ class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
 /**jsdoc
  * <p>The <code>Controller.Hardware.Application</code> object has properties representing Interface's state. The property
  * values are integer IDs, uniquely identifying each output. <em>Read-only.</em></p>
- * <p>These states can be mapped to actions or functions or <code>Controller.Standard</code> items in a {@link RouteObject} 
- * mapping (e.g., using the {@link RouteObject#when} method). Each data value is either <code>1.0</code> for "true" or 
+ * <p>These states can be mapped to actions or functions or <code>Controller.Standard</code> items in a {@link RouteObject}
+ * mapping (e.g., using the {@link RouteObject#when} method). Each data value is either <code>1.0</code> for "true" or
  * <code>0.0</code> for "false".</p>
  * <table>
  *   <thead>
@@ -679,7 +679,7 @@ class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
  *     <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr>
  *     <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr>
  *     <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr>
- *     <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are 
+ *     <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are
  *       enabled.</td></tr>
  *     <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr>
  *     <tr><td><code>LeftHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to left.</td></tr>
@@ -829,7 +829,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
         audioDLLPath += "/audioWin7";
     }
     QCoreApplication::addLibraryPath(audioDLLPath);
-#endif 
+#endif
 
     QString defaultScriptsOverrideOption = getCmdOption(argc, constArgv, "--defaultScriptsOverride");
 
@@ -949,7 +949,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<AvatarPackager>();
     DependencyManager::set<ScreenshareScriptingInterface>();
     PlatformHelper::setup();
-    
+
     QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
         QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
         QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "noteAwakening", Qt::QueuedConnection);
@@ -1162,7 +1162,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         deadlockWatchdogThread->setMainThreadID(QThread::currentThreadId());
         deadlockWatchdogThread->start();
 
-        // Pause the deadlock watchdog when we sleep, or it might 
+        // Pause the deadlock watchdog when we sleep, or it might
         // trigger a false positive when we wake back up
         auto platformHelper = PlatformHelper::instance();
 
@@ -3790,9 +3790,8 @@ void Application::setPreferredCursor(const QString& cursorName) {
 
     if (_displayPlugin && _displayPlugin->isHmd()) {
         _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
-    }
-    else { 
-        _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); 
+    } else {
+        _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
     }
 
     showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
@@ -3979,7 +3978,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
         sentTo = SENT_TO_PREVIOUS_LOCATION;
     }
-    
+
     UserActivityLogger::getInstance().logAction("startup_sent_to", {
         { "sent_to", sentTo },
         { "sandbox_is_running", sandboxIsRunning },
@@ -4214,7 +4213,7 @@ bool Application::event(QEvent* event) {
             idle();
 
 #ifdef DEBUG_EVENT_QUEUE_DEPTH
-            // The event queue may very well grow beyond 400, so 
+            // The event queue may very well grow beyond 400, so
             // this code should only be enabled on local builds
             {
                 int count = ::hifi::qt::getEventQueueSize(QThread::currentThread());
@@ -4253,7 +4252,7 @@ bool Application::event(QEvent* event) {
         { //testing to see if we can set focus when focus is not set to root window.
             _glWidget->activateWindow();
             _glWidget->setFocus();
-            return true; 
+            return true;
         }
 
         case QEvent::TouchBegin:
@@ -5238,7 +5237,7 @@ void Application::idle() {
         }
     }
 #endif
-    
+
     checkChangeCursor();
 
 #if !defined(DISABLE_QML)
@@ -5491,7 +5490,7 @@ void Application::loadSettings() {
     RenderScriptingInterface::getInstance()->loadSettings();
 
     // Setup the PerformanceManager which will enforce the several settings to match the Preset
-    // On the first run, the Preset is evaluated from the 
+    // On the first run, the Preset is evaluated from the
     getPerformanceManager().setupPerformancePresetSettings(_firstRun.get());
 
     // finish initializing the camera, based on everything we checked above. Third person camera will be used if no settings
@@ -5537,7 +5536,7 @@ bool Application::importEntities(const QString& urlOrFilename, const bool isObse
     _entityClipboard->withWriteLock([&] {
         _entityClipboard->eraseAllOctreeElements();
 
-        // FIXME: readFromURL() can take over the main event loop which may cause problems, especially if downloading the JSON 
+        // FIXME: readFromURL() can take over the main event loop which may cause problems, especially if downloading the JSON
         // from the Web.
         success = _entityClipboard->readFromURL(urlOrFilename, isObservable, callerId);
         if (success) {
@@ -8737,7 +8736,7 @@ bool Application::isThrottleRendering() const {
 bool Application::hasFocus() const {
     bool result = (QApplication::activeWindow() != nullptr);
 
-    
+
 #if defined(Q_OS_WIN)
     // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't
     // take user focus away from their current window. So also check whether the application is the user's current foreground