feat(tray): Migrate TrayWindow to the new tray user menu

resources.qrc

@@ -1,6 +1,9 @@
 <RCC>
     <qresource prefix="/qml">
         <file>src/gui/UserStatusMessageView.qml</file>
+        <file>src/gui/UserStatusWindow.qml</file>
+        <file>src/gui/UserStatusWindowStatusRow.qml</file>
+        <file>src/gui/UserStatusWindowPredefinedStatusRow.qml</file>
         <file>src/gui/UserStatusSelectorPage.qml</file>
         <file>src/gui/EmojiPicker.qml</file>
         <file>src/gui/UserStatusSelectorButton.qml</file>

src/gui/CMakeLists.txt

@@ -207,6 +207,8 @@ set(client_SRCS
     tray/unifiedsearchresult.cpp
     tray/unifiedsearchresultslistmodel.h
     tray/trayimageprovider.cpp
+    tray/trayaccountappsmodel.h
+    tray/trayaccountappsmodel.cpp
     tray/unifiedsearchresultslistmodel.cpp
     tray/usermodel.h
     tray/usermodel.cpp

src/gui/EmojiPicker.qml

@@ -5,13 +5,50 @@
 
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic as BasicControls
 import QtQuick.Layouts
 
 import Style
 import com.nextcloud.desktopclient 1.0 as NC
 import "./tray"
 
 ColumnLayout {
+    id: root
+
+    property bool showSearch: false
+    property int visibleRows: 8
+    property string searchText: ""
+    readonly property var filteredModel: {
+        if (searchText === "") {
+            return emojiModel.model
+        }
+
+        const needle = searchText.toLowerCase()
+        const emojiLists = [
+            emojiModel.people,
+            emojiModel.nature,
+            emojiModel.food,
+            emojiModel.activity,
+            emojiModel.travel,
+            emojiModel.objects,
+            emojiModel.symbols,
+            emojiModel.flags
+        ]
+        var results = []
+        for (var listIndex = 0; listIndex < emojiLists.length; ++listIndex) {
+            const emojis = emojiLists[listIndex]
+            for (var emojiIndex = 0; emojiIndex < emojis.length; ++emojiIndex) {
+                const emoji = emojis[emojiIndex]
+                const shortname = emoji.shortname === undefined ? "" : emoji.shortname.toLowerCase()
+                const unicode = emoji.unicode === undefined ? "" : emoji.unicode
+                if (shortname.indexOf(needle) !== -1 || unicode.indexOf(searchText) !== -1) {
+                    results.push(emoji)
+                }
+            }
+        }
+        return results
+    }
+
     NC.EmojiModel {
         id: emojiModel
     }
@@ -24,13 +61,41 @@ ColumnLayout {
         id: metrics
     }
 
+    BasicControls.TextField {
+        id: searchField
+
+        visible: root.showSearch
+        Layout.fillWidth: true
+        Layout.preferredHeight: visible ? 32 : 0
+        Layout.margins: visible ? Style.smallSpacing : 0
+        placeholderText: qsTr("Search emoji")
+        selectByMouse: true
+        text: root.searchText
+        topPadding: 0
+        bottomPadding: 0
+        leftPadding: 10
+        rightPadding: 10
+        font.pixelSize: Style.pixelSize + 2
+        verticalAlignment: TextInput.AlignVCenter
+        onTextChanged: root.searchText = text
+
+        background: Rectangle {
+            radius: 8
+            color: palette.base
+            border.width: 1
+            border.color: searchField.activeFocus ? Style.ncBlue : palette.dark
+        }
+    }
+
     ListView {
         id: headerLayout
         Layout.fillWidth: true
         Layout.margins: 1
         implicitWidth: contentItem.childrenRect.width
         implicitHeight: metrics.height * 2
 
+        visible: root.searchText === ""
+        Layout.preferredHeight: visible ? implicitHeight : 0
         orientation: ListView.Horizontal
 
         model: emojiModel.emojiCategoriesModel
@@ -74,15 +139,15 @@ ColumnLayout {
     }
 
     Rectangle {
-        height: Style.normalBorderWidth
+        Layout.preferredHeight: root.searchText === "" ? Style.normalBorderWidth : 0
         Layout.fillWidth: true
         color: palette.dark
     }
 
     ScrollView {
         Layout.fillWidth: true
         Layout.fillHeight: true
-        Layout.preferredHeight: metrics.height * 8
+        Layout.preferredHeight: metrics.height * root.visibleRows
         Layout.margins: Style.normalBorderWidth
         clip: true
 
@@ -95,7 +160,7 @@ ColumnLayout {
             cellWidth: metrics.height * 2
             cellHeight: metrics.height * 2
             boundsBehavior: Flickable.DragOverBounds
-            model: emojiModel.model
+            model: root.filteredModel
 
             delegate: ItemDelegate {
                 id: emojiDelegate
@@ -129,11 +194,11 @@ ColumnLayout {
 
             }
 
-           EnforcedPlainTextLabel {
+            EnforcedPlainTextLabel {
                 id: placeholderMessage
                 width: parent.width * 0.8
                 anchors.centerIn: parent
-                text: qsTr("No recent emojis")
+                text: root.searchText === "" ? qsTr("No recent emojis") : qsTr("No emojis found")
                 wrapMode: Text.Wrap
                 font.bold: true
                 visible: emojiView.count === 0