callview: add hangup to context menu and icon change

- during a call context menu shows "hangup" and hides "clear", "remove", "block" and "start call"
- change start call and record call (context menu) icons

Gitlab: #104

Change-Id: I6c213b525fa6cd9d8063aae0065614c94d9e2209

images/icons/keyboard_voice-24px.svg

+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M12 15c1.66 0 2.99-1.34 2.99-3L15 6c0-1.66-1.34-3-3-3S9 4.34 9 6v6c0 1.66 1.34 3 3 3zm6.08-3c-.42 0-.77.3-.83.71-.37 2.61-2.72 4.39-5.25 4.39s-4.88-1.77-5.25-4.39c-.06-.41-.42-.71-.83-.71-.52 0-.92.46-.85.97.46 2.97 2.96 5.3 5.93 5.75V21c0 .55.45 1 1 1s1-.45 1-1v-2.28c2.96-.43 5.47-2.78 5.93-5.75.07-.51-.33-.97-.85-.97z"/></svg>
\ No newline at end of file

resources.qrc

@@ -120,5 +120,7 @@
         <file>images/icons/router-24px.svg</file>
         <file>images/icons/insert_drive_file-24dp.svg</file>
         <file>images/icons/arrow_back-white-24dp.svg</file>
+        <file>images/icons/keyboard_voice-24px.svg</file>
+        <file>images/icons/videocam-24px.svg</file>
     </qresource>
 </RCC>

src/mainview/components/CallViewContextMenu.qml

@@ -67,7 +67,7 @@ Item {
         if (!isAudioOnly && !isPaused) {
             ContextMenuGenerator.addMenuItem(isRecording ? JamiStrings.stopRec :
                                                            JamiStrings.startRec,
-                                             "qrc:/images/icons/ic_video_call_24px.svg",
+                                             "qrc:/images/icons/keyboard_voice-24px.svg",
                                              function (){
                                                   CallAdapter.recordThisCallToggle()
                                              })

src/mainview/components/ConversationSmartListContextMenu.qml

@@ -34,8 +34,10 @@ Item {
     property int contactType: Profile.Type.INVALID
 
     function openMenu() {
+        var hasCall = UtilsAdapter.getCallId(responsibleAccountId, responsibleConvUid) !== ""
+        if (!hasCall) {
             ContextMenuGenerator.addMenuItem(qsTr("Start video call"),
-                                         "qrc:/images/icons/ic_video_call_24px.svg",
+                                             "qrc:/images/icons/videocam-24px.svg",
                                              function (){
                                                  ConversationsAdapter.selectConversation(
                                                              responsibleAccountId,
@@ -50,6 +52,7 @@ Item {
                                                              responsibleConvUid, false)
                                                  CallAdapter.placeAudioOnlyCall()
                                              })
+
             ContextMenuGenerator.addMenuItem(qsTr("Clear conversation"),
                                              "qrc:/images/icons/ic_clear_24px.svg",
                                              function (){
@@ -68,8 +71,19 @@ Item {
                                                  })
             }
 
-        if (contactType === Profile.Type.RING || contactType === Profile.Type.PENDING) {
+        } else {
+            ContextMenuGenerator.addMenuItem(qsTr("Hang up call"),
+                                             "qrc:/images/icons/ic_call_end_white_24px.svg",
+                                             function (){
+                                                 CallAdapter.hangUpACall(responsibleAccountId,
+                                                                         responsibleConvUid)
+                                             })
+        }
+
+        if ((contactType === Profile.Type.RING || contactType === Profile.Type.PENDING)) {
+            if (contactType === Profile.Type.PENDING || !hasCall) {
                 ContextMenuGenerator.addMenuSeparator()
+            }
 
             if (contactType === Profile.Type.PENDING) {
                 ContextMenuGenerator.addMenuItem(JamiStrings.acceptContactRequest,
@@ -85,13 +99,14 @@ Item {
                                                                  responsibleConvUid)
                                                  })
             }
+            if (!hasCall) {
                 ContextMenuGenerator.addMenuItem(qsTr("Block contact"),
                                                  "qrc:/images/icons/ic_block_24px.svg",
                                                  function (){
                                                      MessagesAdapter.blockConversation(
                                                                  responsibleConvUid)
                                                  })
-
+            }
             ContextMenuGenerator.addMenuSeparator()
             ContextMenuGenerator.addMenuItem(qsTr("Profile"),
                                              "qrc:/images/icons/person-24px.svg",

src/mainview/components/MessageWebViewHeader.qml

@@ -165,7 +165,7 @@ Rectangle {
                 width: buttonPreferredSize
 
                 radius: 30
-                source: "qrc:/images/icons/ic_video_call_24px.svg"
+                source: "qrc:/images/icons/videocam-24px.svg"
                 backgroundColor: "white"
                 onExitColor: "white"