From f6ef1443c8d7b3d96c0f7085c17e248b813b97fc Mon Sep 17 00:00:00 2001
From: druiz17 <danteruiz11@yahoo.com>
Date: Sun, 11 Jun 2017 12:08:45 -0700
Subject: [PATCH] some more clean up

---
 .../qml/hifi/tablet/InputConfiguration.qml    | 36 ++++++++++++++++---
 .../qml/hifi/tablet/OpenVrConfiguration.qml   |  2 --
 .../src/plugins/InputConfiguration.cpp        |  1 -
 plugins/openvr/src/ViveControllerManager.cpp  |  3 --
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/InputConfiguration.qml b/interface/resources/qml/hifi/tablet/InputConfiguration.qml
index e97c5a9841..b89df4fa3e 100644
--- a/interface/resources/qml/hifi/tablet/InputConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/InputConfiguration.qml
@@ -89,12 +89,24 @@ Rectangle {
             editable: true
             colorScheme: hifi.colorSchemes.dark
             model: inputPlugins()
+	    label: ""
             
             onCurrentIndexChanged: {
-                loader.source = ""
-                loader.source = InputConfiguration.configurationLayout(box.currentText);
+		changeSource();
             }
         }
+
+	HifiControls.CheckBox {
+	    id: checkBox
+	    colorScheme: hifi.colorSchemes.dark
+	    text: "show all input plugins"
+
+	    onClicked: {
+		console.log("clicked");
+		inputPlugins();
+		changeSource();
+	    }
+	}
     }
 
 
@@ -156,12 +168,26 @@ Rectangle {
     }
     
     function inputPlugins() {
-        return InputConfiguration.inputPlugins();
+	if (checkBox.checked) {
+            return InputConfiguration.inputPlugins();
+	} else {
+	    return InputConfiguration.activeInputPlugins();
+	}
     }
 
     function initialize() {
-        loader.source = "";
-        loader.source = InputConfiguration.configurationLayout(box.currentText);
+        chanageSource();
+    }
+
+    function changeSource() {
+	loader.source = "";
+	var source = InputConfiguration.configurationLayout(box.currentText);
+	loader.source = "OpenVrConfiguration.qml";
+	if (source === "") {
+	    box.label = "(not configurable)";
+	} else {
+	    box.label = "";
+	}
     }
 
     Timer {
diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index 58abc4252e..e00ee17228 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -385,7 +385,6 @@ Rectangle {
             anchors.fill: parent
 
             onClicked: {
-                console.log("calibration button pressed...");
                 openVrConfiguration.countDown = timeToCalibrate.value;
                 numberAnimation.start();
                 calibrationTimer.start();
@@ -403,7 +402,6 @@ Rectangle {
             InputConfiguration.calibratePlugin(pluginName)
             info.visible = false;
             info.showCountDown = false;
-            console.log("calibration started");
         }
     }
 
diff --git a/libraries/plugins/src/plugins/InputConfiguration.cpp b/libraries/plugins/src/plugins/InputConfiguration.cpp
index 3482810448..3414350bf1 100644
--- a/libraries/plugins/src/plugins/InputConfiguration.cpp
+++ b/libraries/plugins/src/plugins/InputConfiguration.cpp
@@ -71,6 +71,5 @@ void InputConfiguration::calibratePlugin(QString pluginName) {
 }
 
 void InputConfiguration::calibrated(const QJsonObject& status) {
-    qDebug() << "-----------> emitting configuration status <------------";
     emit calibrationStatus(status);
 }
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index a7e7b4ae32..cb789c724d 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -301,7 +301,6 @@ void ViveControllerManager::InputDevice::calibrateFromUI(const controller::Input
     if (_calibrate) {
         calibrateOrUncalibrate(inputCalibrationData);
         _calibrate = false;
-        qDebug() << "------------> calibrateFromUI <-------------";
     }
 }
 
@@ -337,7 +336,6 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
 void ViveControllerManager::InputDevice::calibrateNextFrame() {
     Locker locker(_lock);
     _calibrate = true;
-    qDebug() << "---------> calibrateNextFrame <----------";
 }
 
 QJsonObject ViveControllerManager::InputDevice::configurationSettings() {
@@ -903,7 +901,6 @@ QString ViveControllerManager::InputDevice::configToString(Config config) {
 }
 
 void ViveControllerManager::InputDevice::setConfigFromString(const QString& value) {
-    qDebug() << "------------> setConfigFromString" << value;
     if (value ==  "Auto") {
         _preferedConfig = Config::Auto;
     } else if (value == "Feet") {