From 393c36cd80fa4f3bbf8f138a2a15117725a30640 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 31 Oct 2014 16:35:14 +0100
Subject: [PATCH] some fixes in the phone components

fixes after testing with phonesim
---
 shell/contents/views/Desktop.qml | 55 ++++++++++++++++++++++++++++----
 shell/contents/views/Dialer.qml  |  2 +-
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index c0f127f9..6a060ffc 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -88,6 +88,40 @@ Item {
 
     OfonoManager {
         id: ofonoManager
+        onAvailableChanged: {
+           console.log("Ofono is " + available)
+        }
+        onModemAdded: {
+            console.log("modem added " + modem)
+        }
+        onModemRemoved: console.log("modem removed")
+    }
+
+    OfonoConnMan {
+       id: ofono1
+       Component.onCompleted: {
+           console.log(ofonoManager.modems)
+       }
+       modemPath: ofonoManager.modems[0]
+    }
+
+    OfonoModem {
+       id: modem1
+       modemPath: ofonoManager.modems[0]
+
+    }
+
+    OfonoContextConnection {
+        id: context1
+        contextPath : ofono1.contexts[0]
+        Component.onCompleted: {
+            print("Context Active: " + context1.active)
+            textLine.text = context1.active ? "online" : "offline"
+        }
+        onActiveChanged: {
+            print("Context Active: " + context1.active)
+            textLine.text = context1.active ? "online" : "offline"
+        }
     }
 
     property OfonoSimManager simManager: ofonoSimManager
@@ -97,7 +131,15 @@ Item {
 
     OfonoNetworkRegistration {
         id: netreg
-        modemPath: ofonoManager.modems.count? ofonoManager.modems[0] : ""
+        Component.onCompleted: {
+            netreg.scan()
+            updateStrengthIcon()
+        }
+
+        onNetworkOperatorsChanged : {
+            console.log("operators :"+netreg.currentOperator["Name"].toString())
+        }
+        modemPath: ofonoManager.modems.count ? ofonoManager.modems[0] : ""
         function updateStrengthIcon() {
             if (netreg.strength >= 100) {
                 strengthIcon.source = "network-mobile-100";
@@ -118,7 +160,10 @@ Item {
             console.log("Strength changed to " + netreg.strength)
             updateStrengthIcon()
         }
-        Component.onCompleted: updateStrengthIcon()
+    }
+
+    OfonoNetworkOperator {
+        id: netop
     }
 
     property VoiceCallManager manager: VoiceCallManager {
@@ -132,7 +177,7 @@ Item {
 
             } else {
                 dialerOverlay.close();
-                dialer.numberEntryText = '';
+                dialerOverlay.item.numberEntryText = '';
 
                 //main.activeVoiceCallPerson = null;
             }
@@ -277,7 +322,7 @@ Item {
                 left: strengthIcon.right
                 verticalCenter: parent.verticalCenter
             }
-            text: netreg.strength + "% " + (netreg.name ? netreg.name : "No Provider")
+            text: netreg.strength + "% " + (ofonoManager.available ? netreg.currentOperator["Name"].toString() :"Ofono not available")
             color: "white"
             font.pixelSize: height / 2
         }
@@ -378,8 +423,6 @@ Item {
                 elementId: "phone"
                 callback: function() {
                     dialerOverlay.open()
-                    //TODO remove
-                    dialerOverlay.item.state = "disconnected"
                 }
             }
 
diff --git a/shell/contents/views/Dialer.qml b/shell/contents/views/Dialer.qml
index 2c5a6743..df75d390 100644
--- a/shell/contents/views/Dialer.qml
+++ b/shell/contents/views/Dialer.qml
@@ -37,7 +37,7 @@ Rectangle {
     property alias numberEntryText: status.text
     property VoiceCallManager manager: homescreen.manager
 
-    property string providerId: manager.providers.id(1)
+    property string providerId: manager.providers.id(0)
 
     function open() {
         visible = true;