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

Four-way discoverability. (Needs testing.)

Browse source
This commit is contained in:
Howard Stearns 2017-03-28 18:31:08 -07:00
parent c2a49a582e
commit c795d2ca3b
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/resources/qml/hifi/Pal.qml
View file

@ -162,17 +162,8 @@ Rectangle {
} }
HifiControlsUit.TabletComboBox { HifiControlsUit.TabletComboBox {
function determineAvailabilityIndex() { function determineAvailabilityIndex() {
var globalServicesAvailability = GlobalServices.findableBy; return ['all', 'connections', 'friends', 'none'].indexOf(GlobalServices.findableBy)
if (globalServicesAvailability === "all") { }
return 0;
} else if (globalServicesAvailability === "friends") {
return 1;
} else if (globalServicesAvailability === "none") {
return 2;
} else {
return 1;
}
}
id: availabilityComboBox; id: availabilityComboBox;
// Anchors // Anchors
anchors.top: parent.top; anchors.top: parent.top;
@ -184,6 +175,7 @@ Rectangle {
model: ListModel { model: ListModel {
id: availabilityComboBoxListItems id: availabilityComboBoxListItems
ListElement { text: "Everyone"; value: "all"; } ListElement { text: "Everyone"; value: "all"; }
ListElement { text: "All Connections"; value: "connections"; }
ListElement { text: "Friends Only"; value: "friends"; } ListElement { text: "Friends Only"; value: "friends"; }
ListElement { text: "Appear Offline"; value: "none" } ListElement { text: "Appear Offline"; value: "none" }
} }

1
interface/src/DiscoverabilityManager.h
View file

@ -19,6 +19,7 @@ namespace Discoverability {
enum Mode { enum Mode {
None, None,
Friends, Friends,
Connections,
All All
}; };
} }

6
interface/src/scripting/GlobalServicesScriptingInterface.cpp
View file

@ -59,7 +59,9 @@ QString GlobalServicesScriptingInterface::findableByString(Discoverability::Mode
return "none"; return "none";
} else if (discoverabilityMode == Discoverability::Friends) { } else if (discoverabilityMode == Discoverability::Friends) {
return "friends"; return "friends";
} else if (discoverabilityMode == Discoverability::All) { } else if (discoverabilityMode == Discoverability::Connections) {
return "connections";
} else if (discoverabilityMode == Discoverability::All) {
return "all"; return "all";
} else { } else {
qDebug() << "GlobalServices findableByString called with an unrecognized value."; qDebug() << "GlobalServices findableByString called with an unrecognized value.";
@ -80,6 +82,8 @@ void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabil
discoverabilityManager->setDiscoverabilityMode(Discoverability::None); discoverabilityManager->setDiscoverabilityMode(Discoverability::None);
} else if (discoverabilityMode.toLower() == "friends") { } else if (discoverabilityMode.toLower() == "friends") {
discoverabilityManager->setDiscoverabilityMode(Discoverability::Friends); discoverabilityManager->setDiscoverabilityMode(Discoverability::Friends);
} else if (discoverabilityMode.toLower() == "connections") {
discoverabilityManager->setDiscoverabilityMode(Discoverability::Connections);
} else if (discoverabilityMode.toLower() == "all") { } else if (discoverabilityMode.toLower() == "all") {
discoverabilityManager->setDiscoverabilityMode(Discoverability::All); discoverabilityManager->setDiscoverabilityMode(Discoverability::All);
} else { } else {