projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use collator to search for screens (#2426).
[dcpomatic.git]
/
src
/
wx
/
screens_panel.cc
diff --git
a/src/wx/screens_panel.cc
b/src/wx/screens_panel.cc
index 617ff9adc7cfd0a5674f3a758bf003adcad09910..6c5b28b8d0fdd048449ce2c0e3a0bdfc8994d3a3 100644
(file)
--- a/
src/wx/screens_panel.cc
+++ b/
src/wx/screens_panel.cc
@@
-177,23
+177,20
@@
ScreensPanel::convert_to_lower(string& s)
bool
bool
-ScreensPanel::matches_search(shared_ptr<const Cinema> cinema, string
lower_case_
search)
+ScreensPanel::matches_search(shared_ptr<const Cinema> cinema, string search)
{
{
- if (
lower_case_
search.empty()) {
+ if (search.empty()) {
return true;
}
return true;
}
- auto name = cinema->name;
- convert_to_lower(name);
- return name.find(lower_case_search) != string::npos;
+ return _collator.find(search, cinema->name);
}
optional<wxTreeListItem>
ScreensPanel::add_cinema (shared_ptr<Cinema> cinema, wxTreeListItem previous)
{
}
optional<wxTreeListItem>
ScreensPanel::add_cinema (shared_ptr<Cinema> cinema, wxTreeListItem previous)
{
- auto search = wx_to_std (_search->GetValue ());
- convert_to_lower(search);
+ auto const search = wx_to_std(_search->GetValue());
if (!matches_search(cinema, search)) {
return {};
}
if (!matches_search(cinema, search)) {
return {};
}
@@
-249,8
+246,7
@@
ScreensPanel::add_cinema_clicked ()
wxTreeListItem previous = wxTLI_FIRST;
bool found = false;
wxTreeListItem previous = wxTLI_FIRST;
bool found = false;
- auto search = wx_to_std(_search->GetValue());
- convert_to_lower(search);
+ auto const search = wx_to_std(_search->GetValue());
for (auto existing_cinema: cinemas) {
if (!matches_search(existing_cinema, search)) {
continue;
for (auto existing_cinema: cinemas) {
if (!matches_search(existing_cinema, search)) {
continue;