Page MenuHomePhorge
Files F29580

D47.1726851539.diff
No OneTemporary
Actions

D47.1726851539.diff
View Options

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,7 @@
Multimedia Test Network QuickTest
)
find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 Config KIO Notifications)
+find_package(KF${KF_MAJOR_VERSION}KirigamiAddons REQUIRED)
find_package(Threads REQUIRED)
find_package(nlohmann_json REQUIRED)
diff --git a/packaging/GNU-Linux/appimage/build.sh b/packaging/GNU-Linux/appimage/build.sh
--- a/packaging/GNU-Linux/appimage/build.sh
+++ b/packaging/GNU-Linux/appimage/build.sh
@@ -19,7 +19,7 @@
libqt5svg5-dev qtquickcontrols2-5-dev qml-module-qtquick-layouts qml-module-qtquick-controls2 \
qml-module-qtquick-controls qml-module-qt-labs-qmlmodels kirigami2-dev libkf5config-dev wget libqt5multimedia5-plugins \
qt5-gtk-platformtheme plasma-integration libkf5kio-dev g++-10 weston dbus-x11 qml-module-qttest qml-module-qt-labs-platform \
- libkf5notifications-dev qml-module-qtquick-dialogs qml-module-org-kde-notification libcmark-dev
+ libkf5notifications-dev qml-module-qtquick-dialogs qml-module-org-kde-notification libcmark-dev qml-module-org-kde-kirigami-addons-components kirigami-addons-dev
# Actual build
mkdir -pv /run/user/test
diff --git a/src/contents/ui/EventReadIndicator.qml b/src/contents/ui/EventReadIndicator.qml
--- a/src/contents/ui/EventReadIndicator.qml
+++ b/src/contents/ui/EventReadIndicator.qml
@@ -9,7 +9,7 @@
import QtQuick.Controls 2.15
import org.kde.kirigami 2.13 as Kirigami
-
+import org.kde.kirigamiaddons.components 1.0 as KAC
import '.' as Kazv
import 'matrix-helpers.js' as Helpers
@@ -33,7 +33,7 @@
Repeater {
model: readIndicator.actualItems
- Kirigami.Avatar {
+ KAC.Avatar {
objectName: `readIndicatorAvatar${index}`
property var member: readIndicator.model.at(index)
property var nameProvider: Kazv.UserNameProvider {
@@ -80,7 +80,7 @@
RowLayout {
id: itemLayout
anchors.fill: parent
- Kirigami.Avatar {
+ KAC.Avatar {
objectName: `readIndicatorAvatar${index}`
Layout.preferredWidth: readIndicator.avatarSize
Layout.preferredHeight: readIndicator.avatarSize
diff --git a/src/contents/ui/RoomListViewItemDelegate.qml b/src/contents/ui/RoomListViewItemDelegate.qml
--- a/src/contents/ui/RoomListViewItemDelegate.qml
+++ b/src/contents/ui/RoomListViewItemDelegate.qml
@@ -9,7 +9,7 @@
import QtQuick.Controls 2.15
import org.kde.kirigami 2.13 as Kirigami
-
+import org.kde.kirigamiaddons.components 1.0 as KAC
import moe.kazv.mxc.kazv 0.0 as MK
import 'matrix-helpers.js' as Helpers
@@ -41,7 +41,7 @@
Kirigami.Theme.inherit: false
RowLayout {
- Kirigami.Avatar {
+ KAC.Avatar {
sourceSize.width: iconSize
sourceSize.height: iconSize
source: item.roomOrHeroAvatarMxcUri ? matrixSdk.mxcUriToHttp(item.roomOrHeroAvatarMxcUri) : ''
diff --git a/src/contents/ui/RoomMemberListViewItemDelegate.qml b/src/contents/ui/RoomMemberListViewItemDelegate.qml
--- a/src/contents/ui/RoomMemberListViewItemDelegate.qml
+++ b/src/contents/ui/RoomMemberListViewItemDelegate.qml
@@ -9,6 +9,7 @@
import QtQuick.Controls 2.15
import org.kde.kirigami 2.13 as Kirigami
+import org.kde.kirigamiaddons.components 1.0 as KAC
import '.' as Kazv
@@ -22,7 +23,7 @@
property var iconSize
RowLayout {
- Kirigami.Avatar {
+ KAC.Avatar {
sourceSize.width: iconSize
sourceSize.height: iconSize
source: member.avatarMxcUri ? matrixSdk.mxcUriToHttp(member.avatarMxcUri) : ''
diff --git a/src/contents/ui/UserPage.qml b/src/contents/ui/UserPage.qml
--- a/src/contents/ui/UserPage.qml
+++ b/src/contents/ui/UserPage.qml
@@ -9,6 +9,7 @@
import QtQuick.Controls 2.15
import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.components 1.0 as KAC
import moe.kazv.mxc.kazv 0.0 as MK
import '.' as Kazv
@@ -138,7 +139,7 @@
}
ColumnLayout {
- Kirigami.Avatar {
+ KAC.Avatar {
id: avatar
objectName: 'avatar'
Layout.alignment: Qt.AlignHCenter
diff --git a/src/contents/ui/event-types/Simple.qml b/src/contents/ui/event-types/Simple.qml
--- a/src/contents/ui/event-types/Simple.qml
+++ b/src/contents/ui/event-types/Simple.qml
@@ -9,6 +9,7 @@
import QtQuick.Controls 2.15
import org.kde.kirigami 2.13 as Kirigami
+import org.kde.kirigamiaddons.components 1.0 as KAC
import '..' as Kazv
@@ -53,7 +54,7 @@
Layout.topMargin: shouldCollapseSender ? 0 : Kirigami.Units.largeSpacing
Layout.bottomMargin: 0
- Kirigami.Avatar {
+ KAC.Avatar {
id: avatar
objectName: 'senderAvatar'
Layout.alignment: Qt.AlignTop
@@ -83,7 +84,7 @@
RowLayout {
visible: !shouldCollapseSender
- Kirigami.Avatar {
+ KAC.Avatar {
id: avatarCompact
Layout.preferredWidth: Kirigami.Units.iconSizes.sizeForLabels
Layout.preferredHeight: Kirigami.Units.iconSizes.sizeForLabels
diff --git a/src/contents/ui/settings/ProfileSettings.qml b/src/contents/ui/settings/ProfileSettings.qml
--- a/src/contents/ui/settings/ProfileSettings.qml
+++ b/src/contents/ui/settings/ProfileSettings.qml
@@ -9,6 +9,7 @@
import QtQuick.Controls 2.15
import org.kde.kirigami 2.13 as Kirigami
+import org.kde.kirigamiaddons.components 1.0 as KAC
import '..' as Kazv
@@ -19,7 +20,7 @@
property var getSelfProfilePromise: undefined
property var loaded: false
- Kirigami.Avatar {
+ KAC.Avatar {
id: avatar
objectName: 'avatar'
Layout.alignment: Qt.AlignHCenter

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 20, 9:58 AM (15 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16514
Default Alt Text
D47.1726851539.diff (5 KB)

Event Timeline