Use Collator for recipients search (#2426).

diff --git a/src/wx/recipients_panel.cc b/src/wx/recipients_panel.cc
index 943d55c6c08a7191157bcbc2827acc7cf395bf25..485a0f94e1ea65f8219f7bea1e9c690b6e157302 100644 (file)
--- a/src/wx/recipients_panel.cc
+++ b/src/wx/recipients_panel.cc
@@ -105,15 +105,10 @@ RecipientsPanel::setup_sensitivity ()
 void
 RecipientsPanel::add_recipient (shared_ptr<DKDMRecipient> r)
 {
 void
 RecipientsPanel::add_recipient (shared_ptr<DKDMRecipient> r)
 {

-       string search = wx_to_std (_search->GetValue());
-       transform (search.begin(), search.end(), search.begin(), ::tolower);
-
-       if (!search.empty()) {
-               string name = r->name;
-               transform (name.begin(), name.end(), name.begin(), ::tolower);
-               if (name.find(search) == string::npos) {
-                       return;
-               }
+       string const search = wx_to_std(_search->GetValue());
+
+       if (!search.empty() && !_collator.find(search, r->name)) {
+               return;

        }
 
        _recipients[_targets->AppendItem(_root, std_to_wx(r->name))] = r;
        }
 
        _recipients[_targets->AppendItem(_root, std_to_wx(r->name))] = r;

diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h
index 0b2a6a4b7aa9752d3ec29e7afd9318236852bbb8..6e1f1408ffb6603dd5b821501f5918d1e4bd8dc3 100644 (file)
--- a/src/wx/recipients_panel.h
+++ b/src/wx/recipients_panel.h
@@ -19,6 +19,7 @@
 */
 
 
 */
 
 

+#include "lib/collator.h"

 #include "lib/dkdm_recipient.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include "lib/dkdm_recipient.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS


@@ -67,4 +68,6 @@ private:
        RecipientMap _selected;
 
        bool _ignore_selection_change;
        RecipientMap _selected;
 
        bool _ignore_selection_change;

+
+       Collator _collator;

 };
 };