X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=6c5b28b8d0fdd048449ce2c0e3a0bdfc8994d3a3;hp=fa9373e36bb7252c06b8e8b2ad3cca21750005b9;hb=da13c2af9e8f19229061ca1939cbe8bd37c72eba;hpb=963a684d107f7135e6680c2ed7f88e8aa5810ea1 diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index fa9373e36..6c5b28b8d 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; @@ -103,6 +102,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent) _search->Bind (wxEVT_TEXT, boost::bind (&ScreensPanel::search_changed, this)); _targets->Bind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this); _targets->Bind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, this); + _targets->Bind (wxEVT_TREELIST_ITEM_ACTIVATED, &ScreensPanel::item_activated, this); _add_cinema->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::add_cinema_clicked, this)); _edit_cinema->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::edit_cinema_clicked, this)); @@ -113,17 +113,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)); } @@ -131,10 +125,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 +169,30 @@ 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 search) +{ + if (search.empty()) { + return true; + } + + return _collator.find(search, cinema->name); +} + + 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 {}; - } + auto const search = wx_to_std(_search->GetValue()); + if (!matches_search(cinema, search)) { + return {}; } auto id = _targets->InsertItem(_targets->GetRootItem(), previous, std_to_wx(cinema->name)); @@ -226,36 +228,45 @@ ScreensPanel::add_screen (shared_ptr cinema, shared_ptr screen) void ScreensPanel::add_cinema_clicked () { - auto dialog = new CinemaDialog (GetParent(), _("Add Cinema")); - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; + CinemaDialog dialog(GetParent(), _("Add Cinema")); - if (dialog->ShowModal() == wxID_OK) { - auto cinema = make_shared(dialog->name(), dialog->emails(), dialog->notes(), dialog->utc_offset_hour(), dialog->utc_offset_minute()); + 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(); - optional item; + 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; + } + + wxTreeListItem previous = wxTLI_FIRST; + bool found = false; + auto const search = wx_to_std(_search->GetValue()); 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 (); _targets->Select (*item); } - - Config::instance()->add_cinema (cinema); } selection_changed (); @@ -279,25 +290,29 @@ void ScreensPanel::edit_cinema_clicked () { auto cinema = cinema_for_operation (); - if (!cinema) { - return; + if (cinema) { + edit_cinema(cinema); } +} - auto dialog = new CinemaDialog( + +void +ScreensPanel::edit_cinema(shared_ptr cinema) +{ + CinemaDialog dialog( GetParent(), _("Edit cinema"), cinema->name, cinema->emails, cinema->notes, cinema->utc_offset_hour(), cinema->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()); + + 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(dialog->name())); - Config::instance()->changed (Config::CINEMAS); + _targets->SetItemText (*item, std_to_wx(dialog.name())); } } @@ -316,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); @@ -334,47 +351,49 @@ ScreensPanel::add_screen_clicked () return; } - auto dialog = new ScreenDialog(GetParent(), _("Add Screen")); - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; + ScreenDialog dialog(GetParent(), _("Add Screen")); - if (dialog->ShowModal () != wxID_OK) { + if (dialog.ShowModal () != wxID_OK) { return; } for (auto screen: cinema->screens()) { - if (screen->name == dialog->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(dialog->name()).data() + std_to_wx(dialog.name()).data() ) ); return; } } - auto screen = std::make_shared(dialog->name(), dialog->notes(), dialog->recipient(), dialog->recipient_file(), dialog->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); } void ScreensPanel::edit_screen_clicked () { - if (_selected_screens.size() != 1) { - return; + if (_selected_screens.size() == 1) { + edit_screen(_selected_screens[0]); } +} - auto edit_screen = _selected_screens[0]; - auto dialog = new ScreenDialog( +void +ScreensPanel::edit_screen(shared_ptr edit_screen) +{ + ScreenDialog dialog( GetParent(), _("Edit screen"), edit_screen->name, edit_screen->notes, @@ -382,35 +401,35 @@ ScreensPanel::edit_screen_clicked () edit_screen->recipient_file, edit_screen->trusted_devices ); - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - if (dialog->ShowModal() != wxID_OK) { + if (dialog.ShowModal() != wxID_OK) { return; } auto cinema = edit_screen->cinema; for (auto screen: cinema->screens()) { - if (screen != edit_screen && screen->name == dialog->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(dialog->name()).data() + std_to_wx(dialog.name()).data() ) ); return; } } - 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(); + 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(dialog->name())); - Config::instance()->changed (Config::CINEMAS); + _targets->SetItemText(*item, std_to_wx(dialog.name())); } @@ -434,7 +453,11 @@ ScreensPanel::remove_screen_clicked () _targets->DeleteItem(*item); } - Config::instance()->changed (Config::CINEMAS); + /* This is called by the signal on Linux, but not it seems on Windows, so we call it ourselves + * as well. + */ + selection_changed(); + notify_cinemas_changed(); } @@ -480,22 +503,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 (); @@ -505,6 +536,13 @@ ScreensPanel::search_changed () _screen_to_item.clear (); add_cinemas (); +} + + +void +ScreensPanel::search_changed () +{ + clear_and_re_add(); _ignore_selection_change = true; @@ -643,17 +681,44 @@ ScreensPanel::screen_to_item (shared_ptr screen) const } -int -ScreensPanel::compare (string const& utf8_a, string const& utf8_b) +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) { + 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(); + } +} + + +void +ScreensPanel::item_activated(wxTreeListEvent& ev) { - 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); + auto iter = _item_to_cinema.find(ev.GetItem()); + if (iter != _item_to_cinema.end()) { + edit_cinema(iter->second); } else { - return strcoll(utf8_a.c_str(), utf8_b.c_str()); + auto iter = _item_to_screen.find(ev.GetItem()); + if (iter != _item_to_screen.end()) { + edit_screen(iter->second); + } } } + +