X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=1d94d1acb9f8027a571403d1811698bdbb73f2ac;hp=5f903eda4851c22745e1935703225cfed54a7623;hb=f2c940fd1e766685ff936046c35ef2ea48e96723;hpb=6b9450088fc7dc119476f72b2faaee1ed417db53 diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 5f903eda4..1d94d1acb 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -29,14 +29,10 @@ #include "lib/scope_guard.h" #include "lib/screen.h" #include "lib/timer.h" -#include -#include -#include -#include -#include using std::cout; +using std::list; using std::make_pair; using std::make_shared; using std::map; @@ -45,6 +41,9 @@ using std::shared_ptr; using std::string; using std::vector; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; @@ -117,13 +116,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent) SetSizer (sizer); - UErrorCode status = U_ZERO_ERROR; - _collator = ucol_open(nullptr, &status); - if (_collator) { - ucol_setAttribute(_collator, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); - ucol_setAttribute(_collator, UCOL_STRENGTH, UCOL_PRIMARY, &status); - ucol_setAttribute(_collator, UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED, &status); - } + _config_connection = Config::instance()->Changed.connect(boost::bind(&ScreensPanel::config_changed, this, _1)); } @@ -131,10 +124,6 @@ ScreensPanel::~ScreensPanel () { _targets->Unbind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this); _targets->Unbind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, this); - - if (_collator) { - ucol_close (_collator); - } } @@ -179,18 +168,33 @@ ScreensPanel::setup_sensitivity () } +void +ScreensPanel::convert_to_lower(string& s) +{ + transform(s.begin(), s.end(), s.begin(), ::tolower); +} + + +bool +ScreensPanel::matches_search(shared_ptr cinema, string lower_case_search) +{ + if (lower_case_search.empty()) { + return true; + } + + auto name = cinema->name; + convert_to_lower(name); + return name.find(lower_case_search) != string::npos; +} + + optional ScreensPanel::add_cinema (shared_ptr cinema, wxTreeListItem previous) { auto search = wx_to_std (_search->GetValue ()); - transform (search.begin(), search.end(), search.begin(), ::tolower); - - if (!search.empty ()) { - auto name = cinema->name; - transform (name.begin(), name.end(), name.begin(), ::tolower); - if (name.find (search) == string::npos) { - return {}; - } + convert_to_lower(search); + if (!matches_search(cinema, search)) { + return {}; } auto id = _targets->InsertItem(_targets->GetRootItem(), previous, std_to_wx(cinema->name)); @@ -232,30 +236,36 @@ ScreensPanel::add_cinema_clicked () if (dialog->ShowModal() == wxID_OK) { auto cinema = make_shared(dialog->name(), dialog->emails(), dialog->notes(), dialog->utc_offset_hour(), dialog->utc_offset_minute()); - auto cinemas = Config::instance()->cinemas(); - cinemas.sort( - [this](shared_ptr a, shared_ptr b) { return compare(a->name, b->name) < 0; } - ); + auto cinemas = sorted_cinemas(); try { + _ignore_cinemas_changed = true; + ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; Config::instance()->add_cinema(cinema); } catch (FileError& e) { error_dialog(GetParent(), _("Could not write cinema details to the cinemas.xml file. Check that the location of cinemas.xml is valid in DCP-o-matic's preferences."), std_to_wx(e.what())); return; } - optional item; + wxTreeListItem previous = wxTLI_FIRST; + bool found = false; + auto search = wx_to_std(_search->GetValue()); + convert_to_lower(search); for (auto existing_cinema: cinemas) { - if (!item && compare(dialog->name(), existing_cinema->name) < 0) { - if (auto existing_item = cinema_to_item(existing_cinema)) { - item = add_cinema (cinema, *existing_item); - } + if (!matches_search(existing_cinema, search)) { + continue; + } + if (_collator.compare(dialog->name(), existing_cinema->name) < 0) { + /* existing_cinema should be after the one we're inserting */ + found = true; + break; } + auto item = cinema_to_item(existing_cinema); + DCPOMATIC_ASSERT(item); + previous = *item; } - if (!item) { - item = add_cinema (cinema, wxTLI_LAST); - } + auto item = add_cinema(cinema, found ? previous : wxTLI_LAST); if (item) { _targets->UnselectAll (); @@ -321,6 +331,8 @@ ScreensPanel::remove_cinema_clicked () } for (auto const& cinema: _selected_cinemas) { + _ignore_cinemas_changed = true; + ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; Config::instance()->remove_cinema(cinema); auto item = cinema_to_item(cinema); DCPOMATIC_ASSERT(item); @@ -486,22 +498,30 @@ ScreensPanel::selection_changed () } -void -ScreensPanel::add_cinemas () +list> +ScreensPanel::sorted_cinemas() const { auto cinemas = Config::instance()->cinemas(); + cinemas.sort( - [this](shared_ptr a, shared_ptr b) { return compare(a->name, b->name) < 0; } + [this](shared_ptr a, shared_ptr b) { return _collator.compare(a->name, b->name) < 0; } ); - for (auto cinema: cinemas) { + return cinemas; +} + + +void +ScreensPanel::add_cinemas () +{ + for (auto cinema: sorted_cinemas()) { add_cinema (cinema, wxTLI_LAST); } } void -ScreensPanel::search_changed () +ScreensPanel::clear_and_re_add() { _targets->DeleteAllItems (); @@ -511,6 +531,13 @@ ScreensPanel::search_changed () _screen_to_item.clear (); add_cinemas (); +} + + +void +ScreensPanel::search_changed () +{ + clear_and_re_add(); _ignore_selection_change = true; @@ -649,25 +676,12 @@ ScreensPanel::screen_to_item (shared_ptr screen) const } -int -ScreensPanel::compare (string const& utf8_a, string const& utf8_b) -{ - if (_collator) { - UErrorCode error = U_ZERO_ERROR; - boost::scoped_array utf16_a(new uint16_t[utf8_a.size() + 1]); - u_strFromUTF8(reinterpret_cast(utf16_a.get()), utf8_a.size() + 1, nullptr, utf8_a.c_str(), -1, &error); - boost::scoped_array utf16_b(new uint16_t[utf8_b.size() + 1]); - u_strFromUTF8(reinterpret_cast(utf16_b.get()), utf8_b.size() + 1, nullptr, utf8_b.c_str(), -1, &error); - return ucol_strcoll(_collator, reinterpret_cast(utf16_a.get()), -1, reinterpret_cast(utf16_b.get()), -1); - } else { - return strcoll(utf8_a.c_str(), utf8_b.c_str()); - } -} - - bool ScreensPanel::notify_cinemas_changed() { + _ignore_cinemas_changed = true; + ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; + try { Config::instance()->changed(Config::CINEMAS); } catch (FileError& e) { @@ -679,3 +693,10 @@ ScreensPanel::notify_cinemas_changed() } +void +ScreensPanel::config_changed(Config::Property property) +{ + if (property == Config::Property::CINEMAS && !_ignore_cinemas_changed) { + clear_and_re_add(); + } +}