From ac2bcc4629c9a9c381d0f3f07a2706ffda015291 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Mon, 15 Dec 2025 15:38:45 +0100 Subject: [PATCH] Fixes: meeting form : initialize meeting title if not empty #LINQT-2125 fix download path force active focus on sending text area when replying to message --- Linphone/core/setting/SettingsCore.cpp | 1 + Linphone/data/languages/de.ts | 12 ++++++------ Linphone/data/languages/en.ts | 12 ++++++------ Linphone/data/languages/fr.ts | 12 ++++++------ .../Control/Input/Chat/ChatDroppableTextArea.qml | 5 +++++ Linphone/view/Page/Form/Chat/SelectedChatView.qml | 6 ++++++ Linphone/view/Page/Form/Meeting/MeetingForm.qml | 2 +- 7 files changed, 31 insertions(+), 19 deletions(-) diff --git a/Linphone/core/setting/SettingsCore.cpp b/Linphone/core/setting/SettingsCore.cpp index 21eb515e6..8f90f5bd2 100644 --- a/Linphone/core/setting/SettingsCore.cpp +++ b/Linphone/core/setting/SettingsCore.cpp @@ -1053,6 +1053,7 @@ QString SettingsCore::getDownloadFolder() const { auto path = mDownloadFolder; if (mDownloadFolder.isEmpty()) path = Paths::getDownloadDirPath(); QString cleanPath = QDir::cleanPath(path); + if (!cleanPath.endsWith(QDir::separator())) cleanPath.append(QDir::separator()); return cleanPath; } diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index 567ffd282..0cb5dfcfe 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -2111,13 +2111,13 @@ ChatDroppableTextArea - + chat_view_send_area_placeholder_text Say something… : placeholder text for sending message text area Sag etwas… - + cannot_record_while_in_call_tooltip Cannot record a message while a call is ongoing Während eines laufenden Anrufs kann keine Nachricht aufgenommen werden @@ -5880,25 +5880,25 @@ Um sie in einem kommerziellen Projekt zu aktivieren, kontaktieren Sie uns bitte. Auf %1 antworten - + shared_medias_title Shared medias Geteilte Medien - + shared_documents_title Shared documents Geteilte Dokumente - + forward_to_title Forward to… Weiterleiten an… - + conversations_title Conversations Konversationen diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index 6d73e9034..75aa8f47d 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -2074,13 +2074,13 @@ ChatDroppableTextArea - + chat_view_send_area_placeholder_text Say something… : placeholder text for sending message text area Say something… - + cannot_record_while_in_call_tooltip Cannot record a message while a call is ongoing Cannot record a message while a call is ongoing @@ -5757,25 +5757,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.ts b/Linphone/data/languages/fr.ts index 15dbabbb2..ed5515b84 100644 --- a/Linphone/data/languages/fr.ts +++ b/Linphone/data/languages/fr.ts @@ -2069,13 +2069,13 @@ ChatDroppableTextArea - + chat_view_send_area_placeholder_text Say something… : placeholder text for sending message text area Dites quelque chose… - + cannot_record_while_in_call_tooltip Cannot record a message while a call is ongoing Impossible d'enregistrer un message vocal pendant un appel @@ -5752,25 +5752,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 55122e209..5d10ac5ab 100644 --- a/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml +++ b/Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml @@ -25,6 +25,8 @@ Control.Control { property bool callOngoing: false property ChatGui chat + + signal focusTextArea() // --------------------------------------------------------------------------- @@ -176,6 +178,9 @@ Control.Control { function onSendMessage() { sendingTextArea.clear() } + function onFocusTextArea() { + sendingTextArea.forceActiveFocus() + } } } } diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml index 96cdd5c1c..83a729283 100644 --- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml +++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml @@ -515,6 +515,12 @@ FocusScope { onDropped: (files) => { contents.addFiles(files) } + Connections { + target: mainItem + function onReplyingToMessageChanged() { + if (mainItem.replyingToMessage) messageSender.focusTextArea() + } + } } } } diff --git a/Linphone/view/Page/Form/Meeting/MeetingForm.qml b/Linphone/view/Page/Form/Meeting/MeetingForm.qml index 18cdad514..07adc7110 100644 --- a/Linphone/view/Page/Form/Meeting/MeetingForm.qml +++ b/Linphone/view/Page/Form/Meeting/MeetingForm.qml @@ -76,7 +76,7 @@ FocusScope { maximumLength: width //: "Ajouter un titre" property string defaultText: qsTr("meeting_schedule_subject_hint") - Component.onCompleted: text = defaultText + Component.onCompleted: text = mainItem.conferenceInfoGui.core.subject === "" ? defaultText : mainItem.conferenceInfoGui.core.subject text: conferenceInfoGui.core.subject ? conferenceInfoGui.core.subject : "" color: DefaultStyle.main2_600 font {