From edafee7b227e3eed6180f6e0dafd377bd87354e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 12 Jan 2015 09:37:52 +0100
Subject: [PATCH] Added setting to enable/disable the keycontrol feature

---
 src/octoprint/server/api/settings.py               | 4 +++-
 src/octoprint/settings.py                          | 3 ++-
 src/octoprint/static/js/app/viewmodels/settings.js | 5 ++++-
 src/octoprint/templates/settings.jinja2            | 7 +++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py
index b8283d51..7a5bb860 100644
--- a/src/octoprint/server/api/settings.py
+++ b/src/octoprint/server/api/settings.py
@@ -59,7 +59,8 @@ def getSettings():
 			"sdSupport": s.getBoolean(["feature", "sdSupport"]),
 			"sdAlwaysAvailable": s.getBoolean(["feature", "sdAlwaysAvailable"]),
 			"swallowOkAfterResend": s.getBoolean(["feature", "swallowOkAfterResend"]),
-			"repetierTargetTemp": s.getBoolean(["feature", "repetierTargetTemp"])
+			"repetierTargetTemp": s.getBoolean(["feature", "repetierTargetTemp"]),
+			"keyboardControl": s.getBoolean(["feature", "keyboardControl"])
 		},
 		"serial": {
 			"port": connectionOptions["portPreference"],
@@ -149,6 +150,7 @@ def setSettings():
 			if "sdAlwaysAvailable" in data["feature"].keys(): s.setBoolean(["feature", "sdAlwaysAvailable"], data["feature"]["sdAlwaysAvailable"])
 			if "swallowOkAfterResend" in data["feature"].keys(): s.setBoolean(["feature", "swallowOkAfterResend"], data["feature"]["swallowOkAfterResend"])
 			if "repetierTargetTemp" in data["feature"].keys(): s.setBoolean(["feature", "repetierTargetTemp"], data["feature"]["repetierTargetTemp"])
+			if "keyboardControl" in data["feature"].keys(): s.setBoolean(["feature", "keyboardControl"], data["feature"]["keyboardControl"])
 
 		if "serial" in data.keys():
 			if "autoconnect" in data["serial"].keys(): s.setBoolean(["serial", "autoconnect"], data["serial"]["autoconnect"])
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index ed16bd57..66f48df2 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -86,7 +86,8 @@ default_settings = {
 		"sdSupport": True,
 		"sdAlwaysAvailable": False,
 		"swallowOkAfterResend": True,
-		"repetierTargetTemp": False
+		"repetierTargetTemp": False,
+		"keyboardControl": True
 	},
 	"folder": {
 		"uploads": None,
diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index 67bfd645..c0d4576b 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -64,6 +64,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
     self.feature_sdAlwaysAvailable = ko.observable(undefined);
     self.feature_swallowOkAfterResend = ko.observable(undefined);
     self.feature_repetierTargetTemp = ko.observable(undefined);
+    self.feature_keyboardControl = ko.observable(undefined);
 
     self.serial_port = ko.observable();
     self.serial_baudrate = ko.observable();
@@ -159,6 +160,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
         self.feature_sdAlwaysAvailable(response.feature.sdAlwaysAvailable);
         self.feature_swallowOkAfterResend(response.feature.swallowOkAfterResend);
         self.feature_repetierTargetTemp(response.feature.repetierTargetTemp);
+        self.feature_keyboardControl(response.feature.keyboardControl);
 
         self.serial_port(response.serial.port);
         self.serial_baudrate(response.serial.baudrate);
@@ -222,7 +224,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
                 "sdSupport": self.feature_sdSupport(),
                 "sdAlwaysAvailable": self.feature_sdAlwaysAvailable(),
                 "swallowOkAfterResend": self.feature_swallowOkAfterResend(),
-                "repetierTargetTemp": self.feature_repetierTargetTemp()
+                "repetierTargetTemp": self.feature_repetierTargetTemp(),
+                "keyboardControl": self.feature_keyboardControl()
             },
             "serial": {
                 "port": self.serial_port(),
diff --git a/src/octoprint/templates/settings.jinja2 b/src/octoprint/templates/settings.jinja2
index 5f587ba6..7c2771f2 100644
--- a/src/octoprint/templates/settings.jinja2
+++ b/src/octoprint/templates/settings.jinja2
@@ -350,6 +350,13 @@
                                 </label>
                             </div>
                         </div>
+                        <div class="control-group">
+                            <div class="controls">
+                                <label class="checkbox">
+                                    <input type="checkbox" data-bind="checked: feature_keyboardControl" id="settings-featureKeyboardControl"> {{ _("Enable Keyboard Control") }}
+                                </label>
+                            </div>
+                        </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">