Commit b3d52da5 authored by Robert Maerkisch's avatar Robert Maerkisch Committed by LNJ

Rewrite contacts search to use QSortFilterProxyModel

parent 6bea497c
Pipeline #8902 passed with stages
in 30 minutes and 16 seconds
......@@ -7,6 +7,7 @@ set(KAIDAN_SOURCES
src/Database.cpp
src/RosterItem.cpp
src/RosterModel.cpp
src/RosterFilterProxyModel.cpp
src/RosterDb.cpp
src/RosterManager.cpp
src/RegistrationManager.cpp
......
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2019 Kaidan developers and contributors
* (see the LICENSE file for a full list of copyright authors)
*
* Kaidan is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* In addition, as a special exception, the author of Kaidan gives
* permission to link the code of its release with the OpenSSL
* project's "OpenSSL" library (or with modified versions of it that
* use the same license as the "OpenSSL" library), and distribute the
* linked executables. You must obey the GNU General Public License in
* all respects for all of the code used other than "OpenSSL". If you
* modify this file, you may extend this exception to your version of
* the file, but you are not obligated to do so. If you do not wish to
* do so, delete this exception statement from your version.
*
* Kaidan is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Kaidan. If not, see <http://www.gnu.org/licenses/>.
*/
#include "RosterFilterProxyModel.h"
#include "RosterModel.h"
RosterFilterProxyModel::RosterFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
{
}
bool RosterFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
return sourceModel()->data(index, RosterModel::NameRole).toString().toLower().contains(filterRegExp()) ||
sourceModel()->data(index, RosterModel::JidRole).toString().toLower().contains(filterRegExp());
}
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2019 Kaidan developers and contributors
* (see the LICENSE file for a full list of copyright authors)
*
* Kaidan is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* In addition, as a special exception, the author of Kaidan gives
* permission to link the code of its release with the OpenSSL
* project's "OpenSSL" library (or with modified versions of it that
* use the same license as the "OpenSSL" library), and distribute the
* linked executables. You must obey the GNU General Public License in
* all respects for all of the code used other than "OpenSSL". If you
* modify this file, you may extend this exception to your version of
* the file, but you are not obligated to do so. If you do not wish to
* do so, delete this exception statement from your version.
*
* Kaidan is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Kaidan. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ROSTERFILTERPROXYMODEL_H
#define ROSTERFILTERPROXYMODEL_H
#include <QSortFilterProxyModel>
class RosterFilterProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
RosterFilterProxyModel(QObject *parent = nullptr);
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
};
#endif // ROSTERFILTERPROXYMODEL_H
......@@ -55,6 +55,7 @@
#include "PresenceCache.h"
#include "QmlUtils.h"
#include "RosterModel.h"
#include "RosterFilterProxyModel.h"
#include "StatusBar.h"
#include "UploadManager.h"
#include "EmojiModel.h"
......@@ -286,6 +287,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
qmlRegisterType<EmojiProxyModel>("EmojiModel", 0, 1, "EmojiProxyModel");
qmlRegisterType<QrCodeScannerFilter>(APPLICATION_ID, 1, 0, "QrCodeScannerFilter");
qmlRegisterType<VCardModel>(APPLICATION_ID, 1, 0, "VCardModel");
qmlRegisterType<RosterFilterProxyModel>(APPLICATION_ID, 1, 0, "RosterFilterProxyModel");
qmlRegisterUncreatableType<QAbstractItemModel>("EmojiModel", 0, 1, "QAbstractItemModel", "Used by proxy models");
qmlRegisterUncreatableType<Emoji>("EmojiModel", 0, 1, "Emoji", "Used by emoji models");
......
......@@ -83,19 +83,19 @@ Kirigami.ScrollablePage {
focus: visible
placeholderText: qsTr("Search…")
onVisibleChanged: text = ""
onTextChanged: filterModel.setFilterFixedString(text.toLowerCase())
}
}
ListView {
verticalLayoutDirection: ListView.TopToBottom
model: kaidan.rosterModel
model: RosterFilterProxyModel {
id: filterModel
sourceModel: kaidan.rosterModel
}
delegate: RosterListItem {
id: rosterItem
visible: {
model.jid.toLowerCase().includes(searchField.displayText.toLowerCase()) ||
model.name.toLowerCase().includes(searchField.displayText.toLowerCase())
}
height: visible ? 65 : 0
height: 65
name: model.name ? model.name : model.jid
jid: model.jid
lastMessage: model.lastMessage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment