Added code to properly power up the modem once it's paired. Also adding

the ability to connect a modem by clicking / touching the item in the "Your Devices" list.

diff --git a/qml/DeviceDelegateActive.qml b/qml/DeviceDelegateActive.qml
index 8a3aca1..84f30f1 100644 (file)
--- a/qml/DeviceDelegateActive.qml
+++ b/qml/DeviceDelegateActive.qml
@@ -21,6 +21,7 @@ Item {
     width: parent.width
     signal clicked()
     signal close()
+
     Image {
         id: availableBluetoothItem
 
@@ -28,6 +29,23 @@ Item {
         
         anchors {fill: parent; leftMargin: 8; rightMargin: 8; topMargin: 8}
 
+       MouseArea {
+          id: clickArea
+          anchors.fill: parent
+
+           onPressed: {
+                availableBluetoothItem.source = "/usr/share/hfdialer/images/ivi_btn-list.png"            
+            }
+
+            onReleased: {
+                availableBluetoothItem.source = "/usr/share/hfdialer/images/ivi_btn-list-inactive.png"      
+            }
+
+            onClicked: {
+                adapter.modemOnline = true
+            }
+        }
+
         Text {
             id: mainText
 

diff --git a/src/dialerapplication.cpp b/src/dialerapplication.cpp
index 441ed81..dd4fd89 100644 (file)
--- a/src/dialerapplication.cpp
+++ b/src/dialerapplication.cpp
@@ -223,6 +223,8 @@ void DialerApplication::modemConnected()
     {
         m_modem = m_manager->modem();
 
+        m_modem->setPowered(true);
+       
         qDebug() << QString("Modem connected");
         connect(m_modem, SIGNAL(interfacesChanged(QStringList)), this,
                            SLOT(modemInterfacesChanged(QStringList)));

diff --git a/src/managerproxy.cpp b/src/managerproxy.cpp
index 521b84e..ef79b1f 100644 (file)
--- a/src/managerproxy.cpp
+++ b/src/managerproxy.cpp
@@ -126,6 +126,8 @@ void ManagerProxy::modemAdded(const QDBusObjectPath &in0,const QVariantMap &in1)
     qDebug() << QString("modem added: %1").arg(in0.path());
     m_modemList << QString(in0.path());
     m_modemList.removeDuplicates();
+
+    setModem(in0.path());
 }
 
 void ManagerProxy::modemRemoved(const QDBusObjectPath &in0)
@@ -187,7 +189,11 @@ void ManagerProxy::setModem(QString modemPath)
 
     if (m_modem)
     {
-        delete m_modem;
+        if (m_modemList.contains(m_modem->path()))
+       {
+         m_modemList.removeAll(m_modem->path());
+       }
+       delete m_modem;
         m_modem = NULL;
     }
 

diff --git a/src/modemproxy.cpp b/src/modemproxy.cpp
index 3199018..88672fa 100644 (file)
--- a/src/modemproxy.cpp
+++ b/src/modemproxy.cpp
@@ -58,8 +58,11 @@ TRACE
     if (m_powered == is_powered)
         return;
 
+    QVariant powered(is_powered);
+
     QDBusPendingReply<QVariantMap> reply;
-    reply = SetProperty("Powered", QDBusVariant(is_powered?true:false));
+    reply = SetProperty("Powered", QDBusVariant(powered));
+
     if (reply.isError())
         qCritical() << "SetProperty \"Powered\" failed!";
 }

diff --git a/src/qmldialer.cpp b/src/qmldialer.cpp
index 4b97ec9..28ac2dc 100644 (file)
--- a/src/qmldialer.cpp
+++ b/src/qmldialer.cpp
@@ -85,11 +85,14 @@ void QMLDialer::setMailbox(const QString &number)
 
 void QMLDialer::setModemOnline(bool online)
 {
+  if (ManagerProxy::instance() && ManagerProxy::instance()->modem())
+  {
     if(ManagerProxy::instance()->modem()->isValid())
     {
         ManagerProxy::instance()->modem()->setPowered(online);
         return;
     }
+  }
 }
 
 QString QMLDialer::speedDial(int index) const