diff --git a/cmake/installer/installer.ico b/cmake/installer/installer.ico index 5c09071822..b337544f88 100644 Binary files a/cmake/installer/installer.ico and b/cmake/installer/installer.ico differ diff --git a/interface/resources/images/Loading-Inner-H.png b/interface/resources/images/Loading-Inner-H.png index 93369d61c8..06359f0c35 100644 Binary files a/interface/resources/images/Loading-Inner-H.png and b/interface/resources/images/Loading-Inner-H.png differ diff --git a/interface/resources/images/about-projectathena.png b/interface/resources/images/about-projectathena.png deleted file mode 100644 index ae2d2bcd06..0000000000 Binary files a/interface/resources/images/about-projectathena.png and /dev/null differ diff --git a/interface/resources/images/about-vircadia.png b/interface/resources/images/about-vircadia.png index 14ae73b226..38ece8a154 100644 Binary files a/interface/resources/images/about-vircadia.png and b/interface/resources/images/about-vircadia.png differ diff --git a/interface/resources/images/hifi-logo-blackish.svg b/interface/resources/images/hifi-logo-blackish.svg deleted file mode 100644 index 60bfb3d418..0000000000 --- a/interface/resources/images/hifi-logo-blackish.svg +++ /dev/null @@ -1,123 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/interface/resources/images/hifi-logo.svg b/interface/resources/images/hifi-logo.svg deleted file mode 100644 index e5d66d8f18..0000000000 --- a/interface/resources/images/hifi-logo.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/interface/resources/images/project-athena-banner-color2.svg b/interface/resources/images/project-athena-banner-color2.svg deleted file mode 100644 index b41a980fe0..0000000000 --- a/interface/resources/images/project-athena-banner-color2.svg +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - image/svg+xml - - Artboard 1 - - - - - - - - - - - - - - - - - - - Artboard 1 - - - - - - - - - - - - - - - - - - - - - diff --git a/interface/resources/images/vircadia-banner.svg b/interface/resources/images/vircadia-banner.svg new file mode 100644 index 0000000000..b53dd79040 --- /dev/null +++ b/interface/resources/images/vircadia-banner.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/interface/resources/images/vircadia-logo.svg b/interface/resources/images/vircadia-logo.svg index b53dd79040..10645c4120 100644 --- a/interface/resources/images/vircadia-logo.svg +++ b/interface/resources/images/vircadia-logo.svg @@ -1,23 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - + +image/svg+xml + + + + + + + + + + + \ No newline at end of file diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml index 375d68ad26..ec239206ae 100644 --- a/interface/resources/qml/LoginDialog.qml +++ b/interface/resources/qml/LoginDialog.qml @@ -87,7 +87,7 @@ FocusScope { anchors.centerIn: parent sourceSize.width: 500 sourceSize.height: 91 - source: "../images/vircadia-logo.svg" + source: "../images/vircadia-banner.svg" horizontalAlignment: Image.AlignHCenter } } diff --git a/interface/resources/qml/OverlayLoginDialog.qml b/interface/resources/qml/OverlayLoginDialog.qml index 466585f045..5fb72f2689 100644 --- a/interface/resources/qml/OverlayLoginDialog.qml +++ b/interface/resources/qml/OverlayLoginDialog.qml @@ -83,7 +83,7 @@ FocusScope { anchors.centerIn: parent sourceSize.width: 500 sourceSize.height: 91 - source: "../images/vircadia-logo.svg" + source: "../images/vircadia-banner.svg" horizontalAlignment: Image.AlignHCenter } } diff --git a/interface/resources/qml/UpdateDialog.qml b/interface/resources/qml/UpdateDialog.qml index 9c22d0b65b..c3a7a45c69 100644 --- a/interface/resources/qml/UpdateDialog.qml +++ b/interface/resources/qml/UpdateDialog.qml @@ -47,7 +47,7 @@ ScrollingWindow { Image { id: logo - source: "../images/hifi-logo.svg" + source: "../images/vircadia-logo.svg" width: updateDialog.logoSize height: updateDialog.logoSize anchors { diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml index 533fd1197c..f794fea66a 100644 --- a/interface/resources/qml/dialogs/TabletLoginDialog.qml +++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml @@ -131,7 +131,7 @@ FocusScope { anchors.centerIn: parent sourceSize.width: 400 sourceSize.height: 73 - source: "../../images/vircadia-logo.svg" + source: "../../images/vircadia-banner.svg" horizontalAlignment: Image.AlignHCenter } } diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml index edb862b023..128ef61c75 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml @@ -128,7 +128,7 @@ ShadowRectangle { } } - // FIXME: Link to a Project Athena version of the video. + // FIXME: Link to a Vircadias version of the video. /* RalewayButton { id: video diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml index cbaa5c7b08..e7a9e0cef2 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml @@ -25,7 +25,7 @@ Rectangle { Image { width: 400; height: 73 fillMode: Image.PreserveAspectFit - source: "../../../images/vircadia-logo.svg" + source: "../../../images/vircadia-banner.svg" } Item { height: 30; width: 1 } Column { @@ -53,7 +53,7 @@ Rectangle { textFormat: Text.StyledText linkColor: "#00B4EF" color: "white" - text: "Vircadia Github." + text: "Vircadia Github." size: 20 onLinkActivated: { HiFiAbout.openUrl("https:/github.com/kasenvr/project-athena"); diff --git a/interface/src/avatar/AvatarProject.h b/interface/src/avatar/AvatarProject.h index 4c1e55fa1c..3e0d69f78b 100644 --- a/interface/src/avatar/AvatarProject.h +++ b/interface/src/avatar/AvatarProject.h @@ -95,7 +95,7 @@ public: static bool isValidNewProjectName(const QString& projectPath, const QString& projectName); static QString getDefaultProjectsPath() { - return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Project Athena Projects"; + return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Vircadia Projects"; } signals: diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 3f6d5ed408..ae476b8142 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -379,7 +379,7 @@ int main(int argc, const char* argv[]) { PROFILE_SYNC_END(startup, "app full ctor", ""); #if defined(Q_OS_LINUX) - app.setWindowIcon(QIcon(PathUtils::resourcesPath() + "images/hifi-logo.svg")); + app.setWindowIcon(QIcon(PathUtils::resourcesPath() + "images/vircadia-logo.svg")); #endif QTimer exitTimer; diff --git a/libraries/networking/src/MetaverseAPI.cpp b/libraries/networking/src/MetaverseAPI.cpp index 0fb0bcecad..73316ecda3 100644 --- a/libraries/networking/src/MetaverseAPI.cpp +++ b/libraries/networking/src/MetaverseAPI.cpp @@ -3,7 +3,7 @@ // libraries/networking/src // // Created by Kalila (kasenvr) on 2019-12-16. -// Copyright 2019 Project Athena +// Copyright 2019 Vircadia // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/networking/src/MetaverseAPI.h b/libraries/networking/src/MetaverseAPI.h index 423f465229..026f8d8b70 100644 --- a/libraries/networking/src/MetaverseAPI.h +++ b/libraries/networking/src/MetaverseAPI.h @@ -3,7 +3,7 @@ // libraries/networking/src // // Created by Kalila (kasenvr) on 2019-12-16. -// Copyright 2019 Project Athena +// Copyright 2019 Vircadia // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/scripts/system/more/app-more.js b/scripts/system/more/app-more.js index b728378e39..8dc0603385 100644 --- a/scripts/system/more/app-more.js +++ b/scripts/system/more/app-more.js @@ -6,7 +6,7 @@ // Created by Keb Helion, February 2020. // Copyright 2020 Vircadia contributors. // -// This script adds a "More Apps" selector to "Project Athena" to allow the user to add optional functionalities to the tablet. +// This script adds a "More Apps" selector to "Vircadia" to allow the user to add optional functionalities to the tablet. // This application has been designed to work directly from the Github repository. // // Distributed under the Apache License, Version 2.0.