Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
ecc77599
Commit
ecc77599
authored
4 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Custom completer filtering
parent
add5903f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
resources/qml/MessageInput.qml
+3
-0
3 additions, 0 deletions
resources/qml/MessageInput.qml
src/CompletionProxyModel.h
+96
-0
96 additions, 0 deletions
src/CompletionProxyModel.h
src/UsersModel.cpp
+6
-3
6 additions, 3 deletions
src/UsersModel.cpp
src/UsersModel.h
+2
-0
2 additions, 0 deletions
src/UsersModel.h
with
107 additions
and
3 deletions
resources/qml/MessageInput.qml
+
3
−
0
View file @
ecc77599
...
...
@@ -128,6 +128,9 @@ Rectangle {
textArea
.
clear
();
event
.
accepted
=
true
;
}
if
(
popup
.
opened
)
popup
.
completer
.
setSearchString
(
textArea
.
getText
(
completerTriggeredAt
,
cursorPosition
));
}
Connections
{
...
...
This diff is collapsed.
Click to expand it.
src/CompletionProxyModel.h
+
96
−
0
View file @
ecc77599
...
...
@@ -5,6 +5,7 @@
#include
<QSortFilterProxyModel>
#include
"CompletionModelRoles.h"
#include
"Utils.h"
class
CompletionProxyModel
:
public
QSortFilterProxyModel
{
...
...
@@ -15,6 +16,20 @@ public:
:
QSortFilterProxyModel
(
parent
)
{
setSourceModel
(
model
);
sort
(
0
,
Qt
::
AscendingOrder
);
setFilterRole
(
CompletionModel
::
SearchRole
);
connect
(
this
,
&
CompletionProxyModel
::
newSearchString
,
this
,
[
this
](
QString
s
)
{
s
.
remove
(
":"
);
s
.
remove
(
"@"
);
searchString
=
s
.
toLower
();
invalidate
();
},
Qt
::
QueuedConnection
);
}
QHash
<
int
,
QByteArray
>
roleNames
()
const
override
...
...
@@ -28,6 +43,79 @@ public:
return
(
row_count
<
7
)
?
row_count
:
7
;
}
bool
filterAcceptsRow
(
int
source_row
,
const
QModelIndex
&
source_parent
)
const
{
if
(
searchString
.
size
()
<
1
)
return
true
;
auto
source_index
=
sourceModel
()
->
index
(
source_row
,
0
,
source_parent
);
auto
role1
=
sourceModel
()
->
data
(
source_index
,
CompletionModel
::
SearchRole
)
.
toString
()
.
toLower
();
if
(
role1
.
contains
(
searchString
))
return
true
;
// auto score =
// utils::levenshtein_distance(searchString, role1.toLower().toStdString());
// if ((size_t)role1.size() >= searchString.size() &&
// ((size_t)score) < (size_t)role1.size() - searchString.size() + 2)
// return true;
auto
role2
=
sourceModel
()
->
data
(
source_index
,
CompletionModel
::
SearchRole2
)
.
toString
()
.
toLower
();
if
(
role2
.
contains
(
searchString
))
return
true
;
// if (!role2.isEmpty()) {
// score =
// utils::levenshtein_distance(searchString,
// role2.toLower().toStdString());
// if ((size_t)role2.size() >= searchString.size() &&
// ((size_t)score) < (size_t)role2.size() - searchString.size() + 2)
// return true;
//}
return
false
;
}
bool
lessThan
(
const
QModelIndex
&
source_left
,
const
QModelIndex
&
source_right
)
const
override
{
if
(
searchString
.
size
()
<
1
)
return
false
;
auto
left1
=
sourceModel
()
->
data
(
source_left
,
CompletionModel
::
SearchRole
).
toString
();
auto
left2
=
sourceModel
()
->
data
(
source_left
,
CompletionModel
::
SearchRole2
).
toString
();
auto
left
=
left1
.
toLower
().
indexOf
(
searchString
);
// utils::levenshtein_distance(searchString, left1.toLower().toStdString());
if
(
!
left2
.
isEmpty
())
{
// left = std::min(
// utils::levenshtein_distance(searchString,
// left2.toLower().toStdString()), left);
left
=
std
::
min
(
left2
.
toLower
().
indexOf
(
searchString
),
left
);
}
auto
right1
=
sourceModel
()
->
data
(
source_right
,
CompletionModel
::
SearchRole
).
toString
();
auto
right2
=
sourceModel
()
->
data
(
source_right
,
CompletionModel
::
SearchRole2
).
toString
();
auto
right
=
right1
.
toLower
().
indexOf
(
searchString
);
// auto right =
// utils::levenshtein_distance(searchString, right1.toLower().toStdString());
if
(
!
right2
.
isEmpty
())
{
// right = std::min(
// utils::levenshtein_distance(searchString,
// right2.toLower().toStdString()), right);
right
=
std
::
min
(
right2
.
toLower
().
indexOf
(
searchString
),
right
);
}
return
left
<
right
;
}
public
slots
:
QVariant
completionAt
(
int
i
)
const
{
...
...
@@ -36,4 +124,12 @@ public slots:
else
return
{};
}
void
setSearchString
(
QString
s
)
{
emit
newSearchString
(
s
);
}
signals:
void
newSearchString
(
QString
);
private:
QString
searchString
;
};
This diff is collapsed.
Click to expand it.
src/UsersModel.cpp
+
6
−
3
View file @
ecc77599
...
...
@@ -8,6 +8,10 @@ UsersModel::UsersModel(const std::string &roomId, QObject *parent)
,
room_id
(
roomId
)
{
roomMembers_
=
cache
::
roomMembers
(
roomId
);
for
(
const
auto
&
m
:
roomMembers_
)
{
displayNames
.
push_back
(
QString
::
fromStdString
(
cache
::
displayName
(
room_id
,
m
)));
userids
.
push_back
(
QString
::
fromStdString
(
m
));
}
}
QHash
<
int
,
QByteArray
>
...
...
@@ -31,10 +35,9 @@ UsersModel::data(const QModelIndex &index, int role) const
case
CompletionModel
::
SearchRole
:
case
Qt
::
DisplayRole
:
case
Roles
::
DisplayName
:
return
QString
::
fromStdString
(
cache
::
displayName
(
room_id
,
roomMembers_
[
index
.
row
()]));
return
displayNames
[
index
.
row
()];
case
CompletionModel
::
SearchRole2
:
return
QString
::
fromStdString
(
roomMembers_
[
index
.
row
()]
)
;
return
userids
[
index
.
row
()];
case
Roles
::
AvatarUrl
:
return
cache
::
avatarUrl
(
QString
::
fromStdString
(
room_id
),
QString
::
fromStdString
(
roomMembers_
[
index
.
row
()]));
...
...
This diff is collapsed.
Click to expand it.
src/UsersModel.h
+
2
−
0
View file @
ecc77599
...
...
@@ -23,4 +23,6 @@ public:
private
:
std
::
string
room_id
;
std
::
vector
<
std
::
string
>
roomMembers_
;
std
::
vector
<
QString
>
displayNames
;
std
::
vector
<
QString
>
userids
;
};
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment