diff --git a/linphone-app/src/app/providers/AvatarProvider.cpp b/linphone-app/src/app/providers/AvatarProvider.cpp index 1be0306a7..fe93ba2be 100644 --- a/linphone-app/src/app/providers/AvatarProvider.cpp +++ b/linphone-app/src/app/providers/AvatarProvider.cpp @@ -37,5 +37,6 @@ AvatarProvider::AvatarProvider () : QQuickImageProvider( QImage AvatarProvider::requestImage (const QString &id, QSize *size, const QSize &) { QImage image(mAvatarsPath + id); *size = image.size(); - return image; + return QImage();/* + return image;*/ } diff --git a/linphone-app/src/app/providers/ExternalImageProvider.cpp b/linphone-app/src/app/providers/ExternalImageProvider.cpp index 76961e61c..fe6084321 100644 --- a/linphone-app/src/app/providers/ExternalImageProvider.cpp +++ b/linphone-app/src/app/providers/ExternalImageProvider.cpp @@ -44,6 +44,7 @@ QImage ExternalImageProvider::requestImage (const QString &id, QSize *size, cons if(!format.isEmpty()) image = QImage(id, format); } + return QImage();/* *size = image.size(); - return image; + return image;*/ } diff --git a/linphone-app/src/app/providers/ImageProvider.cpp b/linphone-app/src/app/providers/ImageProvider.cpp index 73db5e7e7..5928c49ac 100644 --- a/linphone-app/src/app/providers/ImageProvider.cpp +++ b/linphone-app/src/app/providers/ImageProvider.cpp @@ -288,6 +288,8 @@ QImage ImageProvider::requestImage (const QString &id, QSize *size, const QSize .arg(path); return QImage(); // Memory cannot be allocated. } + return QImage(); + /* image.fill(Qt::transparent);// Fill with transparent to set alpha channel *size = image.size(); @@ -298,9 +300,5 @@ QImage ImageProvider::requestImage (const QString &id, QSize *size, const QSize // qDebug() << QStringLiteral("Image `%1` loaded in %2 milliseconds.").arg(path).arg(timer.elapsed()); - return image; -} - -QPixmap ImageProvider::requestPixmap (const QString &id, QSize *size, const QSize &requestedSize) { - return QPixmap::fromImage(requestImage(id, size, requestedSize)); + return image;*/ } diff --git a/linphone-app/src/app/providers/ImageProvider.hpp b/linphone-app/src/app/providers/ImageProvider.hpp index 05d3af083..76360ac8c 100644 --- a/linphone-app/src/app/providers/ImageProvider.hpp +++ b/linphone-app/src/app/providers/ImageProvider.hpp @@ -30,7 +30,6 @@ public: ImageProvider (); QImage requestImage (const QString &id, QSize *size, const QSize &requestedSize) override; - QPixmap requestPixmap (const QString &id, QSize *size, const QSize &requestedSize) override; static const QString ProviderId; }; diff --git a/linphone-app/src/app/providers/ThumbnailProvider.cpp b/linphone-app/src/app/providers/ThumbnailProvider.cpp index ffe62e13b..e818c6e92 100644 --- a/linphone-app/src/app/providers/ThumbnailProvider.cpp +++ b/linphone-app/src/app/providers/ThumbnailProvider.cpp @@ -37,5 +37,6 @@ ThumbnailProvider::ThumbnailProvider () : QQuickImageProvider( QImage ThumbnailProvider::requestImage (const QString &id, QSize *size, const QSize &) { QImage image(mThumbnailsPath + id); *size = image.size(); - return image; + return QImage();/* + return image;*/ } diff --git a/linphone-app/ui/modules/Common/Image/Icon.qml b/linphone-app/ui/modules/Common/Image/Icon.qml index fdc6c5e5e..04212393f 100644 --- a/linphone-app/ui/modules/Common/Image/Icon.qml +++ b/linphone-app/ui/modules/Common/Image/Icon.qml @@ -13,6 +13,10 @@ Item { height: iconSize width: iconSize + Rectangle{ + anchors.fill:parent + color:'#AA555555' + } Image { function getIconSize () { diff --git a/linphone-app/ui/modules/Common/Image/RoundedImage.qml b/linphone-app/ui/modules/Common/Image/RoundedImage.qml index 4e73b2b55..e5fb1b726 100644 --- a/linphone-app/ui/modules/Common/Image/RoundedImage.qml +++ b/linphone-app/ui/modules/Common/Image/RoundedImage.qml @@ -6,7 +6,7 @@ Item { id: item property alias source: image.source - property color backgroundColor: '#00000000' + property color backgroundColor: '#AA555555' property color foregroundColor: '#00000000' readonly property alias status: image.status