History

Add menu items that set visibility

And synchronize visibility settings between Interface and users.js.

David Rowe committed 11 years ago

Commit cbf20121 parent be69c0b7 files · +104 −32Browse files

Showing the changes to interface/src/scripting (2 of 7 files). Show all

Unified · Split

2 files
  1. interface/src/scripting/GlobalServicesScriptingInterface.cpp +22 −6
  2. interface/src/scripting/GlobalServicesScriptingInterface.h +4 −0
interface/src/scripting/GlobalServicesScriptingInterface.cpp+22−6
@@ -24,6 +24,10 @@ GlobalServicesScriptingInterface::GlobalServicesScriptingInterface() { · 23 unmodified lines
24 _downloading = false;24 _downloading = false;
25 connect(Application::getInstance(), &Application::renderingInWorldInterface, 25 connect(Application::getInstance(), &Application::renderingInWorldInterface,
26 this, &GlobalServicesScriptingInterface::checkDownloadInfo);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
29GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() {33GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() {
@@ -45,18 +49,26 @@ void GlobalServicesScriptingInterface::loggedOut() { · 15 unmodified lines
45 emit GlobalServicesScriptingInterface::disconnected(QString("logout"));49 emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
46}50}
47 51
48QString GlobalServicesScriptingInterface::getFindableBy() const {52
49 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();53QString GlobalServicesScriptingInterface::findableByString(Discoverability::Mode discoverabilityMode) const {
50 54 if (discoverabilityMode == Discoverability::None) {
51 if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::None) {
52 return "none";55 return "none";
53 } else if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::Friends) {56 } else if (discoverabilityMode == Discoverability::Friends) {
54 return "friends";57 return "friends";
55 } else {58 } else if (discoverabilityMode == Discoverability::All) {
56 return "all";59 return "all";
60 } else {
61 qDebug() << "GlobalServices findableByString called with an unrecognized value.";
62 return "";
57 }63 }
58}64}
59 65
66
67QString GlobalServicesScriptingInterface::getFindableBy() const {
68 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
69 return findableByString(discoverabilityManager->getDiscoverabilityMode());
70}
71
60void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {72void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {
61 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();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
86void GlobalServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) {
87 emit findableByChanged(findableByString(discoverabilityMode));
88}
89
74DownloadInfoResult::DownloadInfoResult() :90DownloadInfoResult::DownloadInfoResult() :
75 downloading(QList<float>()),91 downloading(QList<float>()),
76 pending(0.0f)92 pending(0.0f)
interface/src/scripting/GlobalServicesScriptingInterface.h+4−0
@@ -53,17 +53,21 @@ private slots: · 52 unmodified lines
53 53
54 QString getFindableBy() const;54 QString getFindableBy() const;
55 void setFindableBy(const QString& discoverabilityMode);55 void setFindableBy(const QString& discoverabilityMode);
56 void discoverabilityModeChanged(Discoverability::Mode discoverabilityMode);
56 57
57signals:58signals:
58 void connected();59 void connected();
59 void disconnected(const QString& reason);60 void disconnected(const QString& reason);
60 void myUsernameChanged(const QString& username);61 void myUsernameChanged(const QString& username);
61 void downloadInfoChanged(DownloadInfoResult info);62 void downloadInfoChanged(DownloadInfoResult info);
63 void findableByChanged(const QString& discoverabilityMode);
62 64
63private:65private:
64 GlobalServicesScriptingInterface();66 GlobalServicesScriptingInterface();
65 ~GlobalServicesScriptingInterface();67 ~GlobalServicesScriptingInterface();
66 68
69 QString findableByString(Discoverability::Mode discoverabilityMode) const;
70
67 bool _downloading;71 bool _downloading;
68};72};
69 73