From: Ruediger Gad <rgad@fb2.fh-frankfurt.de>
Date: Mon, 16 Apr 2012 11:21:17 +0000 (+0200)
Subject: Fix button enabling when window is inactivated.
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=dc2e7d7aed6eff795a511041dc8a6c38cef2ad76;p=qzeecontrol

Fix button enabling when window is inactivated.
---

diff --git a/qml/QZeeControl/MainPage.qml b/qml/QZeeControl/MainPage.qml
index b6a2f5d..555c7f5 100644
--- a/qml/QZeeControl/MainPage.qml
+++ b/qml/QZeeControl/MainPage.qml
@@ -150,60 +150,6 @@ Page {
                 target: labelD
                 color: "blue"
             }
-        },
-        State {
-            name: "connecting"
-            PropertyChanges {
-                target: scanButton
-                enabled: false
-            }
-            PropertyChanges {
-                target: addressField
-                enabled: false
-            }
-            PropertyChanges {
-                target: portField
-                enabled: false
-            }
-            PropertyChanges {
-                target: connectButton
-                enabled: false
-            }
-            PropertyChanges {
-                target: disconnectButton
-                enabled: false
-            }
-            PropertyChanges {
-                target: infoText
-                text: "Connecting..."
-            }
-        },
-        State {
-            name: "disconnected"
-            PropertyChanges {
-                target: scanButton
-                enabled: true
-            }
-            PropertyChanges {
-                target: addressField
-                enabled: true
-            }
-            PropertyChanges {
-                target: portField
-                enabled: true
-            }
-            PropertyChanges {
-                target: connectButton
-                enabled: true
-            }
-            PropertyChanges {
-                target: disconnectButton
-                enabled: false
-            }
-            PropertyChanges {
-                target: infoText
-                text: "To enable remote control please press \"Connect\" when ready."
-            }
         }
     ]
 
@@ -322,7 +268,13 @@ Page {
                 text: "Connect"
 
                 onClicked: {
-                    mainPage.state = "connecting"
+                    scanButton.enabled = false
+                    addressField.enabled = false
+                    portField.enabled = false
+                    connectButton.enabled = false
+                    disconnectButton.enabled = false
+                    infoText.text = "Connecting..."
+
                     zeeRemoteControl.connect(addressField.text, parseInt(portField.text))
                 }
             }
@@ -455,7 +407,14 @@ Page {
             disconnectButton.enabled = true
             infoText.text = "Connected. Have fun."
         }
-        onDisconnected: mainPage.state = "disconnected"
+        onDisconnected: {
+            scanButton.enabled = true
+            addressField.enabled = true
+            portField.enabled = true
+            connectButton.enabled = true
+            disconnectButton.enabled = false
+            infoText.text = "To enable remote control please press \"Connect\" when ready."
+        }
     }
 
     XtstAdapter{