Add properties for key bindings. Add functions for initializing and loading key bindi...

diff --git a/QZeeControl.pro.user b/QZeeControl.pro.user
index 2be7fa8..4f9a044 100644 (file)
--- a/QZeeControl.pro.user
+++ b/QZeeControl.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2012-04-15T00:34:47. -->
+<!-- Written by Qt Creator 2.4.1, 2012-04-15T01:35:21. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

diff --git a/qml/QZeeControl/MainPage.qml b/qml/QZeeControl/MainPage.qml
index 03f55c8..5d878b1 100644 (file)
--- a/qml/QZeeControl/MainPage.qml
+++ b/qml/QZeeControl/MainPage.qml
@@ -38,6 +38,39 @@ Page {
             addressField.text = address
             portField.text = port
         }
+
+        if(SettingsStorage.getSetting("A") === "Unknown"){
+            console.log("Initializing key bindings.")
+            setKeyBindingsToDefault()
+        }
+
+        loadKeyBindings()
+    }
+
+    function setKeyBindingsToDefault(){
+        console.log("Setting key bindings to default.")
+        SettingsStorage.setSetting("A", "a")
+        SettingsStorage.setSetting("B", "b")
+        SettingsStorage.setSetting("C", "c")
+        SettingsStorage.setSetting("D", "d")
+
+        SettingsStorage.setSetting("Up", "Up")
+        SettingsStorage.setSetting("Down", "Down")
+        SettingsStorage.setSetting("Left", "Left")
+        SettingsStorage.setSetting("Right", "Right")
+    }
+
+    function loadKeyBindings(){
+        console.log("Loading key bindings.")
+        btConn.keyBindingA = SettingsStorage.getSetting("A")
+        btConn.keyBindingB = SettingsStorage.getSetting("B")
+        btConn.keyBindingC = SettingsStorage.getSetting("C")
+        btConn.keyBindingD = SettingsStorage.getSetting("D")
+
+        btConn.keyBindingUp = SettingsStorage.getSetting("Up")
+        btConn.keyBindingDown = SettingsStorage.getSetting("Down")
+        btConn.keyBindingLeft = SettingsStorage.getSetting("Left")
+        btConn.keyBindingRight = SettingsStorage.getSetting("Right")
     }
 
     states: [
@@ -369,6 +402,16 @@ Page {
 
         threshold: 50
 
+        property string keyBindingA
+        property string keyBindingB
+        property string keyBindingC
+        property string keyBindingD
+
+        property string keyBindingUp
+        property string keyBindingDown
+        property string keyBindingLeft
+        property string keyBindingRight
+
         onConnected: {
             disconnectButton.enabled = true
             infoText.text = "Connected. Have fun."
@@ -388,25 +431,25 @@ Page {
 
         onAChanged: {
 //            console.log("A changed to: " + val)
-            xtstAdapter.sendKey("a", val);
+            xtstAdapter.sendKey(keyBindingA, val);
         }
         onBChanged: {
 //            console.log("B changed to: " + val)
-            xtstAdapter.sendKey("b", val);
+            xtstAdapter.sendKey(keyBindingB, val);
         }
         onCChanged: {
 //            console.log("C changed to: " + val)
-            xtstAdapter.sendKey("c", val);
+            xtstAdapter.sendKey(keyBindingC, val);
         }
         onDChanged: {
 //            console.log("D changed to: " + val)
-            xtstAdapter.sendKey("d", val);
+            xtstAdapter.sendKey(keyBindingD, val);
         }
 
-        onUpChanged: xtstAdapter.sendKey("Up", val)
-        onDownChanged: xtstAdapter.sendKey("Down", val)
-        onLeftChanged: xtstAdapter.sendKey("Left", val)
-        onRightChanged: xtstAdapter.sendKey("Right", val)
+        onUpChanged: xtstAdapter.sendKey(keyBindingUp, val)
+        onDownChanged: xtstAdapter.sendKey(keyBindingDown, val)
+        onLeftChanged: xtstAdapter.sendKey(keyBindingLeft, val)
+        onRightChanged: xtstAdapter.sendKey(keyBindingRight, val)
 
 //        onXChanged: {
 //            if(val > joystickThreshold){