feat(search): revive unified search

resources.qrc

@@ -72,8 +72,11 @@
         <file>src/gui/wizard/qml/ServerPage.qml</file>
         <file>src/gui/wizard/qml/SyncOptionsPage.qml</file>
         <file>src/gui/wizard/qml/WizardButton.qml</file>
+        <file>src/gui/wizard/qml/WizardChipButton.qml</file>
         <file>src/gui/wizard/qml/WizardComboBox.qml</file>
         <file>src/gui/wizard/qml/WizardDialogFrame.qml</file>
+        <file>src/gui/wizard/qml/WizardMenu.qml</file>
+        <file>src/gui/wizard/qml/WizardMenuItem.qml</file>
         <file>src/gui/wizard/qml/WizardTextField.qml</file>
         <file>src/gui/macOS/ui/FileProviderFileDelegate.qml</file>
         <file>src/gui/integration/FileActionsWindow.qml</file>

src/gui/iconutils.cpp

@@ -164,8 +164,8 @@ QImage drawSvgWithCustomFillColor(const QString &sourceSvgPath,
         return {};
     }
 
-    const auto reqSize = (requestedSize.isValid() && requestedSize.height() && requestedSize.height()) ? requestedSize : svgRenderer.defaultSize();
-    if (!reqSize.isValid() || !reqSize.height() || !reqSize.height()) {
+    const auto reqSize = (requestedSize.isValid() && requestedSize.width() && requestedSize.height()) ? requestedSize : svgRenderer.defaultSize();
+    if (!reqSize.isValid() || !reqSize.width() || !reqSize.height()) {
         return {};
     }
 

src/gui/owncloudgui.cpp

@@ -39,6 +39,7 @@
 #include "tray/trayactivationpolicy.h"
 #include "tray/trayaccountappsmodel.h"
 #include "search/unifiedsearchresultslistmodel.h"
+#include "search/unifiedsearchpeoplemodel.h"
 #include "integration/fileactionsmodel.h"
 #include "governance/applygovernancelabel.h"
 #include "governance/deletegovernancelabel.h"
@@ -159,6 +160,7 @@ ownCloudGui::ownCloudGui(Application *parent)
     qmlRegisterType<FileDetails>("com.nextcloud.desktopclient", 1, 0, "FileDetails");
     qmlRegisterType<ShareModel>("com.nextcloud.desktopclient", 1, 0, "ShareModel");
     qmlRegisterType<ShareeModel>("com.nextcloud.desktopclient", 1, 0, "ShareeModel");
+    qmlRegisterType<UnifiedSearchPeopleModel>("com.nextcloud.desktopclient", 1, 0, "UnifiedSearchPeopleModel");
     qmlRegisterType<SortedShareModel>("com.nextcloud.desktopclient", 1, 0, "SortedShareModel");
     qmlRegisterType<SyncConflictsModel>("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel");
     qmlRegisterType<FileActionsModel>("com.nextcloud.desktopclient", 1, 0, "FileActionsModel");

src/gui/search/CMakeLists.txt

@@ -9,14 +9,21 @@ target_sources(nextcloudGuiSearch
     unifiedsearchresult.cpp
     unifiedsearchresultslistmodel.h
     unifiedsearchresultslistmodel.cpp
+    unifiedsearchpeoplemodel.h
+    unifiedsearchpeoplemodel.cpp
 )
 
 ecm_add_qml_module(nextcloudGuiSearch
   URI com.nextcloud.desktopclient.search
   GENERATE_PLUGIN_SOURCE
   QML_FILES
     SearchWindow.qml
+    UnifiedSearchCustomDateRangeDialog.qml
+    UnifiedSearchDetailHeader.qml
+    UnifiedSearchFilterBar.qml
     UnifiedSearchInputContainer.qml
+    UnifiedSearchPeoplePopup.qml
+    UnifiedSearchResultDelegate.qml
     UnifiedSearchResultFetchMoreTrigger.qml
     UnifiedSearchResultItem.qml
     UnifiedSearchResultItemSkeleton.qml