mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display image for sharedWithMe share owner in share view

Browse Source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-10-21 01:49:09 +08:00
parent 97ae48e17d
commit f0e88c769e
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/filedetails/ShareView.qml
View File

@ -139,19 +139,29 @@ ColumnLayout {
}
}
Column {
RowLayout {
Layout.fillWidth: true
Layout.leftMargin: root.horizontalPadding
Layout.rightMargin: root.horizontalPadding
EnforcedPlainTextLabel {
visible: shareModel.displayShareOwner
text: qsTr("Shared with you by %1").arg(shareModel.shareOwnerDisplayName)
font.bold: true
Image {
Layout.preferredWidth: 32
Layout.preferredHeight: 32
source: shareModel.shareOwnerAvatar
}
EnforcedPlainTextLabel {
visible: shareModel.sharedWithMeExpires
text: qsTr("Expires in %1").arg(shareModel.sharedWithMeRemainingTimeString)
ColumnLayout {
EnforcedPlainTextLabel {
Layout.fillWidth: true
visible: shareModel.displayShareOwner
text: qsTr("Shared with you by %1").arg(shareModel.shareOwnerDisplayName)
font.bold: true
}
EnforcedPlainTextLabel {
Layout.fillWidth: true
visible: shareModel.sharedWithMeExpires
text: qsTr("Expires in %1").arg(shareModel.sharedWithMeRemainingTimeString)
}
}
visible: shareModel.displayShareOwner

4
src/gui/tray/usermodel.cpp
View File

@ -1682,7 +1682,7 @@ private:
QQuickImageResponse *ImageProvider::requestImageResponse(const QString &id, const QSize &requestedSize)
{
const auto response = new class ImageResponse(id, requestedSize, &pool);
const auto response = new class ImageResponse(id, requestedSize, &_pool);
return response;
}
@ -1763,5 +1763,3 @@ QHash<int, QByteArray> UserAppsModel::roleNames() const
}
}
#include "usermodel.moc"

3
src/gui/tray/usermodel.h
View File

@ -283,6 +283,9 @@ class ImageProvider : public QQuickAsyncImageProvider
public:
ImageProvider() = default;
QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) override;
private:
QThreadPool _pool;
};
class UserAppsModel : public QAbstractListModel