From 4ba1fdc323cc526165dffea7163a77536797e3c0 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 7 Jun 2017 00:48:12 +0100 Subject: [PATCH] elimated uncofigurable items from the list --- interface/resources/qml/hifi/tablet/InputConfiguration.qml | 4 ++++ libraries/plugins/src/plugins/InputConfiguration.cpp | 2 +- plugins/openvr/src/ViveControllerManager.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/tablet/InputConfiguration.qml b/interface/resources/qml/hifi/tablet/InputConfiguration.qml index 9393906b06..8c183986b2 100644 --- a/interface/resources/qml/hifi/tablet/InputConfiguration.qml +++ b/interface/resources/qml/hifi/tablet/InputConfiguration.qml @@ -101,8 +101,12 @@ Rectangle { onClicked: { if (checked) { box.model = InputConfiguration.activeInputPlugins(); + loader.source = ""; + loader.source = InputConfiguration.configurationLayout(box.currentText); } else { box.model = InputConfiguration.inputPlugins(); + loader.source = ""; + loader.source = InputConfiguration.configurationLayout(box.currentText); } } } diff --git a/libraries/plugins/src/plugins/InputConfiguration.cpp b/libraries/plugins/src/plugins/InputConfiguration.cpp index 051bb3281c..fcafb51c35 100644 --- a/libraries/plugins/src/plugins/InputConfiguration.cpp +++ b/libraries/plugins/src/plugins/InputConfiguration.cpp @@ -27,7 +27,7 @@ QStringList InputConfiguration::inputPlugins() { QStringList InputConfiguration::activeInputPlugins() { QStringList activePlugins; for (auto plugin : PluginManager::getInstance()->getInputPlugins()) { - if (plugin->isActive()) { + if (plugin->configurable()) { activePlugins << QString(plugin->getName()); } } diff --git a/plugins/openvr/src/ViveControllerManager.h b/plugins/openvr/src/ViveControllerManager.h index b8a6206d60..a4ec35c400 100644 --- a/plugins/openvr/src/ViveControllerManager.h +++ b/plugins/openvr/src/ViveControllerManager.h @@ -41,6 +41,7 @@ public: const QString getName() const override { return NAME; } bool isHandController() const override { return true; } + bool configurable() override { return true; } QString configurationLayout() override; void configurationSettings(const QJsonObject configurationSettings) override;