data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes:

Browse source 
meeting form : initialize meeting title if not empty #LINQT-2125

fix download path

force active focus on sending text area when replying to message
This commit is contained in:
Gaelle Braud 2025-12-15 15:38:45 +01:00
parent 75ad42d5e8
commit ac2bcc4629
7 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Linphone/core/setting/SettingsCore.cpp
View file

@ -1053,6 +1053,7 @@ QString SettingsCore::getDownloadFolder() const {
auto path = mDownloadFolder; auto path = mDownloadFolder;
if (mDownloadFolder.isEmpty()) path = Paths::getDownloadDirPath(); if (mDownloadFolder.isEmpty()) path = Paths::getDownloadDirPath();
QString cleanPath = QDir::cleanPath(path); QString cleanPath = QDir::cleanPath(path);
if (!cleanPath.endsWith(QDir::separator())) cleanPath.append(QDir::separator());
return cleanPath; return cleanPath;
} }

12
Linphone/data/languages/de.ts
View file

@ -2111,13 +2111,13 @@
<context> <context>
<name>ChatDroppableTextArea</name> <name>ChatDroppableTextArea</name>
<message> <message>
<location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="154"/> <location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="156"/>
<source>chat_view_send_area_placeholder_text</source> <source>chat_view_send_area_placeholder_text</source>
<extracomment>Say something… : placeholder text for sending message text area</extracomment> <extracomment>Say something… : placeholder text for sending message text area</extracomment>
<translation>Sag etwas…</translation> <translation>Sag etwas…</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="190"/> <location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="195"/>
<source>cannot_record_while_in_call_tooltip</source> <source>cannot_record_while_in_call_tooltip</source>
<extracomment>Cannot record a message while a call is ongoing</extracomment> <extracomment>Cannot record a message while a call is ongoing</extracomment>
<translation>Während eines laufenden Anrufs kann keine Nachricht aufgenommen werden</translation> <translation>Während eines laufenden Anrufs kann keine Nachricht aufgenommen werden</translation>
@ -5880,25 +5880,25 @@ Um sie in einem kommerziellen Projekt zu aktivieren, kontaktieren Sie uns bitte.
<translation>Auf %1 antworten</translation> <translation>Auf %1 antworten</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="617"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="623"/>
<source>shared_medias_title</source> <source>shared_medias_title</source>
<extracomment>Shared medias</extracomment> <extracomment>Shared medias</extracomment>
<translation>Geteilte Medien</translation> <translation>Geteilte Medien</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="619"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="625"/>
<source>shared_documents_title</source> <source>shared_documents_title</source>
<extracomment>Shared documents</extracomment> <extracomment>Shared documents</extracomment>
<translation>Geteilte Dokumente</translation> <translation>Geteilte Dokumente</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="648"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="654"/>
<source>forward_to_title</source> <source>forward_to_title</source>
<extracomment>Forward to…</extracomment> <extracomment>Forward to…</extracomment>
<translation>Weiterleiten an…</translation> <translation>Weiterleiten an…</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="682"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="688"/>
<source>conversations_title</source> <source>conversations_title</source>
<extracomment>Conversations</extracomment> <extracomment>Conversations</extracomment>
<translation>Konversationen</translation> <translation>Konversationen</translation>

12
Linphone/data/languages/en.ts
View file

@ -2074,13 +2074,13 @@
<context> <context>
<name>ChatDroppableTextArea</name> <name>ChatDroppableTextArea</name>
<message> <message>
<location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="154"/> <location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="156"/>
<source>chat_view_send_area_placeholder_text</source> <source>chat_view_send_area_placeholder_text</source>
<extracomment>Say something… : placeholder text for sending message text area</extracomment> <extracomment>Say something… : placeholder text for sending message text area</extracomment>
<translation>Say something…</translation> <translation>Say something…</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="190"/> <location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="195"/>
<source>cannot_record_while_in_call_tooltip</source> <source>cannot_record_while_in_call_tooltip</source>
<extracomment>Cannot record a message while a call is ongoing</extracomment> <extracomment>Cannot record a message while a call is ongoing</extracomment>
<translation>Cannot record a message while a call is ongoing</translation> <translation>Cannot record a message while a call is ongoing</translation>
@ -5757,25 +5757,25 @@ To enable them in a commercial project, please contact us.</translation>
<translation>Reply to %1</translation> <translation>Reply to %1</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="617"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="623"/>
<source>shared_medias_title</source> <source>shared_medias_title</source>
<extracomment>Shared medias</extracomment> <extracomment>Shared medias</extracomment>
<translation>Shared medias</translation> <translation>Shared medias</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="619"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="625"/>
<source>shared_documents_title</source> <source>shared_documents_title</source>
<extracomment>Shared documents</extracomment> <extracomment>Shared documents</extracomment>
<translation>Shared documents</translation> <translation>Shared documents</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="648"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="654"/>
<source>forward_to_title</source> <source>forward_to_title</source>
<extracomment>Forward to…</extracomment> <extracomment>Forward to…</extracomment>
<translation>Froward to…</translation> <translation>Froward to…</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="682"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="688"/>
<source>conversations_title</source> <source>conversations_title</source>
<extracomment>Conversations</extracomment> <extracomment>Conversations</extracomment>
<translation>Conversations</translation> <translation>Conversations</translation>

12
Linphone/data/languages/fr.ts
View file

@ -2069,13 +2069,13 @@
<context> <context>
<name>ChatDroppableTextArea</name> <name>ChatDroppableTextArea</name>
<message> <message>
<location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="154"/> <location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="156"/>
<source>chat_view_send_area_placeholder_text</source> <source>chat_view_send_area_placeholder_text</source>
<extracomment>Say something… : placeholder text for sending message text area</extracomment> <extracomment>Say something… : placeholder text for sending message text area</extracomment>
<translation>Dites quelque chose…</translation> <translation>Dites quelque chose…</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="190"/> <location filename="../../view/Control/Input/Chat/ChatDroppableTextArea.qml" line="195"/>
<source>cannot_record_while_in_call_tooltip</source> <source>cannot_record_while_in_call_tooltip</source>
<extracomment>Cannot record a message while a call is ongoing</extracomment> <extracomment>Cannot record a message while a call is ongoing</extracomment>
<translation>Impossible d&apos;enregistrer un message vocal pendant un appel</translation> <translation>Impossible d&apos;enregistrer un message vocal pendant un appel</translation>
@ -5752,25 +5752,25 @@ Pour les activer dans un projet commercial, merci de nous contacter.</translatio
<translation>Réponse à %1</translation> <translation>Réponse à %1</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="617"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="623"/>
<source>shared_medias_title</source> <source>shared_medias_title</source>
<extracomment>Shared medias</extracomment> <extracomment>Shared medias</extracomment>
<translation>Médias partagés</translation> <translation>Médias partagés</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="619"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="625"/>
<source>shared_documents_title</source> <source>shared_documents_title</source>
<extracomment>Shared documents</extracomment> <extracomment>Shared documents</extracomment>
<translation>Documents partagés</translation> <translation>Documents partagés</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="648"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="654"/>
<source>forward_to_title</source> <source>forward_to_title</source>
<extracomment>Forward to…</extracomment> <extracomment>Forward to…</extracomment>
<translation>Transférer à…</translation> <translation>Transférer à…</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="682"/> <location filename="../../view/Page/Form/Chat/SelectedChatView.qml" line="688"/>
<source>conversations_title</source> <source>conversations_title</source>
<extracomment>Conversations</extracomment> <extracomment>Conversations</extracomment>
<translation>Conversations</translation> <translation>Conversations</translation>

5
Linphone/view/Control/Input/Chat/ChatDroppableTextArea.qml
View file

@ -26,6 +26,8 @@ Control.Control {
property ChatGui chat property ChatGui chat
signal focusTextArea()
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
signal dropped (var files) signal dropped (var files)
@ -176,6 +178,9 @@ Control.Control {
function onSendMessage() { function onSendMessage() {
sendingTextArea.clear() sendingTextArea.clear()
} }
function onFocusTextArea() {
sendingTextArea.forceActiveFocus()
}
} }
} }
} }

6
Linphone/view/Page/Form/Chat/SelectedChatView.qml
View file

@ -515,6 +515,12 @@ FocusScope {
onDropped: (files) => { onDropped: (files) => {
contents.addFiles(files) contents.addFiles(files)
} }
Connections {
target: mainItem
function onReplyingToMessageChanged() {
if (mainItem.replyingToMessage) messageSender.focusTextArea()
}
}
} }
} }
} }

2
Linphone/view/Page/Form/Meeting/MeetingForm.qml
View file

@ -76,7 +76,7 @@ FocusScope {
maximumLength: width maximumLength: width
//: "Ajouter un titre" //: "Ajouter un titre"
property string defaultText: qsTr("meeting_schedule_subject_hint") 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 : "" text: conferenceInfoGui.core.subject ? conferenceInfoGui.core.subject : ""
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
font { font {