X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=b7defe0e9be39e482d6163fe1f4f1972edb21330;hp=52d9fd88d2085682b1fb3fe70f3969e9a521463b;hb=493ed4867d46e03a08905dd7a938a90c3262b58f;hpb=bac28a7b12f7a3df11fc7c9a06d67dd175d24809 diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 52d9fd88d..b7defe0e9 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -26,16 +26,13 @@ #include "wx_util.h" #include "lib/cinema.h" #include "lib/config.h" +#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; @@ -44,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; @@ -112,17 +112,11 @@ ScreensPanel::ScreensPanel (wxWindow* parent) _remove_screen->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::remove_screen_clicked, this)); _check_all->Bind (wxEVT_BUTTON, boost::bind(&ScreensPanel::check_all, this)); - _uncheck_all->Bind (wxEVT_BUTTON, boost::bind(&ScreensPanel::uncheck_all, this)); + _uncheck_all->Bind (wxEVT_BUTTON, boost::bind(&ScreensPanel::uncheck_all, this)); 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)); } @@ -130,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); - } } @@ -178,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)); @@ -225,37 +230,45 @@ ScreensPanel::add_screen (shared_ptr cinema, shared_ptr screen) void ScreensPanel::add_cinema_clicked () { - auto d = new CinemaDialog (GetParent(), _("Add Cinema")); - if (d->ShowModal () == wxID_OK) { - auto cinema = make_shared(d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()); + auto dialog = new CinemaDialog (GetParent(), _("Add Cinema")); + ScopeGuard sg = [dialog]() { dialog->Destroy(); }; + + 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; for (auto existing_cinema: cinemas) { - if (!item && compare(d->name(), existing_cinema->name) < 0) { - if (auto existing_item = cinema_to_item(existing_cinema)) { - item = add_cinema (cinema, *existing_item); - } + 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 (); _targets->Select (*item); } - - Config::instance()->add_cinema (cinema); } - d->Destroy (); + selection_changed (); } @@ -280,23 +293,22 @@ ScreensPanel::edit_cinema_clicked () return; } - auto d = new CinemaDialog ( + auto dialog = new CinemaDialog( GetParent(), _("Edit cinema"), cinema->name, cinema->emails, cinema->notes, cinema->utc_offset_hour(), cinema->utc_offset_minute() ); - - if (d->ShowModal() == wxID_OK) { - cinema->name = d->name(); - cinema->emails = d->emails(); - cinema->notes = d->notes(); - cinema->set_utc_offset_hour(d->utc_offset_hour()); - cinema->set_utc_offset_minute(d->utc_offset_minute()); + ScopeGuard sg = [dialog]() { dialog->Destroy(); }; + + if (dialog->ShowModal() == wxID_OK) { + cinema->name = dialog->name(); + cinema->emails = dialog->emails(); + cinema->notes = dialog->notes(); + cinema->set_utc_offset_hour(dialog->utc_offset_hour()); + cinema->set_utc_offset_minute(dialog->utc_offset_minute()); + notify_cinemas_changed(); auto item = cinema_to_item(cinema); DCPOMATIC_ASSERT(item); - _targets->SetItemText (*item, std_to_wx(d->name())); - Config::instance()->changed (Config::CINEMAS); + _targets->SetItemText (*item, std_to_wx(dialog->name())); } - - d->Destroy (); } @@ -314,6 +326,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); @@ -332,35 +346,34 @@ ScreensPanel::add_screen_clicked () return; } - auto d = new ScreenDialog (GetParent(), _("Add Screen")); - if (d->ShowModal () != wxID_OK) { - d->Destroy (); + auto dialog = new ScreenDialog(GetParent(), _("Add Screen")); + ScopeGuard sg = [dialog]() { dialog->Destroy(); }; + + if (dialog->ShowModal () != wxID_OK) { return; } for (auto screen: cinema->screens()) { - if (screen->name == d->name()) { + if (screen->name == dialog->name()) { error_dialog ( GetParent(), wxString::Format ( _("You cannot add a screen called '%s' as the cinema already has a screen with this name."), - std_to_wx(d->name()).data() + std_to_wx(dialog->name()).data() ) ); return; } } - auto screen = std::make_shared(d->name(), d->notes(), d->recipient(), d->recipient_file(), d->trusted_devices()); + auto screen = std::make_shared(dialog->name(), dialog->notes(), dialog->recipient(), dialog->recipient_file(), dialog->trusted_devices()); cinema->add_screen (screen); + notify_cinemas_changed(); + auto id = add_screen (cinema, screen); if (id) { _targets->Expand (id.get ()); } - - Config::instance()->changed (Config::CINEMAS); - - d->Destroy (); } @@ -373,7 +386,7 @@ ScreensPanel::edit_screen_clicked () auto edit_screen = _selected_screens[0]; - auto d = new ScreenDialog ( + auto dialog = new ScreenDialog( GetParent(), _("Edit screen"), edit_screen->name, edit_screen->notes, @@ -381,37 +394,36 @@ ScreensPanel::edit_screen_clicked () edit_screen->recipient_file, edit_screen->trusted_devices ); + ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - if (d->ShowModal() != wxID_OK) { - d->Destroy (); + if (dialog->ShowModal() != wxID_OK) { return; } auto cinema = edit_screen->cinema; for (auto screen: cinema->screens()) { - if (screen != edit_screen && screen->name == d->name()) { + if (screen != edit_screen && screen->name == dialog->name()) { error_dialog ( GetParent(), wxString::Format ( _("You cannot change this screen's name to '%s' as the cinema already has a screen with this name."), - std_to_wx(d->name()).data() + std_to_wx(dialog->name()).data() ) ); return; } } - edit_screen->name = d->name(); - edit_screen->notes = d->notes(); - edit_screen->recipient = d->recipient(); - edit_screen->recipient_file = d->recipient_file(); - edit_screen->trusted_devices = d->trusted_devices(); + edit_screen->name = dialog->name(); + edit_screen->notes = dialog->notes(); + edit_screen->recipient = dialog->recipient(); + edit_screen->recipient_file = dialog->recipient_file(); + edit_screen->trusted_devices = dialog->trusted_devices(); + notify_cinemas_changed(); + auto item = screen_to_item(edit_screen); DCPOMATIC_ASSERT (item); - _targets->SetItemText (*item, std_to_wx(d->name())); - Config::instance()->changed (Config::CINEMAS); - - d->Destroy (); + _targets->SetItemText (*item, std_to_wx(dialog->name())); } @@ -435,7 +447,7 @@ ScreensPanel::remove_screen_clicked () _targets->DeleteItem(*item); } - Config::instance()->changed (Config::CINEMAS); + notify_cinemas_changed(); } @@ -481,22 +493,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 (); @@ -506,6 +526,13 @@ ScreensPanel::search_changed () _screen_to_item.clear (); add_cinemas (); +} + + +void +ScreensPanel::search_changed () +{ + clear_and_re_add(); _ignore_selection_change = true; @@ -644,17 +671,27 @@ ScreensPanel::screen_to_item (shared_ptr screen) const } -int -ScreensPanel::compare (string const& utf8_a, string const& utf8_b) +bool +ScreensPanel::notify_cinemas_changed() { - 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()); + _ignore_cinemas_changed = true; + ScopeGuard sg = [this]() { _ignore_cinemas_changed = false; }; + + try { + Config::instance()->changed(Config::CINEMAS); + } 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 false; + } + + return true; +} + + +void +ScreensPanel::config_changed(Config::Property property) +{ + if (property == Config::Property::CINEMAS && !_ignore_cinemas_changed) { + clear_and_re_add(); } }