mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix OSX min version

Browse source 
- Fix IMDN display on multi-devices
- Remove chat area min limits when not showing ephemeral
- Update text on delivery menu for toggling
This commit is contained in:
Julien Wadel 2021-09-09 17:50:34 +02:00
parent 7c22370ab9
commit da844225d2
23 changed files with 306 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -45,6 +45,10 @@ if(WIN32)
message(STATUS "Setting Platform to ${CMAKE_GENERATOR_PLATFORM}")
endif()
endif()
elseif( APPLE )
if( NOT CMAKE_OSX_DEPLOYMENT_TARGET)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
endif()
endif()
project(linphoneqt)
@ -162,7 +166,9 @@ if(UNIX AND NOT APPLE)
set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
endif()
if(CMAKE_OSX_DEPLOYMENT_TARGET)
list(APPEND APP_OPTIONS "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
if(ENABLE_BUILD_APP_PLUGINS)

20
linphone-app/assets/languages/da.ts
View file

@ -522,6 +522,11 @@ Server url ikke konfigureret.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1274,6 +1279,21 @@ Klik her: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/de.ts
View file

@ -522,6 +522,11 @@ Server URL ist nicht konfiguriert.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1274,6 +1279,21 @@ Klicken Sie hier: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

5
linphone-app/assets/languages/en.ts
View file

@ -522,6 +522,11 @@ Server URL not configured.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation>Delete</translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation>Hide delivery status</translation>
</message>
</context>
<context>
<name>Cli</name>

20
linphone-app/assets/languages/es.ts
View file

@ -522,6 +522,11 @@ URL del servidor no configurada.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1274,6 +1279,21 @@ Haga clic aquí: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/fr_FR.ts
View file

@ -522,6 +522,11 @@ Url du serveur non configurée.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished">Effacer</translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1274,6 +1279,21 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/hu.ts
View file

@ -521,6 +521,11 @@ A kiszolgáló URL-je nincs konfigurálva.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation>Törlés</translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1269,6 +1274,21 @@ Kattintson ide: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation>Konferencia megnyitása</translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/it.ts
View file

@ -522,6 +522,11 @@ URL del server non configurato.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1274,6 +1279,21 @@ Clicca: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/ja.ts
View file

@ -521,6 +521,11 @@
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1269,6 +1274,21 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/lt.ts
View file

@ -523,6 +523,11 @@ Nesukonfigūruotas serverio url.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1279,6 +1284,21 @@ Spustelėkite čia: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/pt_BR.ts
View file

@ -522,6 +522,11 @@ URL do servidor não configurado.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1274,6 +1279,21 @@ Clique aqui: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/ru.ts
View file

@ -523,6 +523,11 @@
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1279,6 +1284,21 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/sv.ts
View file

@ -522,6 +522,11 @@ Serverwebbadressen är inte konfigurerad.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1274,6 +1279,21 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/tr.ts
View file

@ -521,6 +521,11 @@ Sunucu url&apos;si yapılandırılmadı.</translation>
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1269,6 +1274,21 @@ Buraya tıklayın: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/uk.ts
View file

@ -523,6 +523,11 @@
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1279,6 +1284,21 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

20
linphone-app/assets/languages/zh_CN.ts
View file

@ -521,6 +521,11 @@
<extracomment>&apos;Delete&apos; : Item menu to delete a message</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>menuHideDeliveryStatus</source>
<extracomment>&apos;Hide delivery status&apos; : Item menu that lead to IMDN of a message</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Cli</name>
@ -1269,6 +1274,21 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<extracomment>&apos;Open Conference&apos; : Tooltip to illustrate a button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>hideTimeline</source>
<extracomment>&apos;Hide Timeline&apos; : Tooltip for a button that hide the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openTimeline</source>
<extracomment>&apos;Open Timeline&apos; : Tooltip for a button that open the timeline</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>openHome</source>
<extracomment>&apos;Open Home&apos; : Tooltip for a button that open the home view</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindowMenuBar</name>

1
linphone-app/src/components/chat-events/ChatMessageModel.cpp
View file

@ -444,6 +444,7 @@ void ChatMessageModel::resendMessage (){
case LinphoneEnums::ChatMessageStateFileTransferError:
case LinphoneEnums::ChatMessageStateNotDelivered: {
mChatMessage->send();
emit stateChanged();
break;
}

6
linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml
View file

@ -22,6 +22,7 @@ Item {
property string lastTextSelected
property string content
property int deliveryCount : 0
property bool deliveryVisible: false
signal deliveryStatusClicked()
signal removeEntryRequested()
@ -58,8 +59,11 @@ Item {
visible: content != ''
}
MenuItem {
//: 'Hide delivery status' : Item menu that lead to IMDN of a message
text: (deliveryVisible ? qsTr('menuHideDeliveryStatus')
//: 'Delivery status' : Item menu that lead to IMDN of a message
text: qsTr('menuDeliveryStatus')
: qsTr('menuDeliveryStatus')
)
iconMenu: 'menu_imdn_info'
iconSizeMenu: 17
iconLayoutDirection: Qt.RightToLeft

1
linphone-app/ui/modules/Linphone/Chat/FileMessage.qml
View file

@ -300,6 +300,7 @@ Row {
deliveryCount: deliveryLayout.model.count
onDeliveryStatusClicked: deliveryLayout.visible = !deliveryLayout.visible
onRemoveEntryRequested: removeEntry()
deliveryVisible: deliveryLayout.visible
}
Row{

3
linphone-app/ui/modules/Linphone/Chat/Message.qml
View file

@ -43,7 +43,7 @@ Item {
height: parent.height - (deliveryLayout.visible? deliveryLayout.height : 0)
radius: ChatStyle.entry.message.radius
width: (
message.contentWidth < ephemeralTimerRow.width
ephemeralTimerRow.visible && message.contentWidth < ephemeralTimerRow.width
? ephemeralTimerRow.width
: message.contentWidth < parent.width
? message.contentWidth
@ -123,6 +123,7 @@ Item {
deliveryCount: deliveryLayout.model.count
onDeliveryStatusClicked: deliveryLayout.visible = !deliveryLayout.visible
onRemoveEntryRequested: removeEntry()
deliveryVisible: deliveryLayout.visible
}
}

6
linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml
View file

@ -43,9 +43,9 @@ Item {
readonly property bool isDelivered: $chatEntry.state == LinphoneEnums.ChatMessageStateDeliveredToUser
readonly property bool isRead: $chatEntry.state == LinphoneEnums.ChatMessageStateDisplayed
icon: isError
icon: iconId.isError
? 'chat_error'
: (isRead ? 'chat_read' : (isDelivered ? 'chat_delivered' : '' ) )
: (iconId.isRead ? 'chat_read' : (iconId.isDelivered ? 'chat_delivered' : '' ) )
iconSize: ChatStyle.entry.message.outgoing.sendIconSize
MouseArea {
@ -59,7 +59,7 @@ Item {
id:tooltip
text: iconId.isError
? qsTr('messageError')
: (isRead ? qsTr('messageRead') : qsTr('messageDelivered'))
: (iconId.isRead ? qsTr('messageRead') : qsTr('messageDelivered'))
hoveringCursor : retryAction.visible?Qt.PointingHandCursor:Qt.ArrowCursor
}
}

2
linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
View file

@ -40,7 +40,7 @@ Notification {
property ChatRoomModel chatRoomModel : notification.timelineModel.getChatRoomModel()
//entry: notification.fullPeerAddress? SipAddressesModel.getSipAddressObserver(notification.fullPeerAddress, notification.fullLocalAddress): notification.timelineModel.getChatRoomModel()
entry: ({
sipAddress: SipAddressesModel.getSipAddressObserver(notification.fullPeerAddress, notification.fullLocalAddress),
sipAddress: SipAddressesModel.getSipAddressObserver(notification.fullPeerAddress, notification.fullLocalAddress).peerAddress,
isOneToOne: chatRoomModel.isOneToOne,
haveEncryption: chatRoomModel.haveEncryption,
securityLevel: chatRoomModel.securityLevel

2
linphone-sdk

@ -1 +1 @@
Subproject commit b6edff86d917308dcc308bcd5f511689f6893308
Subproject commit 979230a6ac50d2f12ad2ecd0ad009cc55ac4327e