From 682757fdba41b7262c793b8d05f71167bc7848c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
 <sebastien.blin@savoirfairelinux.com>
Date: Tue, 26 Jul 2022 15:04:41 -0400
Subject: [PATCH] misc: fix dialogs size and confirm strings

Change-Id: If8add5cd86d6893e2e55f7f5f33c228777f18579
GitLab: #780
---
 src/app/commoncomponents/ConfirmDialog.qml                   | 4 ++--
 src/app/commoncomponents/DeleteAccountDialog.qml             | 4 ++--
 src/app/commoncomponents/PasswordDialog.qml                  | 4 ++--
 src/app/constant/JamiStrings.qml                             | 5 +++--
 .../mainview/components/ConversationSmartListContextMenu.qml | 2 +-
 src/app/settingsview/components/LinkDeviceDialog.qml         | 4 ++--
 src/app/settingsview/components/NameRegistrationDialog.qml   | 4 ++--
 .../settingsview/components/RevokeDevicePasswordDialog.qml   | 4 ++--
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/app/commoncomponents/ConfirmDialog.qml b/src/app/commoncomponents/ConfirmDialog.qml
index 70f5e5616..28d5eb7b1 100644
--- a/src/app/commoncomponents/ConfirmDialog.qml
+++ b/src/app/commoncomponents/ConfirmDialog.qml
@@ -29,8 +29,8 @@ BaseModalDialog {
 
     signal accepted
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     property var confirmLabel: ""
     property var textLabel: ""
diff --git a/src/app/commoncomponents/DeleteAccountDialog.qml b/src/app/commoncomponents/DeleteAccountDialog.qml
index 11dc76edd..e47a5ea21 100644
--- a/src/app/commoncomponents/DeleteAccountDialog.qml
+++ b/src/app/commoncomponents/DeleteAccountDialog.qml
@@ -35,8 +35,8 @@ BaseModalDialog {
 
     title: JamiStrings.deleteAccount
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     popupContent: ColumnLayout {
         id: deleteAccountContentColumnLayout
diff --git a/src/app/commoncomponents/PasswordDialog.qml b/src/app/commoncomponents/PasswordDialog.qml
index 821d13d02..b5b8392eb 100644
--- a/src/app/commoncomponents/PasswordDialog.qml
+++ b/src/app/commoncomponents/PasswordDialog.qml
@@ -44,8 +44,8 @@ BaseModalDialog {
         open()
     }
 
-    height: JamiTheme.preferredDialogHeight
-    width: JamiTheme.preferredDialogWidth
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     title: {
         switch(purpose){
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index c40e484e0..ad830bc83 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -263,8 +263,8 @@ Item {
     property string clearConversation: qsTr("Clear conversation")
     property string confirmAction: qsTr("Confirm action")
     property string removeConversation: qsTr("Remove conversation")
-    property string confirmRmConversation: qsTr("Do you really want to remove this conversation")
-    property string confirmBlockConversation: qsTr("Do you really want to block this conversation")
+    property string confirmRmConversation: qsTr("Do you really want to remove this conversation?")
+    property string confirmBlockConversation: qsTr("Do you really want to block this conversation?")
     property string removeContact: qsTr("Remove contact")
     property string blockContact: qsTr("Block contact")
     property string blockSwarm: qsTr("Block swarm")
@@ -676,6 +676,7 @@ Item {
     property string optionUpgrade: qsTr("Upgrade")
     property string optionLater: qsTr("Later")
     property string optionDelete: qsTr("Delete")
+    property string optionRemove: qsTr("Remove")
     property string optionBlock: qsTr("Block")
 
     // Conference moderation
diff --git a/src/app/mainview/components/ConversationSmartListContextMenu.qml b/src/app/mainview/components/ConversationSmartListContextMenu.qml
index d73b3fe6b..45f2020b2 100644
--- a/src/app/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/app/mainview/components/ConversationSmartListContextMenu.qml
@@ -35,7 +35,7 @@ ContextMenuAutoLoader {
 
         title: JamiStrings.confirmAction
         textLabel: JamiStrings.confirmRmConversation
-        confirmLabel: JamiStrings.optionDelete
+        confirmLabel: JamiStrings.optionRemove
         onAccepted: {
             if (isSwarm)
                 MessagesAdapter.removeConversation(responsibleConvUid)
diff --git a/src/app/settingsview/components/LinkDeviceDialog.qml b/src/app/settingsview/components/LinkDeviceDialog.qml
index c0b145f6b..379cb876e 100644
--- a/src/app/settingsview/components/LinkDeviceDialog.qml
+++ b/src/app/settingsview/components/LinkDeviceDialog.qml
@@ -34,8 +34,8 @@ BaseModalDialog {
 
     title: JamiStrings.addDevice
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     popupContent: StackLayout {
         id: stackedWidget
diff --git a/src/app/settingsview/components/NameRegistrationDialog.qml b/src/app/settingsview/components/NameRegistrationDialog.qml
index eea05665a..032c7c895 100644
--- a/src/app/settingsview/components/NameRegistrationDialog.qml
+++ b/src/app/settingsview/components/NameRegistrationDialog.qml
@@ -40,8 +40,8 @@ BaseModalDialog {
         open()
     }
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     title: JamiStrings.setUsername
 
diff --git a/src/app/settingsview/components/RevokeDevicePasswordDialog.qml b/src/app/settingsview/components/RevokeDevicePasswordDialog.qml
index 95c575ded..97dcdf19a 100644
--- a/src/app/settingsview/components/RevokeDevicePasswordDialog.qml
+++ b/src/app/settingsview/components/RevokeDevicePasswordDialog.qml
@@ -38,8 +38,8 @@ BaseModalDialog {
         open()
     }
 
-    width: JamiTheme.preferredDialogWidth
-    height: JamiTheme.preferredDialogHeight
+    width: Math.min(mainView.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
+    height: Math.min(mainView.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
 
     title: JamiStrings.removeDevice
 
-- 
GitLab