lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-07 02:23:19 +02:00
Code Activity

misc: fix dialogs size and confirm strings

Browse source 
Change-Id: If8add5cd86d6893e2e55f7f5f33c228777f18579
GitLab: #780
This commit is contained in:
Sébastien Blin 2022-07-26 15:04:41 -04:00 • committed by Andreas Traczyk
parent 4e8ce70e19
commit 682757fdba
8 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/commoncomponents/ConfirmDialog.qml
View file

@ -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: ""

4
src/app/commoncomponents/DeleteAccountDialog.qml
View file

@ -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

4
src/app/commoncomponents/PasswordDialog.qml
View file

@ -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){

5
src/app/constant/JamiStrings.qml
View file

@ -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

2
src/app/mainview/components/ConversationSmartListContextMenu.qml
View file

@ -35,7 +35,7 @@ ContextMenuAutoLoader {
title: JamiStrings.confirmAction
textLabel: JamiStrings.confirmRmConversation
confirmLabel: JamiStrings.optionDelete
confirmLabel: JamiStrings.optionRemove
onAccepted: {
if (isSwarm)
MessagesAdapter.removeConversation(responsibleConvUid)

4
src/app/settingsview/components/LinkDeviceDialog.qml
View file

@ -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

4
src/app/settingsview/components/NameRegistrationDialog.qml
View file

@ -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

4
src/app/settingsview/components/RevokeDevicePasswordDialog.qml
View file

@ -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