Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 23:30:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change Window Titles to Vircadia

Browse source 
Also strips trailing whitespaces from interface's Applicaction.cpp.
This commit is contained in:
Marcus Llewellyn 2020-05-17 14:30:36 -05:00
parent 187a2749c3
commit ce4aa67506
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -1139,7 +1139,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf");
_window->setWindowTitle("Project Athena"); _window->setWindowTitle("Vircadia Interface");
Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
@ -3166,7 +3166,7 @@ void Application::showLoginScreen() {
QJsonObject loginData = {}; QJsonObject loginData = {};
loginData["action"] = "login dialog popped up"; loginData["action"] = "login dialog popped up";
UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData); UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
_window->setWindowTitle("Project Athena"); _window->setWindowTitle("Vircadia Interface");
} else { } else {
resumeAfterLoginDialogActionTaken(); resumeAfterLoginDialogActionTaken();
} }
@ -7063,7 +7063,7 @@ void Application::updateWindowTitle() const {
auto accountManager = DependencyManager::get<AccountManager>(); auto accountManager = DependencyManager::get<AccountManager>();
auto isInErrorState = nodeList->getDomainHandler().isInErrorState(); auto isInErrorState = nodeList->getDomainHandler().isInErrorState();
QString buildVersion = " - Project Athena v0.86.0 K2 - " QString buildVersion = " - Vircadia Interface - "
+ (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build")) + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
+ " " + applicationVersion(); + " " + applicationVersion();