mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove ImageProvider[ci skip]

Browse source
This commit is contained in:
Julien Wadel 2020-06-11 16:55:22 +02:00
parent 044f428f0a
commit 2bcdc4e99a
7 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linphone-app/src/app/providers/AvatarProvider.cpp
View file

@ -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;*/
}

3
linphone-app/src/app/providers/ExternalImageProvider.cpp
View file

@ -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;*/
}

8
linphone-app/src/app/providers/ImageProvider.cpp
View file

@ -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;*/
}

1
linphone-app/src/app/providers/ImageProvider.hpp
View file

@ -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;
};

3
linphone-app/src/app/providers/ThumbnailProvider.cpp
View file

@ -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;*/
}

4
linphone-app/ui/modules/Common/Image/Icon.qml
View file

@ -13,6 +13,10 @@ Item {
height: iconSize
width: iconSize
Rectangle{
anchors.fill:parent
color:'#AA555555'
}
Image {
function getIconSize () {

2
linphone-app/ui/modules/Common/Image/RoundedImage.qml
View file

@ -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