From e90aecbeadc8ce419ee38a69a38a117743624257 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Mon, 31 Jul 2023 20:52:48 +0200 Subject: [PATCH] Port UserDetailDialog to Kirigami.Dialog --- src/CMakeLists.txt | 1 - src/qml/Dialog/UserDetailDialog.qml | 10 ++++------ src/res.qrc | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7b37b1e82..8b9cde1f9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,6 @@ configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml) configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml) -configure_file(qml/Dialog/UserDetailDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/UserDetailDialog.qml) configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml) configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml) configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml) diff --git a/src/qml/Dialog/UserDetailDialog.qml b/src/qml/Dialog/UserDetailDialog.qml index 7303cd05e..2ad77925d 100644 --- a/src/qml/Dialog/UserDetailDialog.qml +++ b/src/qml/Dialog/UserDetailDialog.qml @@ -11,7 +11,7 @@ import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents import org.kde.neochat 1.0 -Kirigami.OverlaySheet { +Kirigami.Dialog { id: root signal closed() @@ -26,6 +26,9 @@ Kirigami.OverlaySheet { topPadding: 0 bottomPadding: 0 + standardButtons: Kirigami.Dialog.NoButton + + width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24) title: i18nc("@title:menu Account detail dialog", "Account detail") contentItem: ColumnLayout { @@ -196,10 +199,5 @@ Kirigami.OverlaySheet { } } } - @OVERLAYSHEET_OPEN@: { - if (!sheetOpen) { - closed() - } - } } diff --git a/src/res.qrc b/src/res.qrc index 460a159a1..a921320fc 100644 --- a/src/res.qrc +++ b/src/res.qrc @@ -74,7 +74,7 @@ qml/Panel/RoomDrawer.qml qml/Panel/DirectChatDrawerHeader.qml qml/Panel/GroupChatDrawerHeader.qml - @CMAKE_CURRENT_BINARY_DIR@/qml/Dialog/UserDetailDialog.qml + qml/Dialog/UserDetailDialog.qml qml/Dialog/CreateRoomDialog.qml qml/Dialog/CreateSpaceDialog.qml qml/Dialog/EmojiDialog.qml