Improve InviteUserPage

src/qml/InviteUserPage.qml

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
@@ -11,74 +13,43 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
 
-Kirigami.ScrollablePage {
+SearchPage {
     id: root
 
     property NeoChatRoom room
 
-    title: i18n("Invite a User")
+    title: i18nc("@title:dialog", "Invite a User")
 
-    actions: [
+    searchFieldPlaceholder: i18nc("@info:placeholder", "Find a user…")
-        Kirigami.Action {
+    noResultPlaceholderMessage: i18nc("@info:placeholder", "No users found")
-            icon.name: "dialog-close"
+
-            text: i18nc("@action", "Cancel")
+    headerTrailing: QQC2.Button {
-            onTriggered: root.closeDialog()
+        icon.name: "list-add"
+        display: QQC2.Button.IconOnly
+        enabled: root.model.searchText.match(/@(.+):(.+)/g) && !root.room.containsUser(root.model.searchText)
+
+        text: i18nc("@action:button", "Invite this User")
+
+        QQC2.ToolTip.visible: hovered
+        QQC2.ToolTip.text: root.room.containsUser(root.model.searchText) ? i18nc("@info:tooltip", "User is either already a member or has been invited") : text
+        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+
+        onClicked: root.room.inviteToRoom(root.model.searchText);
     }
-    ]
-    header: RowLayout {
-        Layout.fillWidth: true
-        Layout.margins: Kirigami.Units.largeSpacing
-
-        Kirigami.SearchField {
-            id: identifierField
-            property bool isUserId: text.match(/@(.+):(.+)/g)
-            Layout.fillWidth: true
-
-            placeholderText: i18n("Find a user...")
-            onAccepted: userDictListModel.search()
-        }
-
-        QQC2.Button {
-            visible: identifierField.isUserId
-
-            text: i18n("Add")
-            highlighted: true
-
-            onClicked: {
-                room.inviteToRoom(identifierField.text);
-            }
-        }
-    }
-
-    ListView {
-        id: userDictListView
-
-        clip: true
 
     model: UserDirectoryListModel {
         id: userDictListModel
 
         connection: root.room.connection
-            searchText: identifierField.text
     }
 
-        Kirigami.PlaceholderMessage {
+    modelDelegate: Delegates.RoundedItemDelegate {
-            anchors.centerIn: parent
-
-            visible: userDictListView.count < 1
-
-            text: i18n("No users available")
-        }
-
-        delegate: Delegates.RoundedItemDelegate {
         id: delegate
 
         required property string userId
         required property string displayName
         required property url avatarUrl
 
-            property bool inRoom: room && room.containsUser(userId)
-
         text: displayName
 
         contentItem: RowLayout {
@@ -97,26 +68,23 @@ Kirigami.ScrollablePage {
 
             QQC2.ToolButton {
                 id: inviteButton
+
+                readonly property bool inRoom: root.room && root.room.containsUser(delegate.userId)
+
                 icon.name: "document-send"
-                    text: i18n("Send invitation")
+                text: i18nc("@action:button", "Send invitation")
-                    checkable: true
-                    checked: inRoom
                 opacity: inRoom ? 0.5 : 1
+                enabled: !inRoom
 
-                    onToggled: {
+                onClicked: {
-                        if (inRoom) {
+                    inviteButton.enabled = false;
-                            checked = true;
+                    root.room.inviteToRoom(delegate.userId);
-                        } else {
-                            room.inviteToRoom(delegate.userId);
-                            applicationWindow().pageStack.layers.pop();
-                        }
                 }
 
-                    QQC2.ToolTip.text: !inRoom ? text : i18n("User is either already a member or has been invited")
+                QQC2.ToolTip.text: !inRoom ? text : i18nc("@info:tooltip", "User is either already a member or has been invited")
                 QQC2.ToolTip.visible: inviteButton.hovered
                 QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
             }
         }
     }
 }
-}