Remove some obsolete code.

[qzeecontrol] / qml / QZeeControl / MainPage.qml

diff --git a/qml/QZeeControl/MainPage.qml b/qml/QZeeControl/MainPage.qml
index 848babc..e4e108c 100644 (file)
--- a/qml/QZeeControl/MainPage.qml
+++ b/qml/QZeeControl/MainPage.qml
@@ -20,10 +20,12 @@
 import QtQuick 1.1
 import com.nokia.meego 1.0
 import QtMobility.connectivity 1.2
+import QtMobility.systeminfo 1.2
 import "settingsstorage.js" as SettingsStorage
 import qzeecontrol 1.0
 
 Page {
+    id: mainPage
     tools: commonTools
 
     orientationLock: PageOrientation.LockPortrait
@@ -47,6 +49,7 @@ Page {
         }
 
         loadKeyBindings()
+        updateConnectAndScanButton()
         initializing = false
     }
 
@@ -76,6 +79,29 @@ Page {
         btConn.keyBindingRight = SettingsStorage.getSetting("Right")
     }
 
+    function updateConnectAndScanButton(){
+        if(!deviceInfo.currentBluetoothPowerState){
+            scanButton.enabled = false
+            connectButton.enabled = false
+
+            addressField.enabled = false
+            portField.enabled = false
+
+            infoText.text = "To get started please turn Bluetooth on."
+            return
+        }
+
+        scanButton.enabled = true
+
+        addressField.enabled = true
+        portField.enabled = true
+
+        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: [
         State {
             name: "active"
@@ -176,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."
             }
         }
     ]
@@ -221,14 +247,14 @@ 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
-                enabled: true
+                enabled: false
 
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: "Scan"
@@ -245,17 +271,18 @@ Page {
 
                 TextField{
                     id: addressField
-                    text: "No device found yet."
+                    text: "No Zeemote found yet."
+                    width: 280
 
                     onTextChanged: {
-                        if(initializing)
+                        if(mainPage.initializing)
                             return
 
-                        if(text === "No device found yet.")
+                        if(text === "No Zeemote found yet.")
                             return
 
-                        connectButton.enabled = true
-                        infoText.text = "Press \"Connect\" to connect to the device."
+                        updateConnectAndScanButton();
+
                         console.log("Storing address in DB: " + text)
                         SettingsStorage.setSetting("address", text)
                     }
@@ -267,7 +294,7 @@ Page {
                     validator: IntValidator{}
 
                     onTextChanged: {
-                        if(initializing)
+                        if(mainPage.initializing)
                             return
 
                         if(text === "na")
@@ -283,7 +310,6 @@ Page {
                 id: infoText
                 width: parent.width
 
-                text: "Please scan for a device first."
                 horizontalAlignment: Text.AlignHCenter
                 wrapMode: Text.WordWrap
             }
@@ -367,6 +393,16 @@ Page {
         }
     }
 
+    DeviceInfo{
+        id: deviceInfo
+
+        monitorBluetoothStateChanges: true
+
+        onBluetoothStateChanged: {
+            updateConnectAndScanButton()
+        }
+    }
+
     BluetoothDiscoveryModel{
         id: btDiscovery
 
@@ -375,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
@@ -387,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
                 }
             }
@@ -402,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.")
             }
         }
     }
@@ -434,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{