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

elimated uncofigurable items from the list

Browse source
This commit is contained in:
Dante Ruiz 2017-06-07 00:48:12 +01:00
parent 70ba344f1b
commit 4ba1fdc323
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/tablet/InputConfiguration.qml
View file

@ -101,8 +101,12 @@ Rectangle {
onClicked: { onClicked: {
if (checked) { if (checked) {
box.model = InputConfiguration.activeInputPlugins(); box.model = InputConfiguration.activeInputPlugins();
loader.source = "";
loader.source = InputConfiguration.configurationLayout(box.currentText);
} else { } else {
box.model = InputConfiguration.inputPlugins(); box.model = InputConfiguration.inputPlugins();
loader.source = "";
loader.source = InputConfiguration.configurationLayout(box.currentText);
} }
} }
} }

2
libraries/plugins/src/plugins/InputConfiguration.cpp
View file

@ -27,7 +27,7 @@ QStringList InputConfiguration::inputPlugins() {
QStringList InputConfiguration::activeInputPlugins() { QStringList InputConfiguration::activeInputPlugins() {
QStringList activePlugins; QStringList activePlugins;
for (auto plugin : PluginManager::getInstance()->getInputPlugins()) { for (auto plugin : PluginManager::getInstance()->getInputPlugins()) {
if (plugin->isActive()) { if (plugin->configurable()) {
activePlugins << QString(plugin->getName()); activePlugins << QString(plugin->getName());
} }
} }

1
plugins/openvr/src/ViveControllerManager.h
View file

@ -41,6 +41,7 @@ public:
const QString getName() const override { return NAME; } const QString getName() const override { return NAME; }
bool isHandController() const override { return true; } bool isHandController() const override { return true; }
bool configurable() override { return true; }
QString configurationLayout() override; QString configurationLayout() override;
void configurationSettings(const QJsonObject configurationSettings) override; void configurationSettings(const QJsonObject configurationSettings) override;