diff --git a/linphone-desktop/assets/images/cancel_hovered.svg b/linphone-desktop/assets/images/cancel_hovered.svg new file mode 100644 index 000000000..ac47999bf --- /dev/null +++ b/linphone-desktop/assets/images/cancel_hovered.svg @@ -0,0 +1,17 @@ + + + + cancel_add_conference_over + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/cancel_normal.svg b/linphone-desktop/assets/images/cancel_normal.svg new file mode 100644 index 000000000..3acee96a1 --- /dev/null +++ b/linphone-desktop/assets/images/cancel_normal.svg @@ -0,0 +1,17 @@ + + + + cancel_add_conference_default + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/cancel_pressed.svg b/linphone-desktop/assets/images/cancel_pressed.svg new file mode 100644 index 000000000..d27e39e2e --- /dev/null +++ b/linphone-desktop/assets/images/cancel_pressed.svg @@ -0,0 +1,17 @@ + + + + cancel_add_conference_clic + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/transfer_hovered.svg b/linphone-desktop/assets/images/transfer_hovered.svg new file mode 100644 index 000000000..f330b0239 --- /dev/null +++ b/linphone-desktop/assets/images/transfer_hovered.svg @@ -0,0 +1,17 @@ + + + + transfer_over + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/transfer_normal.svg b/linphone-desktop/assets/images/transfer_normal.svg new file mode 100644 index 000000000..1b597189b --- /dev/null +++ b/linphone-desktop/assets/images/transfer_normal.svg @@ -0,0 +1,17 @@ + + + + transfer_default + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/transfer_pressed.svg b/linphone-desktop/assets/images/transfer_pressed.svg new file mode 100644 index 000000000..47cd45e83 --- /dev/null +++ b/linphone-desktop/assets/images/transfer_pressed.svg @@ -0,0 +1,17 @@ + + + + transfer_clic + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index 6f7876a2a..042a776d7 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -46,6 +46,9 @@ assets/images/camera_on_normal.svg assets/images/camera_on_pressed.svg assets/images/camera_on_updating.svg + assets/images/cancel_hovered.svg + assets/images/cancel_normal.svg + assets/images/cancel_pressed.svg assets/images/chat_amount.svg assets/images/chat_count.svg assets/images/chat_delivered.svg @@ -165,6 +168,9 @@ assets/images/tooltip_arrow_left.svg assets/images/tooltip_arrow_right.svg assets/images/tooltip_arrow_top.svg + assets/images/transfer_hovered.svg + assets/images/transfer_normal.svg + assets/images/transfer_pressed.svg assets/images/video_call_accept_hovered.svg assets/images/video_call_accept_normal.svg assets/images/video_call_accept_pressed.svg diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index c930ce4d8..8c1b6b8f4 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -140,8 +140,10 @@ void App::initContentApp () { setQuitOnLastWindowClosed(false); QObject::connect( - this, &App::receivedMessage, this, [this](int, QByteArray message) { - qInfo() << QStringLiteral("Received message from other application: `%1`.").arg(QString(message)); + this, &App::receivedMessage, this, [this](int, QByteArray byteArray) { + QString message(byteArray); + + qInfo() << QStringLiteral("Received message from other application: `%1`.").arg(message); if (message == "show") smartShowWindow(getMainWindow()); diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml index 0714aa714..ebd3b6c82 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml @@ -33,6 +33,13 @@ Rectangle { radius: field.radius } + Rectangle { + anchors.fill: parent + color: TextFieldStyle.background.color.readOnly + opacity: 0.8 + visible: field.readOnly + } + MouseArea { anchors.fill: parent hoverEnabled: true diff --git a/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml index 3381e0b54..fb8450358 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml @@ -33,8 +33,8 @@ RowLayout { var previousEntry = proxyModel.data(proxyModel.index(index - 1, 0)) // 2. Previous entry is a call event. => Visible. - // 3. I have sent a message before me contact. => Visible. - // 4. One hour between two incoming message. => Visible. + // 3. I have sent a message before my contact. => Visible. + // 4. One hour between two incoming messages. => Visible. return previousEntry.type !== ChatModel.MessageEntry || previousEntry.isOutgoing || $chatEntry.timestamp.getTime() - previousEntry.timestamp.getTime() > 3600 diff --git a/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml b/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml index 8366dbb99..e8a2a459a 100644 --- a/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml +++ b/linphone-desktop/ui/views/App/Calls/ConferenceManager.qml @@ -80,7 +80,7 @@ DialogPlus { anchors.fill: parent actions: [{ - icon: 'video_call', // TODO: replace me. + icon: 'transfer', handler: function (entry) { conferenceHelperModel.toAdd.addToConference(entry.sipAddress) } @@ -126,7 +126,7 @@ DialogPlus { anchors.fill: parent actions: [{ - icon: 'video_call', // TODO: replace me. + icon: 'cancel', handler: function (entry) { model.removeFromConference(entry.sipAddress) }