Remove some obsolete code.

[qzeecontrol] / qml / QZeeControl / MainPage.qml

diff --git a/qml/QZeeControl/MainPage.qml b/qml/QZeeControl/MainPage.qml
index 4fbba17..e4e108c 100644 (file)
--- a/qml/QZeeControl/MainPage.qml
+++ b/qml/QZeeControl/MainPage.qml
@@ -100,7 +100,6 @@ Page {
         infoText.text = (addressField.text !== "No Zeemote found yet.") ?
                     "To enable remote control please press \"Connect\" when ready." :
                     "Please scan for a Zeemote first."
-
     }
 
     states: [
@@ -273,6 +272,7 @@ Page {
                 TextField{
                     id: addressField
                     text: "No Zeemote found yet."
+                    width: 280
 
                     onTextChanged: {
                         if(mainPage.initializing)
@@ -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
@@ -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.")
             }
         }
     }
@@ -467,57 +467,22 @@ Page {
             mainPage.state = "disconnected"
         }
 
-        //        onStickMoved: {
-        //            console.log("Stick moved. x: " + x + " y: " + y)
-        //        }
+//        onStickMoved: {
+//            console.log("Stick moved. x: " + x + " y: " + y)
+//        }
+//        onButtonsChanged: {
+//            console.log("Buttons changed. A: " + a + " B: " + b + " C: " + c + " D: " + d)
+//        }
 
-        //        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{