selectscreen: update titles and add cancel option

GitLab: #668
Change-Id: I72e84b8accd29d59a8785c3f464db3c40edaa4b4

src/constant/JamiStrings.qml

@@ -517,6 +517,7 @@ Item {
 
     // SelectScreen
     property string selectScreen: qsTr("Select a screen to share")
+    property string selectWindow: qsTr("Select a window to share")
     property string allScreens: qsTr("All Screens")
     property string screens: qsTr("Screens")
     property string windows: qsTr("Windows")

src/mainview/components/SelectScreen.qml

@@ -20,6 +20,7 @@
 import QtQuick
 import QtQuick.Window
 import QtQuick.Controls
+import QtQuick.Layouts
 
 import net.jami.Adapters 1.1
 import net.jami.Models 1.1
@@ -44,7 +45,7 @@ Window {
     property string currentPreview: ""
     property var screens: []
 
-    title: JamiStrings.selectScreen
+    title: window ? JamiStrings.selectWindow : JamiStrings.selectScreen
 
     // How many rows the ScrollView should have.
     function calculateRepeaterModel() {
@@ -348,36 +349,57 @@ Window {
         }
     }
 
-    MaterialButton {
-        id: selectButton
-
+    RowLayout {
         anchors.bottom: selectScreenWindowRect.bottom
         anchors.bottomMargin: JamiTheme.preferredMarginSize
         anchors.horizontalCenter: selectScreenWindowRect.horizontalCenter
 
-        preferredWidth: 200
+        width: childrenRect.width
+        height: childrenRect.height
+        spacing: JamiTheme.preferredMarginSize
+
+        MaterialButton {
+            id: selectButton
+
+            preferredWidth: 200
 
-        enabled: selectedScreenNumber != -1 || selectAllScreens
-        opacity: enabled ? 1.0 : 0.5
+            enabled: selectedScreenNumber != -1 || selectAllScreens
+            opacity: enabled ? 1.0 : 0.5
 
-        color: JamiTheme.buttonTintedBlack
-        hoveredColor: JamiTheme.buttonTintedBlackHovered
-        pressedColor: JamiTheme.buttonTintedBlackPressed
-        outlined: true
+            color: JamiTheme.buttonTintedBlack
+            hoveredColor: JamiTheme.buttonTintedBlackHovered
+            pressedColor: JamiTheme.buttonTintedBlackPressed
+            outlined: true
 
-        text: JamiStrings.shareScreen
+            text: window ? JamiStrings.shareWindow : JamiStrings.shareScreen
 
-        onClicked: {
-            if (selectAllScreens)
-                AvAdapter.shareAllScreens()
-            else {
-                if (selectedScreenNumber < Qt.application.screens.length)
-                    AvAdapter.shareEntireScreen(selectedScreenNumber)
+            onClicked: {
+                if (selectAllScreens)
+                    AvAdapter.shareAllScreens()
                 else {
-                    AvAdapter.shareWindow(AvAdapter.windowsIds[selectedScreenNumber - Qt.application.screens.length])
+                    if (selectedScreenNumber < Qt.application.screens.length)
+                        AvAdapter.shareEntireScreen(selectedScreenNumber)
+                    else {
+                        AvAdapter.shareWindow(AvAdapter.windowsIds[selectedScreenNumber - Qt.application.screens.length])
+                    }
                 }
+                root.close()
             }
-            root.close()
+        }
+
+        MaterialButton {
+            id: cancelButton
+
+            preferredWidth: 200
+
+            color: JamiTheme.buttonTintedBlack
+            hoveredColor: JamiTheme.buttonTintedBlackHovered
+            pressedColor: JamiTheme.buttonTintedBlackPressed
+            outlined: true
+
+            text: JamiStrings.optionCancel
+
+            onClicked: root.close()
         }
     }
 }