Remove some obsolete code.

[qzeecontrol] / qml / QZeeControl / MainPage.qml

diff --git a/qml/QZeeControl/MainPage.qml b/qml/QZeeControl/MainPage.qml
index dce93f8..e4e108c 100644 (file)
--- a/qml/QZeeControl/MainPage.qml
+++ b/qml/QZeeControl/MainPage.qml
@@ -96,11 +96,10 @@ Page {
         addressField.enabled = true
         portField.enabled = true
 
-        connectButton.enabled = (addressField.text !== "No device found yet.")
-        infoText.text = (addressField.text !== "No device found yet.") ?
+        connectButton.enabled = (addressField.text !== "No Zeemote found yet.")
+        infoText.text = (addressField.text !== "No Zeemote found yet.") ?
                     "To enable remote control please press \"Connect\" when ready." :
                     "Please scan for a Zeemote first."
-
     }
 
     states: [
@@ -203,7 +202,7 @@ Page {
             }
             PropertyChanges {
                 target: infoText
-                text: "Press \"Connect\" to connect to the device."
+                text: "To enable remote control please press \"Connect\" when ready."
             }
         }
     ]
@@ -248,10 +247,10 @@ Page {
         anchors{top: headerItem.bottom; bottom: parent.bottom; left: parent.left; right: parent.right}
         contentHeight: contentColumn.height
 
-            Column{
-                id: contentColumn
-                spacing: 10
-                anchors{top: parent.top; left: parent.left; right: parent.right; topMargin: 10}
+        Column{
+            id: contentColumn
+            spacing: 10
+            anchors{top: parent.top; left: parent.left; right: parent.right; topMargin: 10}
 
             Button{
                 id: scanButton
@@ -272,13 +271,14 @@ Page {
 
                 TextField{
                     id: addressField
-                    text: "No device found yet."
+                    text: "No Zeemote found yet."
+                    width: 280
 
                     onTextChanged: {
                         if(mainPage.initializing)
                             return
 
-                        if(text === "No device found yet.")
+                        if(text === "No Zeemote found yet.")
                             return
 
                         updateConnectAndScanButton();
@@ -411,7 +411,7 @@ Page {
 
         onDiscoveryChanged: {
             if(discovery){
-                infoText.text = "Scanning for a device..."
+                infoText.text = "Scanning for a Zeemote..."
                 scanButton.enabled = false
                 connectButton.enabled = false
                 disconnectButton.enabled = false
@@ -423,8 +423,8 @@ Page {
                 addressField.enabled = true
                 portField.enabled = true
 
-                if(addressField.text !== "No device found yet." && portField.text !== "na"){
-                    infoText.text = "Device found. You can now connect."
+                if(addressField.text !== "No Zeemote found yet." && portField.text !== "na"){
+                    infoText.text = "Zeemote found. To enable remote control please press \"Connect\" when ready."
                     connectButton.enabled = true
                 }
             }
@@ -438,7 +438,7 @@ Page {
                 addressField.text = service.deviceAddress
                 portField.text = service.servicePort
                 discovery = false
-                console.log("Found device. Stopped further discovery.")
+                console.log("Found Zeemote. Stopped further discovery.")
             }
         }
     }
@@ -470,54 +470,19 @@ Page {
 //        onStickMoved: {
 //            console.log("Stick moved. x: " + x + " y: " + y)
 //        }
-
 //        onButtonsChanged: {
 //            console.log("Buttons changed. A: " + a + " B: " + b + " C: " + c + " D: " + d)
 //        }
 
-        onAChanged: {
-//            console.log("A changed to: " + val)
-            xtstAdapter.sendKey(keyBindingA, val);
-        }
-        onBChanged: {
-//            console.log("B changed to: " + val)
-            xtstAdapter.sendKey(keyBindingB, val);
-        }
-        onCChanged: {
-//            console.log("C changed to: " + val)
-            xtstAdapter.sendKey(keyBindingC, val);
-        }
-        onDChanged: {
-//            console.log("D changed to: " + val)
-            xtstAdapter.sendKey(keyBindingD, val);
-        }
+        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)
-
-//        onXChanged: {
-//            if(val > joystickThreshold){
-//                xtstAdapter.sendKey("Right", true);
-//            }else if(val < -joystickThreshold){
-//                xtstAdapter.sendKey("Left", true);
-//            }else{
-//                xtstAdapter.sendKey("Right", false);
-//                xtstAdapter.sendKey("Left", false);
-//            }
-//        }
-
-//        onYChanged: {
-//            if(val > joystickThreshold){
-//                xtstAdapter.sendKey("Down", true);
-//            }else if(val < -joystickThreshold){
-//                xtstAdapter.sendKey("Up", true);
-//            }else{
-//                xtstAdapter.sendKey("Down", false);
-//                xtstAdapter.sendKey("Up", false);
-//            }
-//        }
     }
 
     XtstAdapter{