Merge lp:~boiko/dialer-app/rtm-notify_conf_and_holding_errors into lp:dialer-app/rtm-14.09

[Gustavo Pichorim Boiko]

Notify error when trying to create conference calls and when changing the call hold status.

Notify error when trying to create conference calls and when changing the call hold status.

=== renamed file 'src/qml/Dialogs/NoSIMCardSelectedDialog.qml' => 'src/qml/Dialogs/NotificationDialog.qml'
--- src/qml/Dialogs/NoSIMCardSelectedDialog.qml	2014-08-11 21:58:24 +0000
+++ src/qml/Dialogs/NotificationDialog.qml	2015-01-28 15:11:13 +0000
@@ -20,19 +20,17 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 
-Component {
-    Dialog {
-        id: dialogue
-        title: i18n.tr("No SIM card selected")
-        text: i18n.tr("You need to select a SIM card")
-        Button {
-            objectName: "closeNoSimCardSelectedDialog"
-            text: i18n.tr("Close")
-            color: UbuntuColors.orange
-            onClicked: {
-                PopupUtils.close(dialogue)
-                Qt.inputMethod.hide()
-            }
+Dialog {
+    id: dialogue
+    title: ""
+    text: ""
+    Button {
+        objectName: "closeDialog"
+        text: i18n.tr("Close")
+        color: UbuntuColors.orange
+        onClicked: {
+            PopupUtils.close(dialogue)
+            Qt.inputMethod.hide()
         }
     }
 }
 
=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2015-01-17 02:33:50 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2015-01-28 15:11:13 +0000
@@ -91,6 +91,11 @@
                 id == "earpiece")
     }
 
+    function changeCallHoldingStatus(call, held) {
+        callHoldingConnection.target = call;
+        call.held = held;
+    }
+
     Connections {
         target: callManager
         onHasCallsChanged: {
@@ -102,6 +107,11 @@
                 liveCall.call = callManager.foregroundCall;
             }
         }
+
+        onConferenceRequestFailed: {
+            mainView.showNotification(i18n.tr("Conference call failure"),
+                                      i18n.tr("Failed to create a conference call."));
+        }
     }
 
     Connections {
@@ -114,6 +124,16 @@
         }
     }
 
+    Connections {
+        id: callHoldingConnection
+        // the target will be set on the actions
+        onCallHoldingFailed: {
+            mainView.showNotification(i18n.tr("Call holding failure"),
+                                      target.held ? i18n.tr("Failed to activate the call.")
+                                                  : i18n.tr("Failed to place the active call on hold."));
+        }
+    }
+
     Component {
         id: audioOutputsPopover
         Popover {
@@ -489,7 +509,7 @@
             color: mainView.backgroundColor
             strokeColor: UbuntuColors.green
             onClicked: {
-                callManager.foregroundCall.held = true
+                changeCallHoldingStatus(callManager.foregroundCall, true)
             }
         }
 
@@ -602,7 +622,7 @@
             iconHeight: units.gu(3)
             onClicked: {
                 if (call) {
-                    call.held = !call.held
+                    changeCallHoldingStatus(call, !call.held)
                 }
             }
         }
 
=== modified file 'src/qml/LiveCallPage/MultiCallDisplay.qml'
--- src/qml/LiveCallPage/MultiCallDisplay.qml	2014-08-25 23:40:35 +0000
+++ src/qml/LiveCallPage/MultiCallDisplay.qml	2015-01-28 15:11:13 +0000
@@ -138,7 +138,7 @@
 
             MouseArea {
                 anchors.fill: parent
-                onClicked: callEntry.held = false;
+                onClicked: liveCall.changeCallHoldingStatus(callEntry, false);
                 enabled: callEntry.held
             }
 
 
=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2015-01-20 15:08:23 +0000
+++ src/qml/dialer-app.qml	2015-01-28 15:11:13 +0000
@@ -285,7 +285,7 @@
         // check if at least one account is selected
         if (multipleAccounts && !mainView.account) {
             Qt.inputMethod.hide()
-            PopupUtils.open(Qt.createComponent("Dialogs/NoSIMCardSelectedDialog.qml").createObject(mainView))
+            showNotification(i18n.tr("No SIM card selected"), i18n.tr("You need to select a SIM card"));
             return
         }
 
@@ -306,7 +306,9 @@
 
         // avoid cleaning the keypadEntry in case there is no signal
         if (!mainView.account.connected) {
-            PopupUtils.open(noNetworkDialog)
+            showNotification(i18n.tr("No network"),
+                             telepathyHelper.accountIds.length >= 2 ? i18n.tr("There is currently no network on %1").arg(mainView.account.displayName)
+                                                                    : i18n.tr("There is currently no network."))
             return
         }
 
@@ -395,6 +397,10 @@
         stack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"), properties)
     }
 
+    function showNotification(title, text) {
+        PopupUtils.open(Qt.resolvedUrl("Dialogs/NotificationDialog.qml"), mainView, {title: title, text: text});
+    }
+
     Component.onCompleted: {
         i18n.domain = "dialer-app"
         i18n.bindtextdomain("dialer-app", i18nDirectory)
@@ -419,24 +425,6 @@
     }
 
     Component {
-        id: noNetworkDialog
-        Dialog {
-            id: dialogue
-            title: i18n.tr("No network")
-            text: telepathyHelper.accountIds.length >= 2 ? i18n.tr("There is currently no network on %1").arg(mainView.account.displayName)
-                                                         : i18n.tr("There is currently no network.")
-            Button {
-                objectName: "closeNoNetworkDialog"
-                text: i18n.tr("Close")
-                color: UbuntuColors.orange
-                onClicked: {
-                    PopupUtils.close(dialogue)
-                }
-            }
-        }
-    }
-
-    Component {
         id: flightModeProgressDialog
         Dialog {
             id: flightModeProgressIndicator