mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-31 19:09:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify image provider and remove useless bottleneck steps.

Browse source 
Add pagination on details call logs.
This commit is contained in:
Julien Wadel 2024-10-16 16:06:58 +02:00
parent 3589029ec5
commit 9454aa3781
2 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Linphone/tool/providers/ImageProvider.cpp
View file

@ -42,43 +42,47 @@ using namespace std;
const QString ImageProvider::ProviderId = "internal";
ImageAsyncImageResponse::ImageAsyncImageResponse(const QString &id, const QSize &requestedSize) {
QString path = ":/data/image/";
QStringList filters;
filters << "*.svg";
filters << "*.png";
QDir imageDir(path);
if (!imageDir.exists()) {
lDebug() << QStringLiteral("[ImageProvider] Dir doesn't exist: `%1`.").arg(path);
emit imageGrabbed(QImage(":/data/image/warning-circle.svg"));
return;
}
QFileInfoList files = QDir(path).entryInfoList(filters, QDir::Files, QDir::Name);
QFileInfo fileInfo;
for (QFileInfo file : files) {
if (file.fileName() == id) {
fileInfo = file;
mPath = file.absoluteFilePath();
break;
}
}
// Snippet for external images (useful for Chats). Do not use it for internal because of performance issue.
// QStringList filters;
// filters << "*.svg";
// filters << "*.png";
// filters << id;// Use it if we don't need wildcards.
// QDir imageDir(path);
// if (!imageDir.exists()) {
// lDebug() << QStringLiteral("[ImageProvider] Dir doesn't exist: `%1`.").arg(path);
// imageGrabbed(QImage(":/data/image/warning-circle.svg"));
// return;
// }
// elapsedTimes.push_back(benchmark.restart());
// QFileInfoList files = QDir(path).entryInfoList(filters, QDir::Files, QDir::Name);
// QFileInfo fileInfo;
// for (QFileInfo file : files) {
// if (file.fileName() == id) {
// fileInfo = file;
// mPath = file.absoluteFilePath();
// break;
// }
// }
// elapsedTimes.push_back(benchmark.restart());
mPath = path + id;
QFile file(mPath);
QFileInfo fileInfo(file);
if (!file.exists()) {
lDebug() << QStringLiteral("[ImageProvider] File doesn't exist: `%1`.").arg(path + id);
emit imageGrabbed(QImage(":/data/image/warning-circle.svg"));
imageGrabbed(QImage(":/data/image/warning-circle.svg"));
return;
}
if (Q_UNLIKELY(!file.open(QIODevice::ReadOnly))) {
qWarning() << QStringLiteral("[ImageProvider] Unable to open file: `%1`.").arg(path);
emit imageGrabbed(QImage(":/data/image/warning-circle.svg"));
imageGrabbed(QImage(":/data/image/warning-circle.svg"));
return;
}
QImage image;
if (fileInfo.suffix() == "svg") {
QSvgRenderer renderer(mPath);
if (Q_UNLIKELY(!renderer.isValid())) {
@ -102,9 +106,8 @@ ImageAsyncImageResponse::ImageAsyncImageResponse(const QString &id, const QSize
}
}
} else image = QImage(mPath);
if (!image.isNull()) emit imageGrabbed(image);
else emit imageGrabbed(QImage(":/data/image/warning-circle.svg"));
if (!image.isNull()) imageGrabbed(image);
else imageGrabbed(QImage(":/data/image/warning-circle.svg"));
}
void ImageAsyncImageResponse::imageGrabbed(QImage image) {

6
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -748,9 +748,13 @@ AbstractMainPage {
clip: true
model: CallHistoryProxy {
id: detailsHistoryProxy
filterText: mainItem.selectedRowHistoryGui ? mainItem.selectedRowHistoryGui.core.remoteAddress : ""
onFilterTextChanged: maxDisplayItems = initialDisplayItems
initialDisplayItems: detailListView.height / (56 * DefaultStyle.dp) + 5
displayItemsStep: initialDisplayItems / 2
}
onAtYEndChanged: if(atYEnd) detailsHistoryProxy.displayMore()
delegate: Item {
width:detailListView.width
height: 56 * DefaultStyle.dp