Display image for sharedWithMe share owner in share view

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml
index 550bcc67a0cb11562366c081b1b3d0d501c6b03d..51bbb891a88974fc87a41d5f39651022f0aa4da9 100644 (file)
--- a/src/gui/filedetails/ShareView.qml
+++ b/src/gui/filedetails/ShareView.qml
@@ -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

diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index 5c493f8138c4e4927f69c8c9a644a1986712baf3..34be0660e42e30bbaaf48bffded015e18fbb464a 100644 (file)
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -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"
-

diff --git a/src/gui/tray/usermodel.h b/src/gui/tray/usermodel.h
index 73227168062f2e089af50a7e01c8bb1514c39014..3f2170ab0748eced506a9b0d1761e560326f7c56 100644 (file)
--- a/src/gui/tray/usermodel.h
+++ b/src/gui/tray/usermodel.h
@@ -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