And synchronize visibility settings between Interface and users.js.
Showing the changes to interface/src/scripting/GlobalServicesScriptingInterface.cpp (1 of 7 files). Show all
Unified · Split
| @@ -24,6 +24,10 @@ GlobalServicesScriptingInterface::GlobalServicesScriptingInterface() { · 23 unmodified lines | ||
| 24 | 24 | _downloading = false; |
| 25 | 25 | connect(Application::getInstance(), &Application::renderingInWorldInterface, |
| 26 | 26 | this, &GlobalServicesScriptingInterface::checkDownloadInfo); |
| 27 | + | |
| 28 | + auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>(); | |
| 29 | + connect(discoverabilityManager.data(), &DiscoverabilityManager::discoverabilityModeChanged, | |
| 30 | + this, &GlobalServicesScriptingInterface::discoverabilityModeChanged); | |
| 27 | 31 | } |
| 28 | 32 | |
| 29 | 33 | GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() { |
| @@ -45,18 +49,26 @@ void GlobalServicesScriptingInterface::loggedOut() { · 15 unmodified lines | ||
| 45 | 49 | emit GlobalServicesScriptingInterface::disconnected(QString("logout")); |
| 46 | 50 | } |
| 47 | 51 | |
| 48 | −QString GlobalServicesScriptingInterface::getFindableBy() const { | |
| 49 | − auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>(); | |
| 50 | − | |
| 51 | − if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::None) { | |
| 52 | + | |
| 53 | +QString GlobalServicesScriptingInterface::findableByString(Discoverability::Mode discoverabilityMode) const { | |
| 54 | + if (discoverabilityMode == Discoverability::None) { | |
| 52 | 55 | return "none"; |
| 53 | − } else if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::Friends) { | |
| 56 | + } else if (discoverabilityMode == Discoverability::Friends) { | |
| 54 | 57 | return "friends"; |
| 55 | − } else { | |
| 58 | + } else if (discoverabilityMode == Discoverability::All) { | |
| 56 | 59 | return "all"; |
| 60 | + } else { | |
| 61 | + qDebug() << "GlobalServices findableByString called with an unrecognized value."; | |
| 62 | + return ""; | |
| 57 | 63 | } |
| 58 | 64 | } |
| 59 | 65 | |
| 66 | + | |
| 67 | +QString GlobalServicesScriptingInterface::getFindableBy() const { | |
| 68 | + auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>(); | |
| 69 | + return findableByString(discoverabilityManager->getDiscoverabilityMode()); | |
| 70 | +} | |
| 71 | + | |
| 60 | 72 | void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) { |
| 61 | 73 | auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>(); |
| 62 | 74 | |
| @@ -71,6 +83,10 @@ void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabil · 8 unmodified lines | ||
| 71 | 83 | } |
| 72 | 84 | } |
| 73 | 85 | |
| 86 | +void GlobalServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) { | |
| 87 | + emit findableByChanged(findableByString(discoverabilityMode)); | |
| 88 | +} | |
| 89 | + | |
| 74 | 90 | DownloadInfoResult::DownloadInfoResult() : |
| 75 | 91 | downloading(QList<float>()), |
| 76 | 92 | pending(0.0f) |