From c0f879bd194688fa6fa09ed7e79ddd22de1c9f9b Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Fri, 25 Jul 2025 10:38:52 +0200 Subject: [PATCH] fix #LINQT-1852 senf files without text --- Linphone/data/languages/de.ts | 8 ++++---- Linphone/data/languages/en.ts | 8 ++++---- Linphone/data/languages/fr_FR.ts | 8 ++++---- .../view/Control/Input/Chat/ChatDroppableTextArea.qml | 6 +++--- Linphone/view/Page/Form/Chat/SelectedChatView.qml | 1 + 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index 9f886daae..4aeeb1818 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -4955,25 +4955,25 @@ Pour les activer dans un projet commercial, merci de nous contacter. - + shared_medias_title Shared medias - + shared_documents_title Shared documents - + forward_to_title Forward to… - + conversations_title Conversations diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index 944faba65..fcfe94627 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -4854,25 +4854,25 @@ To enable them in a commercial project, please contact us. Reply to %1 - + shared_medias_title Shared medias Shared medias - + shared_documents_title Shared documents Shared documents - + forward_to_title Forward to… Froward to… - + conversations_title Conversations Conversations diff --git a/Linphone/data/languages/fr_FR.ts b/Linphone/data/languages/fr_FR.ts index 3f4b118c3..f2461433e 100644 --- a/Linphone/data/languages/fr_FR.ts +++ b/Linphone/data/languages/fr_FR.ts @@ -4854,25 +4854,25 @@ Pour les activer dans un projet commercial, merci de nous contacter.Réponse à %1 - + shared_medias_title Shared medias Médias partagés - + shared_documents_title Shared documents Documents partagés - + forward_to_title Forward to… Transférer à… - + conversations_title Conversations Conversations diff --git a/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml b/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml index 687a99206..f1c93ce53 100644 --- a/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml +++ b/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml @@ -14,11 +14,11 @@ Control.Control { // property alias placeholderText: sendingTextArea.placeholderText property string text property var textArea + property int selectedFilesCount: 0 // property alias cursorPosition: sendingTextArea.cursorPosition property bool emojiPickerButtonChecked property bool dropEnabled: true - property string dropDisabledReason property bool isEphemeral : false property bool emojiVisible: false @@ -190,7 +190,7 @@ Control.Control { ToolTip.visible: !enabled && hovered //: Cannot record a message while a call is ongoing ToolTip.text: qsTr("cannot_record_while_in_call_tooltip") - visible: sendingTextArea.text.length === 0 + visible: sendingTextArea.text.length === 0 && mainItem.selectedFilesCount === 0 style: ButtonStyle.noBackground hoverEnabled: true icon.source: AppIcons.microphone @@ -199,7 +199,7 @@ Control.Control { } } BigButton { - visible: sendingTextArea.text.length !== 0 + visible: sendingTextArea.text.length !== 0 || mainItem.selectedFilesCount > 0 style: ButtonStyle.noBackgroundOrange icon.source: AppIcons.paperPlaneRight onClicked: { diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml index 2857fde53..1d10f2711 100644 --- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml +++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml @@ -446,6 +446,7 @@ RowLayout { Control.SplitView.preferredHeight: mainItem.chat?.core.isReadOnly ? 0 : height Control.SplitView.minimumHeight: mainItem.chat?.core.isReadOnly ? 0 : Math.round(79 * DefaultStyle.dp) chat: mainItem.chat + selectedFilesCount: contents.count onChatChanged: { if (chat) messageSender.text = mainItem.chat.core.sendingText }