diff --git a/CMakeLists.txt b/CMakeLists.txt index 64badf6f1..24bdefe3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index bc7f288f3..934bc3be0 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -522,6 +522,11 @@ Server url ikke konfigureret. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1274,6 +1279,21 @@ Klik her: <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index afea2cd42..5acaf6908 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -522,6 +522,11 @@ Server URL ist nicht konfiguriert. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1274,6 +1279,21 @@ Klicken Sie hier: <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index e95cbf74a..b1b05620a 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -522,6 +522,11 @@ Server URL not configured. 'Delete' : Item menu to delete a message Delete + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + Hide delivery status + Cli diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 1963f7e6c..6fc9b3bb8 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -522,6 +522,11 @@ URL del servidor no configurada. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1274,6 +1279,21 @@ Haga clic aquí: <a href="%1">%1 </a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index d1ab0af4d..8db11725e 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -522,6 +522,11 @@ Url du serveur non configurée. 'Delete' : Item menu to delete a message Effacer + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1274,6 +1279,21 @@ Cliquez ici : <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 8be3b2d67..08aa6d75e 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -521,6 +521,11 @@ A kiszolgáló URL-je nincs konfigurálva. 'Delete' : Item menu to delete a message Törlés + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1269,6 +1274,21 @@ Kattintson ide: <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button Konferencia megnyitása + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index a4253fc1a..06bd1336f 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -522,6 +522,11 @@ URL del server non configurato. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1274,6 +1279,21 @@ Clicca: <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 2f5d133ba..d063bcd7f 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -521,6 +521,11 @@ 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1269,6 +1274,21 @@ Ephemeral message is only supported in conference based chat room!''Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 44ac0c889..fb3bf56dd 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -523,6 +523,11 @@ Nesukonfigūruotas serverio url. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1279,6 +1284,21 @@ Spustelėkite čia: <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 73cdd682d..be56d9d69 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -522,6 +522,11 @@ URL do servidor não configurado. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1274,6 +1279,21 @@ Clique aqui: <a href="%1">%1 </a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 8c6f93066..838e025e1 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -523,6 +523,11 @@ 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1279,6 +1284,21 @@ Ephemeral message is only supported in conference based chat room!''Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 051ac8a7d..0945c008a 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -522,6 +522,11 @@ Serverwebbadressen är inte konfigurerad. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1274,6 +1279,21 @@ Klicka här: <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 22df3777f..45591a553 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -521,6 +521,11 @@ Sunucu url'si yapılandırılmadı. 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1269,6 +1274,21 @@ Buraya tıklayın: <a href="%1">%1</a> 'Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 7a9ab3d25..2a6db4af8 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -523,6 +523,11 @@ 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1279,6 +1284,21 @@ Ephemeral message is only supported in conference based chat room!''Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 80d2fad93..eef2e8123 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -521,6 +521,11 @@ 'Delete' : Item menu to delete a message + + menuHideDeliveryStatus + 'Hide delivery status' : Item menu that lead to IMDN of a message + + Cli @@ -1269,6 +1274,21 @@ Ephemeral message is only supported in conference based chat room!''Open Conference' : Tooltip to illustrate a button + + hideTimeline + 'Hide Timeline' : Tooltip for a button that hide the timeline + + + + openTimeline + 'Open Timeline' : Tooltip for a button that open the timeline + + + + openHome + 'Open Home' : Tooltip for a button that open the home view + + MainWindowMenuBar diff --git a/linphone-app/src/components/chat-events/ChatMessageModel.cpp b/linphone-app/src/components/chat-events/ChatMessageModel.cpp index cd8827901..3661d9448 100644 --- a/linphone-app/src/components/chat-events/ChatMessageModel.cpp +++ b/linphone-app/src/components/chat-events/ChatMessageModel.cpp @@ -444,6 +444,7 @@ void ChatMessageModel::resendMessage (){ case LinphoneEnums::ChatMessageStateFileTransferError: case LinphoneEnums::ChatMessageStateNotDelivered: { mChatMessage->send(); + emit stateChanged(); break; } diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml b/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml index 2a172bbe8..dfb0c0cfe 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml @@ -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 diff --git a/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml b/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml index d2ee1d2c2..4add61bd9 100644 --- a/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml @@ -300,6 +300,7 @@ Row { deliveryCount: deliveryLayout.model.count onDeliveryStatusClicked: deliveryLayout.visible = !deliveryLayout.visible onRemoveEntryRequested: removeEntry() + deliveryVisible: deliveryLayout.visible } Row{ diff --git a/linphone-app/ui/modules/Linphone/Chat/Message.qml b/linphone-app/ui/modules/Linphone/Chat/Message.qml index 0b0edf26a..78584e87c 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Message.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Message.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml index fd05897f2..60f264534 100644 --- a/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml index d349dc0c8..15b5b309f 100644 --- a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml +++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml @@ -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 diff --git a/linphone-sdk b/linphone-sdk index b6edff86d..979230a6a 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit b6edff86d917308dcc308bcd5f511689f6893308 +Subproject commit 979230a6ac50d2f12ad2ecd0ad009cc55ac4327e