Skip to content

L
linphone-desktop
Commit 7bbd11b6 authored by Ronan Abhamon's avatar Ronan Abhamon
Browse files
Options

feat(ui/views/App/Calls/ConferenceManager): use correct icons & fixes

parent e3eaf05f
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 6 deletions
linphone-desktop/assets/images/cancel_hovered.svg 0 → 100644
View file @ 7bbd11b6
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>cancel_add_conference_over</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="cancel_add_conference_over">
<g id="Group-3">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" id="chat_default" fill="#4B5964"></path>
<g id="Group-4" transform="translate(20.000000, 20.000000) rotate(-135.000000) translate(-20.000000, -20.000000) translate(12.000000, 12.000000)" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M7.99397869,-2.78888024e-13 L7.99397869,14.9573643 L7.99498471,16 L7.99397869,-2.78888024e-13 Z M16,7.99397869 L1.04263566,7.99397869 L1.0125234e-12,7.99498471 L16,7.99397869 Z" id="Imported-Layers" transform="translate(8.000000, 8.000000) rotate(-360.000000) translate(-8.000000, -8.000000) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/cancel_normal.svg 0 → 100644
View file @ 7bbd11b6
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>cancel_add_conference_default</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="cancel_add_conference_default">
<g id="Group-3">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" id="chat_default" fill="#96A6B1"></path>
<g id="Group-4" transform="translate(20.000000, 20.000000) rotate(-135.000000) translate(-20.000000, -20.000000) translate(12.000000, 12.000000)" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M7.99397869,-5.68434189e-14 L7.99397869,14.9573643 L7.99498471,16 L7.99397869,-5.68434189e-14 Z M16,7.99397869 L1.04263566,7.99397869 L7.9225515e-13,7.99498471 L16,7.99397869 Z" id="Imported-Layers" transform="translate(8.000000, 8.000000) rotate(-360.000000) translate(-8.000000, -8.000000) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/cancel_pressed.svg 0 → 100644
View file @ 7bbd11b6
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>cancel_add_conference_clic</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="cancel_add_conference_clic">
<g id="Group-3">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" id="chat_default" fill="#FF5E00"></path>
<g id="Group-4" transform="translate(20.000000, 20.000000) rotate(-135.000000) translate(-20.000000, -20.000000) translate(12.000000, 12.000000)" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M7.99397869,-5.68434189e-14 L7.99397869,14.9573643 L7.99498471,16 L7.99397869,-5.68434189e-14 Z M16,7.99397869 L1.04263566,7.99397869 L7.9225515e-13,7.99498471 L16,7.99397869 Z" id="Imported-Layers" transform="translate(8.000000, 8.000000) rotate(-360.000000) translate(-8.000000, -8.000000) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/transfer_hovered.svg 0 → 100644
View file @ 7bbd11b6
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>transfer_over</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="transfer_over">
<g id="chat_default-copy-2">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" id="chat_default" fill="#4B5964"></path>
<g id="Group-4" transform="translate(20.000000, 20.000000) rotate(-180.000000) translate(-20.000000, -20.000000) translate(10.000000, 10.000000)" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M3.49948648,4.26240154 L3.49948648,15.7427287 L3.50049251,16.5429899 L3.49948648,4.26240154 Z M15.9500062,16.5469565 L3.50049251,16.5429899 L15.9500062,16.5469565 Z M4.13931604,15.9123007 L16.4731373,3.7556686 L4.13931604,15.9123007 Z" id="Imported-Layers" transform="translate(9.986312, 10.151313) rotate(-315.000000) translate(-9.986312, -10.151313) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/transfer_normal.svg 0 → 100644
View file @ 7bbd11b6
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>transfer_default</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="transfer_default">
<g id="chat_default-copy">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" id="chat_default" fill="#96A6B1"></path>
<g id="Group-4" transform="translate(20.000000, 20.000000) rotate(-180.000000) translate(-20.000000, -20.000000) translate(10.000000, 10.000000)" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M3.49948648,4.26240154 L3.49948648,15.7427287 L3.50049251,16.5429899 L3.49948648,4.26240154 Z M15.9500062,16.5469565 L3.50049251,16.5429899 L15.9500062,16.5469565 Z M4.13931604,15.9123007 L16.4731373,3.7556686 L4.13931604,15.9123007 Z" id="Imported-Layers" transform="translate(9.986312, 10.151313) rotate(-315.000000) translate(-9.986312, -10.151313) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/transfer_pressed.svg 0 → 100644
View file @ 7bbd11b6
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>transfer_clic</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="transfer_clic">
<g id="chat_default-copy-2">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" id="chat_default" fill="#FF5E00"></path>
<g id="Group-4" transform="translate(20.000000, 20.000000) rotate(-180.000000) translate(-20.000000, -20.000000) translate(10.000000, 10.000000)" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M3.49948648,4.26240154 L3.49948648,15.7427287 L3.50049251,16.5429899 L3.49948648,4.26240154 Z M15.9500062,16.5469565 L3.50049251,16.5429899 L15.9500062,16.5469565 Z M4.13931604,15.9123007 L16.4731373,3.7556686 L4.13931604,15.9123007 Z" id="Imported-Layers" transform="translate(9.986312, 10.151313) rotate(-315.000000) translate(-9.986312, -10.151313) "></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/resources.qrc
View file @ 7bbd11b6
......@@ -46,6 +46,9 @@
<file>assets/images/camera_on_normal.svg</file>
<file>assets/images/camera_on_pressed.svg</file>
<file>assets/images/camera_on_updating.svg</file>
<file>assets/images/cancel_hovered.svg</file>
<file>assets/images/cancel_normal.svg</file>
<file>assets/images/cancel_pressed.svg</file>
<file>assets/images/chat_amount.svg</file>
<file>assets/images/chat_count.svg</file>
<file>assets/images/chat_delivered.svg</file>
......@@ -165,6 +168,9 @@
<file>assets/images/tooltip_arrow_left.svg</file>
<file>assets/images/tooltip_arrow_right.svg</file>
<file>assets/images/tooltip_arrow_top.svg</file>
<file>assets/images/transfer_hovered.svg</file>
<file>assets/images/transfer_normal.svg</file>
<file>assets/images/transfer_pressed.svg</file>
<file>assets/images/video_call_accept_hovered.svg</file>
<file>assets/images/video_call_accept_normal.svg</file>
<file>assets/images/video_call_accept_pressed.svg</file>
......
linphone-desktop/src/app/App.cpp
View file @ 7bbd11b6
......@@ -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());
......
linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
View file @ 7bbd11b6
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml
View file @ 7bbd11b6
......@@ -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
......
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
View file @ 7bbd11b6
......@@ -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)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023