Refactor code quite heavily.

[qzeecontrol] / qml / QZeeControl / MainPage.qml

diff --git a/qml/QZeeControl/MainPage.qml b/qml/QZeeControl/MainPage.qml
index e4e108c..ec84eb6 100644 (file)
--- a/qml/QZeeControl/MainPage.qml
+++ b/qml/QZeeControl/MainPage.qml
@@ -68,15 +68,15 @@ Page {
 
     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")
+        zeeRemoteControl.keyBindingA = SettingsStorage.getSetting("A")
+        zeeRemoteControl.keyBindingB = SettingsStorage.getSetting("B")
+        zeeRemoteControl.keyBindingC = SettingsStorage.getSetting("C")
+        zeeRemoteControl.keyBindingD = SettingsStorage.getSetting("D")
+
+        zeeRemoteControl.keyBindingUp = SettingsStorage.getSetting("Up")
+        zeeRemoteControl.keyBindingDown = SettingsStorage.getSetting("Down")
+        zeeRemoteControl.keyBindingLeft = SettingsStorage.getSetting("Left")
+        zeeRemoteControl.keyBindingRight = SettingsStorage.getSetting("Right")
     }
 
     function updateConnectAndScanButton(){
@@ -107,24 +107,24 @@ Page {
             name: "active"
             PropertyChanges {
                 target: cursorRectangle
-                x: moveArea.x + (moveArea.width * 0.5) + btConn.x - (cursorRectangle.width * 0.5)
-                y: moveArea.y + (moveArea.height * 0.5) + btConn.y - (cursorRectangle.height * 0.5)
+                x: moveArea.x + (moveArea.width * 0.5) + zeeRemoteControl.x - (cursorRectangle.width * 0.5)
+                y: moveArea.y + (moveArea.height * 0.5) + zeeRemoteControl.y - (cursorRectangle.height * 0.5)
             }
             PropertyChanges {
                 target: labelA
-                color: btConn.a ? "red" : "blue"
+                color: zeeRemoteControl.a ? "red" : "blue"
             }
             PropertyChanges {
                 target: labelB
-                color: btConn.b ? "red" : "blue"
+                color: zeeRemoteControl.b ? "red" : "blue"
             }
             PropertyChanges {
                 target: labelC
-                color: btConn.c ? "red" : "blue"
+                color: zeeRemoteControl.c ? "red" : "blue"
             }
             PropertyChanges {
                 target: labelD
-                color: btConn.d ? "red" : "blue"
+                color: zeeRemoteControl.d ? "red" : "blue"
             }
         },
         State {
@@ -323,7 +323,7 @@ Page {
 
                 onClicked: {
                     mainPage.state = "connecting"
-                    btConn.connect(addressField.text, parseInt(portField.text))
+                    zeeRemoteControl.connect(addressField.text, parseInt(portField.text))
                 }
             }
 
@@ -334,7 +334,7 @@ Page {
                 text: "Disconnect"
 
                 onClicked: {
-                    btConn.disconnect()
+                    zeeRemoteControl.disconnect()
                 }
             }
 
@@ -347,22 +347,22 @@ Page {
                 Label{
                     id: labelA
                     text: "A"
-                    color: btConn.a ? "red" : "blue"
+                    color: zeeRemoteControl.a ? "red" : "blue"
                 }
                 Label{
                     id: labelB
                     text: "B"
-                    color: btConn.b ? "red" : "blue"
+                    color: zeeRemoteControl.b ? "red" : "blue"
                 }
                 Label{
                     id: labelC
                     text: "C"
-                    color: btConn.c ? "red" : "blue"
+                    color: zeeRemoteControl.c ? "red" : "blue"
                 }
                 Label{
                     id: labelD
                     text: "D"
-                    color: btConn.d ? "red" : "blue"
+                    color: zeeRemoteControl.d ? "red" : "blue"
                 }
             }
 
@@ -386,8 +386,8 @@ Page {
                     height: 10
                     color: "red"
 
-                    x: moveArea.x + (moveArea.width * 0.5) + btConn.x - (cursorRectangle.width * 0.5)
-                    y: moveArea.y + (moveArea.height * 0.5) + btConn.y - (cursorRectangle.height * 0.5)
+                    x: moveArea.x + (moveArea.width * 0.5) + zeeRemoteControl.x - (cursorRectangle.width * 0.5)
+                    y: moveArea.y + (moveArea.height * 0.5) + zeeRemoteControl.y - (cursorRectangle.height * 0.5)
                 }
             }
         }
@@ -443,46 +443,16 @@ Page {
         }
     }
 
-    BtConnector{
-        id: btConn
+    ZeeRemoteControl{
+        id: zeeRemoteControl
 
         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."
         }
-
-        onDisconnected: {
-            mainPage.state = "disconnected"
-        }
-
-//        onStickMoved: {
-//            console.log("Stick moved. x: " + x + " y: " + y)
-//        }
-//        onButtonsChanged: {
-//            console.log("Buttons changed. A: " + a + " B: " + b + " C: " + c + " D: " + d)
-//        }
-
-        onAChanged: xtstAdapter.sendKey(keyBindingA, val);
-        onBChanged: xtstAdapter.sendKey(keyBindingB, val);
-        onCChanged: xtstAdapter.sendKey(keyBindingC, val);
-        onDChanged: xtstAdapter.sendKey(keyBindingD, val);
-
-        onUpChanged: xtstAdapter.sendKey(keyBindingUp, val)
-        onDownChanged: xtstAdapter.sendKey(keyBindingDown, val)
-        onLeftChanged: xtstAdapter.sendKey(keyBindingLeft, val)
-        onRightChanged: xtstAdapter.sendKey(keyBindingRight, val)
+        onDisconnected: mainPage.state = "disconnected"
     }
 
     XtstAdapter{