#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 <unicode/putil.h>
-#include <unicode/ucol.h>
-#include <unicode/uiter.h>
-#include <unicode/utypes.h>
-#include <unicode/ustring.h>
using std::cout;
+using std::list;
using std::make_pair;
using std::make_shared;
using std::map;
using std::string;
using std::vector;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
_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));
}
{
_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);
- }
}
}
+void
+ScreensPanel::convert_to_lower(string& s)
+{
+ transform(s.begin(), s.end(), s.begin(), ::tolower);
+}
+
+
+bool
+ScreensPanel::matches_search(shared_ptr<const Cinema> 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<wxTreeListItem>
ScreensPanel::add_cinema (shared_ptr<Cinema> 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));
void
ScreensPanel::add_cinema_clicked ()
{
- auto d = new CinemaDialog (GetParent(), _("Add Cinema"));
- if (d->ShowModal () == wxID_OK) {
- auto cinema = make_shared<Cinema>(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<Cinema>(dialog->name(), dialog->emails(), dialog->notes(), dialog->utc_offset_hour(), dialog->utc_offset_minute());
- auto cinemas = Config::instance()->cinemas();
- cinemas.sort(
- [this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return compare(a->name, b->name) < 0; }
- );
+ auto cinemas = sorted_cinemas();
- optional<wxTreeListItem> 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 search = wx_to_std(_search->GetValue());
+ convert_to_lower(search);
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 (!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);
}
- d->Destroy ();
+ selection_changed ();
}
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 ();
}
}
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);
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<Screen>(d->name(), d->notes(), d->recipient(), d->recipient_file(), d->trusted_devices());
+ auto screen = std::make_shared<Screen>(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 ();
}
auto edit_screen = _selected_screens[0];
- auto d = new ScreenDialog (
+ auto dialog = new ScreenDialog(
GetParent(), _("Edit screen"),
edit_screen->name,
edit_screen->notes,
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()));
}
_targets->DeleteItem(*item);
}
- Config::instance()->changed (Config::CINEMAS);
+ notify_cinemas_changed();
}
}
-void
-ScreensPanel::add_cinemas ()
+list<shared_ptr<Cinema>>
+ScreensPanel::sorted_cinemas() const
{
auto cinemas = Config::instance()->cinemas();
+
cinemas.sort(
- [this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return compare(a->name, b->name) < 0; }
+ [this](shared_ptr<Cinema> a, shared_ptr<Cinema> 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 ();
_screen_to_item.clear ();
add_cinemas ();
+}
+
+
+void
+ScreensPanel::search_changed ()
+{
+ clear_and_re_add();
_ignore_selection_change = true;
}
-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<uint16_t> utf16_a(new uint16_t[utf8_a.size() + 1]);
- u_strFromUTF8(reinterpret_cast<UChar*>(utf16_a.get()), utf8_a.size() + 1, nullptr, utf8_a.c_str(), -1, &error);
- boost::scoped_array<uint16_t> utf16_b(new uint16_t[utf8_b.size() + 1]);
- u_strFromUTF8(reinterpret_cast<UChar*>(utf16_b.get()), utf8_b.size() + 1, nullptr, utf8_b.c_str(), -1, &error);
- return ucol_strcoll(_collator, reinterpret_cast<UChar*>(utf16_a.get()), -1, reinterpret_cast<UChar*>(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();
}
}