Skip to content

L
linphone-desktop
Commit 63ea842f authored by Ronan Abhamon's avatar Ronan Abhamon
Browse files
Options

feat(Notifications): REEEEEEFACTORING. (And supports snapshot notification.)

parent ed53593e
Show whitespace changes
Inline Side-by-side
Showing with 299 additions and 268 deletions
assets/images/snapshot_sign.svg 0 → 100644
View file @ 63ea842f
<?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 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>download_ended</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="download_ended">
<polygon id="call_pausing_sign" fill="#4B5964" points="0 0 40 0 0 40"></polygon>
<path d="M15.8862711,16.7118816 C15.8848622,18.47124 14.366077,19.9160243 12.4971822,19.9365977 C10.627583,19.9538529 9.11372887,18.5402605 9.1158422,16.7815657 L9.1158422,7.21360248 C9.1158422,6.03892711 10.1302442,5.0752951 11.3771133,5.06334925 C12.6225736,5.05007608 13.6292267,5.9911437 13.6292267,7.16648273 L13.6292267,16.7351096 C13.6292267,17.3224473 13.1206168,17.8022723 12.4978867,17.8095726 C11.8751565,17.8162091 11.3735911,17.3456753 11.3721822,16.7570103 L11.3721822,8.2535552 L10.24366,8.26417373 L10.24366,16.7682925 C10.24366,17.9429679 11.2524264,18.8846992 12.5,18.8727533 C13.7447558,18.8594801 14.75634,17.8978391 14.7577489,16.7244911 L14.7577489,7.15520054 C14.7598622,5.39584211 13.2460081,3.98224971 11.3757044,4.00016849 C9.50751409,4.02007824 8.00281778,5.46287161 8,7.2228937 L8,17.3231109 C8.27402943,19.4169532 10.1957577,21.0216792 12.4950689,20.9997785 C14.7971979,20.9752231 16.7217439,19.3333322 17,17.2321897 L17,6.07741929 L15.8862711,6.07741929 L15.8862711,16.7118816 Z" id="attachment_default" fill="#FFFFFF" transform="translate(12.500000, 12.500000) rotate(-315.000000) translate(-12.500000, -12.500000) "></path>
</g>
</g>
</svg>
\ No newline at end of file
resources.qrc
View file @ 63ea842f
......@@ -170,6 +170,7 @@
<file>assets/images/settings_sip_accounts_selected.svg</file>
<file>assets/images/settings_video_normal.svg</file>
<file>assets/images/settings_video_selected.svg</file>
<file>assets/images/snapshot_sign.svg</file>
<file>assets/images/speaker_off_hovered.svg</file>
<file>assets/images/speaker_off_normal.svg</file>
<file>assets/images/speaker_off_pressed.svg</file>
......@@ -326,11 +327,13 @@
<file>ui/modules/Linphone/Contact/Contact.qml</file>
<file>ui/modules/Linphone/Contact/MessagesCounter.qml</file>
<file>ui/modules/Linphone/Menus/SipAddressesMenu.qml</file>
<file>ui/modules/Linphone/Notifications/NotificationBasic.qml</file>
<file>ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml</file>
<file>ui/modules/Linphone/Notifications/Notification.qml</file>
<file>ui/modules/Linphone/Notifications/NotificationReceivedCall.qml</file>
<file>ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml</file>
<file>ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml</file>
<file>ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml</file>
<file>ui/modules/Linphone/Presence/PresenceLevel.qml</file>
<file>ui/modules/Linphone/qmldir</file>
<file>ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml</file>
......@@ -348,10 +351,11 @@
<file>ui/modules/Linphone/Styles/Contact/ContactStyle.qml</file>
<file>ui/modules/Linphone/Styles/Contact/MessagesCounterStyle.qml</file>
<file>ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml</file>
<file>ui/modules/Linphone/Styles/Notifications/NotificationNewVersionAvailableStyle.qml</file>
<file>ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml</file>
<file>ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml</file>
<file>ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml</file>
<file>ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml</file>
<file>ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml</file>
<file>ui/modules/Linphone/Styles/qmldir</file>
<file>ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml</file>
<file>ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml</file>
......
src/components/call/CallModel.cpp
View file @ 63ea842f
......@@ -185,11 +185,9 @@ void CallModel::takeSnapshot () {
qInfo() << QStringLiteral("Take snapshot of call:") << this;
mCall->takeVideoSnapshot(
::Utils::appStringToCoreString(
CoreManager::getInstance()->getSettingsModel()->getSavedScreenshotsFolder() + newName
)
);
const QString filePath = CoreManager::getInstance()->getSettingsModel()->getSavedScreenshotsFolder() + newName;
mCall->takeVideoSnapshot(::Utils::appStringToCoreString(filePath));
App::getInstance()->getNotifier()->notifySnapshotWasTaken(filePath);
}
void CallModel::startRecording () {
......
src/components/notifier/Notifier.cpp
View file @ 63ea842f
......@@ -75,30 +75,27 @@ void setProperty (QObject &object, const char *property, const T &value) {
// =============================================================================
const QHash<int, Notifier::Notification> Notifier::mNotifications = {
{ Notifier::ReceivedMessage, { "NotificationReceivedMessage.qml", 10000 } },
{ Notifier::ReceivedFileMessage, { "NotificationReceivedFileMessage.qml", 10000 } },
{ Notifier::ReceivedCall, { "NotificationReceivedCall.qml", 30000 } },
{ Notifier::NewVersionAvailable, { "NotificationNewVersionAvailable.qml", 30000 } }
{ Notifier::ReceivedMessage, { "NotificationReceivedMessage.qml", 10 } },
{ Notifier::ReceivedFileMessage, { "NotificationReceivedFileMessage.qml", 10 } },
{ Notifier::ReceivedCall, { "NotificationReceivedCall.qml", 30 } },
{ Notifier::NewVersionAvailable, { "NotificationNewVersionAvailable.qml", 30 } },
{ Notifier::SnapshotWasTaken, { "NotificationSnapshotWasTaken.qml", 10 } }
};
// -----------------------------------------------------------------------------
Notifier::Notifier (QObject *parent) : QObject(parent) {
// Build components.
const int nComponents = mNotifications.size();
mComponents = new QQmlComponent *[nComponents];
QQmlEngine *engine = App::getInstance()->getEngine();
for (const auto &key : mNotifications.keys())
mComponents[key] = new QQmlComponent(engine, QUrl(NOTIFICATIONS_PATH + Notifier::mNotifications[key].filename));
// Check errors.
for (int i = 0; i < nComponents; ++i) {
QQmlComponent *component = mComponents[i];
if (component->isError()) {
qWarning() << QStringLiteral("Errors found in `Notification` component %1:").arg(i) << component->errors();
for (const auto &key : mNotifications.keys()) {
QQmlComponent *component = new QQmlComponent(engine, QUrl(NOTIFICATIONS_PATH + Notifier::mNotifications[key].filename));
if (Q_UNLIKELY(component->isError())) {
qWarning() << QStringLiteral("Errors found in `Notification` component %1:").arg(key) << component->errors();
abort();
}
mComponents[key] = component;
}
mMutex = new QMutex();
......@@ -217,7 +214,7 @@ void Notifier::deleteNotification (QVariant notification) {
QObject * notification = createNotification(TYPE); \
if (!notification) \
return; \
const int timeout = mNotifications[TYPE].timeout;
const int timeout = mNotifications[TYPE].timeout * 1000;
#define SHOW_NOTIFICATION(DATA) \
::setProperty(*notification, NOTIFICATION_PROPERTY_DATA, DATA); \
......@@ -277,5 +274,14 @@ void Notifier::notifyNewVersionAvailable (const QString &version, const QString
SHOW_NOTIFICATION(map);
}
void Notifier::notifySnapshotWasTaken (const QString &filePath) {
CREATE_NOTIFICATION(Notifier::SnapshotWasTaken);
QVariantMap map;
map["filePath"] = filePath;
SHOW_NOTIFICATION(map);
}
#undef SHOW_NOTIFICATION
#undef CREATE_NOTIFICATION
src/components/notifier/Notifier.hpp
View file @ 63ea842f
......@@ -42,13 +42,15 @@ public:
ReceivedMessage,
ReceivedFileMessage,
ReceivedCall,
NewVersionAvailable
NewVersionAvailable,
SnapshotWasTaken
};
void notifyReceivedMessage (const std::shared_ptr<linphone::ChatMessage> &message);
void notifyReceivedFileMessage (const std::shared_ptr<linphone::ChatMessage> &message);
void notifyReceivedCall (const std::shared_ptr<linphone::Call> &call);
void notifyNewVersionAvailable (const QString &version, const QString &url);
void notifySnapshotWasTaken (const QString &filePath);
public slots:
void deleteNotification (QVariant notification);
......
ui/modules/Linphone/Notifications/Notification.qml
View file @ 63ea842f
import QtQuick 2.7
import Common 1.0
import Linphone.Styles 1.0
// =============================================================================
DesktopPopup {
id: notification
property alias icon: iconSign.icon
property var notificationData: ({})
property int overrodeHeight
default property alias _content: content.data
signal deleteNotification (var notification)
......@@ -23,4 +27,32 @@ DesktopPopup {
return (Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint) |
(Qt.platform.os === 'osx' ? Qt.Window : Qt.Popup)
}
Rectangle {
color: NotificationStyle.color
height: overrodeHeight || NotificationStyle.height
width: NotificationStyle.width
border {
color: NotificationStyle.border.color
width: NotificationStyle.border.width
}
Item {
id: content
anchors.fill: parent
}
Icon {
id: iconSign
anchors {
left: parent.left
top: parent.top
}
iconSize: NotificationStyle.iconSize
}
}
}
ui/modules/Linphone/Notifications/NotificationBasic.qml 0 → 100644
View file @ 63ea842f
import QtQuick 2.7
import Common 1.0
import Linphone.Styles 1.0
// =============================================================================
Notification {
id: notification
property string message
property var handler: (function () {})
overrodeHeight: NotificationBasicStyle.overrodeHeight
// ---------------------------------------------------------------------------
Loader {
active: Boolean(notification.message)
anchors {
fill: parent
leftMargin: NotificationBasicStyle.leftMargin
rightMargin: NotificationBasicStyle.rightMargin
}
sourceComponent: Text {
anchors.fill: parent
color: NotificationBasicStyle.message.color
font.pointSize: NotificationBasicStyle.message.pointSize
text: notification.message
verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap
MouseArea {
anchors.fill: parent
cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
hoverEnabled: true
onClicked: notification._close(notification.handler)
}
}
}
}
ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml
View file @ 63ea842f
import QtQuick 2.7
import QtQuick.Layouts 1.3
import Common 1.0
import Linphone 1.0
import Linphone.Styles 1.0
import Utils 1.0
// =============================================================================
Notification {
id: notification
// ---------------------------------------------------------------------------
Rectangle {
color: NotificationNewVersionAvailableStyle.color
height: NotificationNewVersionAvailableStyle.height
width: NotificationNewVersionAvailableStyle.width
Icon {
anchors {
left: parent.left
top: parent.top
}
NotificationBasic {
icon: 'update_sign'
iconSize: NotificationNewVersionAvailableStyle.iconSize
}
Loader {
active: notificationData.url.length > 0
anchors {
fill: parent
leftMargin: NotificationNewVersionAvailableStyle.leftMargin
rightMargin: NotificationNewVersionAvailableStyle.rightMargin
}
sourceComponent: Text {
anchors.fill: parent
color: NotificationNewVersionAvailableStyle.message.color
font.pointSize: NotificationNewVersionAvailableStyle.message.pointSize
text: notificationData.message
verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap
MouseArea {
anchors.fill: parent
cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
hoverEnabled: true
onClicked: notification._close(function () {
message: notificationData.url
handler: (function () {
Qt.openUrlExternally(notificationData.url)
})
}
}
}
}
}
ui/modules/Linphone/Notifications/NotificationReceivedCall.qml
View file @ 63ea842f
......@@ -10,29 +10,16 @@ import Linphone.Styles 1.0
Notification {
id: notification
// ---------------------------------------------------------------------------
property var _call: notificationData && notificationData.call
icon: 'call_sign_incoming'
// ---------------------------------------------------------------------------
Rectangle {
color: NotificationReceivedCallStyle.color
height: NotificationReceivedCallStyle.height
width: NotificationReceivedCallStyle.width
Icon {
anchors {
left: parent.left
top: parent.top
}
readonly property var call: notificationData && notificationData.call
icon: 'call_sign_incoming'
iconSize: NotificationReceivedCallStyle.iconSize
}
// ---------------------------------------------------------------------------
Loader {
active: Boolean(notification._call)
active: Boolean(notification.call)
anchors {
fill: parent
......@@ -48,7 +35,7 @@ Notification {
Layout.fillWidth: true
entry: {
var call = notification._call
var call = notification.call
return SipAddressesModel.getSipAddressObserver(call ? call.sipAddress : '')
}
}
......@@ -68,13 +55,13 @@ Notification {
ActionButton {
icon: 'video_call_accept'
onClicked: notification._close(notification._call.acceptWithVideo)
onClicked: notification._close(notification.call.acceptWithVideo)
}
ActionButton {
icon: 'call_accept'
onClicked: notification._close(notification._call.accept)
onClicked: notification._close(notification.call.accept)
}
}
......@@ -89,8 +76,7 @@ Notification {
ActionButton {
icon: 'hangup'
onClicked: notification._close(notification._call.terminate)
}
onClicked: notification._close(notification.call.terminate)
}
}
}
......
ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
View file @ 63ea842f
......@@ -2,7 +2,6 @@ import QtQuick 2.7
import QtQuick.Layouts 1.3
import Common 1.0
import Linphone 1.0
import Linphone.Styles 1.0
import Utils 1.0
......@@ -11,29 +10,17 @@ import Utils 1.0
Notification {
id: notification
// ---------------------------------------------------------------------------
property string _fileUri: notificationData && notificationData.fileUri || ''
icon: 'file_sign'
overrodeHeight: NotificationReceivedFileMessageStyle.overrodeHeight
// ---------------------------------------------------------------------------
Rectangle {
color: NotificationReceivedFileMessageStyle.color
height: NotificationReceivedFileMessageStyle.height
width: NotificationReceivedFileMessageStyle.width
Icon {
anchors {
left: parent.left
top: parent.top
}
readonly property string fileUri: notificationData && notificationData.fileUri || ''
icon: 'file_sign'
iconSize: NotificationReceivedFileMessageStyle.iconSize
}
// ---------------------------------------------------------------------------
Loader {
active: notification._fileUri.length > 0
active: Boolean(notification.fileUri)
anchors {
fill: parent
......@@ -51,7 +38,7 @@ Notification {
color: NotificationReceivedFileMessageStyle.fileName.color
elide: Text.ElideRight
font.pointSize: NotificationReceivedFileMessageStyle.fileName.pointSize
text: Utils.basename(notification._fileUri)
text: Utils.basename(notification.fileUri)
}
Text {
......@@ -71,12 +58,11 @@ Notification {
hoverEnabled: true
onClicked: notification._close(function () {
var uri = Utils.getUriFromSystemPath(notification._fileUri)
var uri = Utils.getUriFromSystemPath(notification.fileUri)
if (!Qt.openUrlExternally(uri)) {
Qt.openUrlExternally(Utils.dirname(uri))
}
})
}
}
}
}
ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
View file @ 63ea842f
......@@ -10,29 +10,16 @@ import Linphone.Styles 1.0
Notification {
id: notification
// ---------------------------------------------------------------------------
property string _sipAddress: notificationData && notificationData.sipAddress || ''
icon: 'message_sign'
// ---------------------------------------------------------------------------
Rectangle {
color: NotificationReceivedMessageStyle.color
height: NotificationReceivedMessageStyle.height
width: NotificationReceivedMessageStyle.width
readonly property string sipAddress: notificationData && notificationData.sipAddress || ''
Icon {
anchors {
left: parent.left
top: parent.top
}
icon: 'message_sign'
iconSize: NotificationReceivedMessageStyle.iconSize
}
// ---------------------------------------------------------------------------
Loader {
active: notification._sipAddress.length > 0
active: Boolean(notification.sipAddress)
anchors {
fill: parent
......@@ -47,7 +34,7 @@ Notification {
Contact {
Layout.fillWidth: true
entry: SipAddressesModel.getSipAddressObserver(notification._sipAddress)
entry: SipAddressesModel.getSipAddressObserver(notification.sipAddress)
}
Rectangle {
......@@ -86,9 +73,8 @@ Notification {
onClicked: notification._close(function () {
notification.notificationData.window.setView('Conversation', {
sipAddress: notification._sipAddress
sipAddress: notification.sipAddress
})
})
}
}
}
ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml 0 → 100644
View file @ 63ea842f
import Utils 1.0
// =============================================================================
NotificationBasic {
icon: 'snapshot_sign'
message: notificationData.filePath
handler: (function () {
Qt.openUrlExternally(Utils.dirname(
Utils.getUriFromSystemPath(notificationData.filePath)
))
})
}
ui/modules/Linphone/Styles/Notifications/NotificationNewVersionAvailableStyle.qml → ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml
View file @ 63ea842f
......@@ -7,12 +7,9 @@ import Units 1.0
// =============================================================================
QtObject {
property color color: Colors.k
property int height: 55
property int iconSize: 40
property int leftMargin: 30
property int rightMargin: 15
property int width: 300
property int overrodeHeight: 55
property QtObject message: QtObject {
property color color: Colors.h
......
ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml
View file @ 63ea842f
pragma Singleton
import QtQml 2.2
import Colors 1.0
// =============================================================================
QtObject {
property color color: Colors.k
property int height: 120
property int iconSize: 40
property int spacing: 0
property int width: 300
property int bottomMargin: 15
property int leftMargin: 15
property int rightMargin: 15
......
ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml
View file @ 63ea842f
......@@ -8,12 +8,10 @@ import Units 1.0
QtObject {
property color color: Colors.k
property int height: 55
property int iconSize: 40
property int leftMargin: 25
property int overrodeHeight: 55
property int rightMargin: 15
property int spacing: 10
property int width: 300
property QtObject fileName: QtObject {
property color color: Colors.h
......
ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml
View file @ 63ea842f
......@@ -9,12 +9,10 @@ import Units 1.0
QtObject {
property color color: Colors.k
property int bottomMargin: 15
property int iconSize: 40
property int leftMargin: 15
property int overrodeHeight: 55
property int rightMargin: 15
property int spacing: 0
property int width: 300
property int height: 120
property QtObject messageContainer: QtObject {
property color color: Colors.m
......
ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml 0 → 100644
View file @ 63ea842f
pragma Singleton
import QtQml 2.2
import Colors 1.0
// =============================================================================
QtObject {
property color color: Colors.k
property int height: 120
property int iconSize: 40
property int width: 300
property QtObject border: QtObject {
property color color: Colors.w
property int width: 1
}
}
ui/modules/Linphone/Styles/qmldir
View file @ 63ea842f
......@@ -25,10 +25,11 @@ singleton MessagesCounterStyle 1.0 Contact/MessagesCounterStyle.
singleton SipAddressesMenuStyle 1.0 Menus/SipAddressesMenuStyle.qml
singleton NotificationNewVersionAvailableStyle 1.0 Notifications/NotificationNewVersionAvailableStyle.qml
singleton NotificationBasicStyle 1.0 Notifications/NotificationBasicStyle.qml
singleton NotificationReceivedCallStyle 1.0 Notifications/NotificationReceivedCallStyle.qml
singleton NotificationReceivedMessageStyle 1.0 Notifications/NotificationReceivedMessageStyle.qml
singleton NotificationReceivedFileMessageStyle 1.0 Notifications/NotificationReceivedFileMessageStyle.qml
singleton NotificationReceivedMessageStyle 1.0 Notifications/NotificationReceivedMessageStyle.qml
singleton NotificationStyle 1.0 Notifications/NotificationStyle.qml
singleton TelKeypadStyle 1.0 TelKeypad/TelKeypadStyle.qml
......
ui/scripts/Utils/utils.js
View file @ 63ea842f
......@@ -287,6 +287,10 @@ function assert (condition, message) {
// -----------------------------------------------------------------------------
function basename (str) {
if (!str) {
return ''
}
if (runOnWindows()) {
str = str.replace(/\\/g, '/')
}
......@@ -310,6 +314,10 @@ function capitalizeFirstLetter (str) {
// -----------------------------------------------------------------------------
function dirname (str) {
if (!str) {
return ''
}
if (runOnWindows()) {
str = str.replace(/\\/g, '/')
}
......
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