Skip to content
Snippets Groups Projects
Commit 682757fd authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk
Browse files

misc: fix dialogs size and confirm strings

Change-Id: If8add5cd86d6893e2e55f7f5f33c228777f18579
GitLab: #780
parent 4e8ce70e
No related branches found
Tags nightly/20230615.1
No related merge requests found
......@@ -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: ""
......
......@@ -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
......
......@@ -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){
......
......@@ -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
......
......@@ -35,7 +35,7 @@ ContextMenuAutoLoader {
title: JamiStrings.confirmAction
textLabel: JamiStrings.confirmRmConversation
confirmLabel: JamiStrings.optionDelete
confirmLabel: JamiStrings.optionRemove
onAccepted: {
if (isSwarm)
MessagesAdapter.removeConversation(responsibleConvUid)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment