Skip to content

Commit 8fbc4d6

Browse files
Rellomgallien
andcommitted
feat(search): revive unified search
Modernize the account-scoped search window with provider, date, and people filters, connected-service results, and aggregate and provider detail views. Introduce per-provider search state, pagination, scoped retries, keyboard selection, shared wizard styling, and model and QML coverage. Co-authored-by: Matthieu Gallien <matthieu.gallien@nextcloud.com> Signed-off-by: Rello <github@scherello.de> Assisted-by: Codex:GPT-5
1 parent f87793d commit 8fbc4d6

39 files changed

Lines changed: 4592 additions & 841 deletions

resources.qrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,11 @@
7272
<file>src/gui/wizard/qml/ServerPage.qml</file>
7373
<file>src/gui/wizard/qml/SyncOptionsPage.qml</file>
7474
<file>src/gui/wizard/qml/WizardButton.qml</file>
75+
<file>src/gui/wizard/qml/WizardChipButton.qml</file>
7576
<file>src/gui/wizard/qml/WizardComboBox.qml</file>
7677
<file>src/gui/wizard/qml/WizardDialogFrame.qml</file>
78+
<file>src/gui/wizard/qml/WizardMenu.qml</file>
79+
<file>src/gui/wizard/qml/WizardMenuItem.qml</file>
7780
<file>src/gui/wizard/qml/WizardTextField.qml</file>
7881
<file>src/gui/macOS/ui/FileProviderFileDelegate.qml</file>
7982
<file>src/gui/integration/FileActionsWindow.qml</file>

src/gui/iconutils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ QImage drawSvgWithCustomFillColor(const QString &sourceSvgPath,
164164
return {};
165165
}
166166

167-
const auto reqSize = (requestedSize.isValid() && requestedSize.height() && requestedSize.height()) ? requestedSize : svgRenderer.defaultSize();
168-
if (!reqSize.isValid() || !reqSize.height() || !reqSize.height()) {
167+
const auto reqSize = (requestedSize.isValid() && requestedSize.width() && requestedSize.height()) ? requestedSize : svgRenderer.defaultSize();
168+
if (!reqSize.isValid() || !reqSize.width() || !reqSize.height()) {
169169
return {};
170170
}
171171

src/gui/owncloudgui.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "tray/trayactivationpolicy.h"
4040
#include "tray/trayaccountappsmodel.h"
4141
#include "search/unifiedsearchresultslistmodel.h"
42+
#include "search/unifiedsearchpeoplemodel.h"
4243
#include "integration/fileactionsmodel.h"
4344
#include "governance/applygovernancelabel.h"
4445
#include "governance/deletegovernancelabel.h"
@@ -159,6 +160,7 @@ ownCloudGui::ownCloudGui(Application *parent)
159160
qmlRegisterType<FileDetails>("com.nextcloud.desktopclient", 1, 0, "FileDetails");
160161
qmlRegisterType<ShareModel>("com.nextcloud.desktopclient", 1, 0, "ShareModel");
161162
qmlRegisterType<ShareeModel>("com.nextcloud.desktopclient", 1, 0, "ShareeModel");
163+
qmlRegisterType<UnifiedSearchPeopleModel>("com.nextcloud.desktopclient", 1, 0, "UnifiedSearchPeopleModel");
162164
qmlRegisterType<SortedShareModel>("com.nextcloud.desktopclient", 1, 0, "SortedShareModel");
163165
qmlRegisterType<SyncConflictsModel>("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel");
164166
qmlRegisterType<FileActionsModel>("com.nextcloud.desktopclient", 1, 0, "FileActionsModel");

src/gui/search/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,21 @@ target_sources(nextcloudGuiSearch
99
unifiedsearchresult.cpp
1010
unifiedsearchresultslistmodel.h
1111
unifiedsearchresultslistmodel.cpp
12+
unifiedsearchpeoplemodel.h
13+
unifiedsearchpeoplemodel.cpp
1214
)
1315

1416
ecm_add_qml_module(nextcloudGuiSearch
1517
URI com.nextcloud.desktopclient.search
1618
GENERATE_PLUGIN_SOURCE
1719
QML_FILES
1820
SearchWindow.qml
21+
UnifiedSearchCustomDateRangeDialog.qml
22+
UnifiedSearchDetailHeader.qml
23+
UnifiedSearchFilterBar.qml
1924
UnifiedSearchInputContainer.qml
25+
UnifiedSearchPeoplePopup.qml
26+
UnifiedSearchResultDelegate.qml
2027
UnifiedSearchResultFetchMoreTrigger.qml
2128
UnifiedSearchResultItem.qml
2229
UnifiedSearchResultItemSkeleton.qml

0 commit comments

Comments
 (0)