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

add display name as param

Browse source
This commit is contained in:
luiscuenca 2019-05-23 10:21:47 -07:00
parent 6d824ff22d
commit 8db3d03772
No known key found for this signature in database
GPG key ID: 2387ECD129A6961D
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -9355,6 +9355,16 @@ void Application::showUrlHandler(const QUrl& url) {
}); });
} }
void Application::forceDisplayName(const QString& displayName) {
getMyAvatar()->setDisplayName(displayName);
}
void Application::forceLogginWithTokens(const QString& tokens) {
DependencyManager::get<AccountManager>()->setAccessTokens(tokens);
}
void Application::setConfigFileURL(const QString& fileUrl) {
DependencyManager::get<AccountManager>()->setConfigFileURL(fileUrl);
}
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
void Application::beforeEnterBackground() { void Application::beforeEnterBackground() {
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();

4
interface/src/Application.h
View file

@ -356,6 +356,10 @@ public:
void openDirectory(const QString& path); void openDirectory(const QString& path);
void forceDisplayName(const QString& displayName);
void forceLogginWithTokens(const QString& tokens);
void setConfigFileURL(const QString& fileUrl);
signals: signals:
void svoImportRequested(const QString& url); void svoImportRequested(const QString& url);

24
interface/src/main.cpp
View file

@ -84,6 +84,7 @@ int main(int argc, const char* argv[]) {
QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir"); QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir");
QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts <path>", "path"); QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts <path>", "path");
QCommandLineOption responseTokensOption("tokens", "set response tokens <json>", "json"); QCommandLineOption responseTokensOption("tokens", "set response tokens <json>", "json");
QCommandLineOption displayNameOption("displayName", "set user display name <string>", "string");
parser.addOption(urlOption); parser.addOption(urlOption);
parser.addOption(noLauncherOption); parser.addOption(noLauncherOption);
@ -95,6 +96,7 @@ int main(int argc, const char* argv[]) {
parser.addOption(overrideScriptsPathOption); parser.addOption(overrideScriptsPathOption);
parser.addOption(allowMultipleInstancesOption); parser.addOption(allowMultipleInstancesOption);
parser.addOption(responseTokensOption); parser.addOption(responseTokensOption);
parser.addOption(displayNameOption);
if (!parser.parse(arguments)) { if (!parser.parse(arguments)) {
std::cout << parser.errorText().toStdString() << std::endl; // Avoid Qt log spam std::cout << parser.errorText().toStdString() << std::endl; // Avoid Qt log spam
@ -403,16 +405,18 @@ int main(int argc, const char* argv[]) {
printSystemInformation(); printSystemInformation();
if (!launcherPath.isEmpty() || parser.isSet(responseTokensOption)) { auto appPointer = dynamic_cast<Application*>(&app);
auto accountManager = DependencyManager::get<AccountManager>(); if (appPointer) {
if (!accountManager.isNull()) { if (parser.isSet(displayNameOption)) {
if (!launcherPath.isEmpty()) { QString displayName = QString(parser.value(displayNameOption));
accountManager->setConfigFileURL(configFileName); appPointer->forceDisplayName(displayName);
} }
if (parser.isSet(responseTokensOption)) { if (!launcherPath.isEmpty()) {
QString tokens = QString(parser.value(responseTokensOption)); appPointer->setConfigFileURL(configFileName);
accountManager->setAccessTokens(tokens); }
} if (parser.isSet(responseTokensOption)) {
QString tokens = QString(parser.value(responseTokensOption));
appPointer->forceLogginWithTokens(tokens);
} }
} }