X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=6c5b28b8d0fdd048449ce2c0e3a0bdfc8994d3a3;hp=d39b6688d63fb9dbb8ee246ed960a7c76ec50760;hb=da13c2af9e8f19229061ca1939cbe8bd37c72eba;hpb=1f8ea79b8966a51dbbccd70e19adcd39fb1bd54c

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index d39b6688d..6c5b28b8d 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,52 +18,58 @@
 
 */
 
-#include "screens_panel.h"
-#include "wx_util.h"
+
 #include "cinema_dialog.h"
-#include "screen_dialog.h"
 #include "dcpomatic_button.h"
-#include "lib/config.h"
+#include "screen_dialog.h"
+#include "screens_panel.h"
+#include "wx_util.h"
 #include "lib/cinema.h"
+#include "lib/config.h"
+#include "lib/scope_guard.h"
 #include "lib/screen.h"
-#include <boost/foreach.hpp>
+#include "lib/timer.h"
+
 
-using std::list;
-using std::pair;
 using std::cout;
+using std::list;
+using std::make_pair;
+using std::make_shared;
 using std::map;
+using std::pair;
+using std::shared_ptr;
 using std::string;
-using std::make_pair;
-using boost::shared_ptr;
+using std::vector;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
+
 ScreensPanel::ScreensPanel (wxWindow* parent)
 	: wxPanel (parent, wxID_ANY)
-	, _ignore_selection_change (false)
 {
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
 
-#ifdef __WXGTK3__
-	int const height = 30;
-#else
-	int const height = -1;
-#endif
-
-	_search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, height));
+	_search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height()));
 #ifndef __WXGTK3__
 	/* The cancel button seems to be strangely broken in GTK3; clicking on it twice sometimes works */
 	_search->ShowCancelButton (true);
 #endif
 	sizer->Add (_search, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP);
 
-	wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL);
-	_targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT);
+	auto targets = new wxBoxSizer (wxHORIZONTAL);
+	_targets = new wxTreeListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_MULTIPLE | wxTL_3STATE | wxTL_NO_HEADER);
+	_targets->AppendColumn (wxT("foo"));
+
 	targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
 	add_cinemas ();
 
-	wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
+	auto side_buttons = new wxBoxSizer (wxVERTICAL);
+
+	auto target_buttons = new wxBoxSizer (wxVERTICAL);
 
 	_add_cinema = new Button (this, _("Add Cinema..."));
 	target_buttons->Add (_add_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
@@ -78,12 +84,25 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 	_remove_screen = new Button (this, _("Remove Screen"));
 	target_buttons->Add (_remove_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 
-	targets->Add (target_buttons, 0, 0);
+	side_buttons->Add (target_buttons, 0, 0);
+
+	auto check_buttons = new wxBoxSizer (wxVERTICAL);
+
+	_check_all = new Button (this, _("Check all"));
+	check_buttons->Add (_check_all, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+	_uncheck_all = new Button (this, _("Uncheck all"));
+	check_buttons->Add (_uncheck_all, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+
+	side_buttons->Add (check_buttons, 1, wxEXPAND | wxTOP, DCPOMATIC_BUTTON_STACK_GAP * 8);
+
+	targets->Add (side_buttons, 0, 0);
 
 	sizer->Add (targets, 1, wxEXPAND);
 
 	_search->Bind        (wxEVT_TEXT, boost::bind (&ScreensPanel::search_changed, this));
-	_targets->Bind       (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, 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));
@@ -93,121 +112,216 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 	_edit_screen->Bind   (wxEVT_BUTTON, boost::bind (&ScreensPanel::edit_screen_clicked, this));
 	_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));
+
 	SetSizer (sizer);
+
+	_config_connection = Config::instance()->Changed.connect(boost::bind(&ScreensPanel::config_changed, this, _1));
 }
 
+
 ScreensPanel::~ScreensPanel ()
 {
-	_targets->Unbind (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
+	_targets->Unbind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this);
+	_targets->Unbind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, this);
+}
+
+
+void
+ScreensPanel::check_all ()
+{
+	for (auto cinema = _targets->GetFirstChild(_targets->GetRootItem()); cinema.IsOk();  cinema = _targets->GetNextSibling(cinema)) {
+		_targets->CheckItem(cinema, wxCHK_CHECKED);
+		for (auto screen = _targets->GetFirstChild(cinema); screen.IsOk(); screen = _targets->GetNextSibling(screen)) {
+			_targets->CheckItem(screen, wxCHK_CHECKED);
+			set_screen_checked(screen, true);
+		}
+	}
+}
+
+
+void
+ScreensPanel::uncheck_all ()
+{
+	for (auto cinema = _targets->GetFirstChild(_targets->GetRootItem()); cinema.IsOk();  cinema = _targets->GetNextSibling(cinema)) {
+		_targets->CheckItem(cinema, wxCHK_UNCHECKED);
+		for (auto screen = _targets->GetFirstChild(cinema); screen.IsOk(); screen = _targets->GetNextSibling(screen)) {
+			_targets->CheckItem(screen, wxCHK_UNCHECKED);
+			set_screen_checked(screen, false);
+		}
+	}
 }
 
+
 void
 ScreensPanel::setup_sensitivity ()
 {
 	bool const sc = _selected_cinemas.size() == 1;
 	bool const ss = _selected_screens.size() == 1;
 
-	_edit_cinema->Enable (sc);
+	_edit_cinema->Enable (sc || ss);
 	_remove_cinema->Enable (_selected_cinemas.size() >= 1);
 
-	_add_screen->Enable (sc);
+	_add_screen->Enable (sc || ss);
 	_edit_screen->Enable (ss);
 	_remove_screen->Enable (_selected_screens.size() >= 1);
 }
 
 
-optional<wxTreeItemId>
-ScreensPanel::add_cinema (shared_ptr<Cinema> c)
+void
+ScreensPanel::convert_to_lower(string& s)
 {
-	string search = wx_to_std (_search->GetValue ());
-	transform (search.begin(), search.end(), search.begin(), ::tolower);
+	transform(s.begin(), s.end(), s.begin(), ::tolower);
+}
 
-	if (!search.empty ()) {
-		string name = c->name;
-		transform (name.begin(), name.end(), name.begin(), ::tolower);
-		if (name.find (search) == string::npos) {
-			return optional<wxTreeItemId>();
-		}
+
+bool
+ScreensPanel::matches_search(shared_ptr<const Cinema> cinema, string search)
+{
+	if (search.empty()) {
+		return true;
 	}
 
-	wxTreeItemId id = _targets->AppendItem(_root, std_to_wx(c->name));
+	return _collator.find(search, cinema->name);
+}
 
-	_cinemas[id] = c;
 
-	BOOST_FOREACH (shared_ptr<Screen> i, c->screens()) {
-		add_screen (c, i);
+optional<wxTreeListItem>
+ScreensPanel::add_cinema (shared_ptr<Cinema> cinema, wxTreeListItem previous)
+{
+	auto const search = wx_to_std(_search->GetValue());
+	if (!matches_search(cinema, search)) {
+		return {};
 	}
 
-	_targets->SortChildren (_root);
+	auto id = _targets->InsertItem(_targets->GetRootItem(), previous, std_to_wx(cinema->name));
+
+	_item_to_cinema[id] = cinema;
+	_cinema_to_item[cinema] = id;
+
+	for (auto screen: cinema->screens()) {
+		add_screen (cinema, screen);
+	}
 
 	return id;
 }
 
 
-optional<wxTreeItemId>
-ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
+optional<wxTreeListItem>
+ScreensPanel::add_screen (shared_ptr<Cinema> cinema, shared_ptr<Screen> screen)
 {
-	CinemaMap::const_iterator i = _cinemas.begin();
-	while (i != _cinemas.end() && i->second != c) {
-		++i;
+	auto item = cinema_to_item(cinema);
+	if (!item) {
+		return {};
 	}
 
-	if (i == _cinemas.end()) {
-		return optional<wxTreeItemId> ();
-	}
+	auto id = _targets->AppendItem(*item, std_to_wx(screen->name));
 
-	_screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s;
-	return i->first;
+	_item_to_screen[id] = screen;
+	_screen_to_item[screen] = id;
+
+	return item;
 }
 
+
 void
 ScreensPanel::add_cinema_clicked ()
 {
-	CinemaDialog* d = new CinemaDialog (GetParent(), _("Add Cinema"));
-	if (d->ShowModal () == wxID_OK) {
-		shared_ptr<Cinema> c (new Cinema (d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()));
-		Config::instance()->add_cinema (c);
-		optional<wxTreeItemId> id = add_cinema (c);
-		if (id) {
-			_targets->Unselect ();
-			_targets->SelectItem (*id);
+	CinemaDialog dialog(GetParent(), _("Add Cinema"));
+
+	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 = 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;
+		}
+
+		wxTreeListItem previous = wxTLI_FIRST;
+		bool found = false;
+		auto const search = wx_to_std(_search->GetValue());
+		for (auto existing_cinema: cinemas) {
+			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;
+		}
+
+		auto item = add_cinema(cinema, found ? previous : wxTLI_LAST);
+
+		if (item) {
+			_targets->UnselectAll ();
+			_targets->Select (*item);
 		}
 	}
 
-	d->Destroy ();
+	selection_changed ();
 }
 
+
+shared_ptr<Cinema>
+ScreensPanel::cinema_for_operation () const
+{
+	if (_selected_cinemas.size() == 1) {
+		return _selected_cinemas[0];
+	} else if (_selected_screens.size() == 1) {
+		return _selected_screens[0]->cinema;
+	}
+
+	return {};
+}
+
+
 void
 ScreensPanel::edit_cinema_clicked ()
 {
-	if (_selected_cinemas.size() != 1) {
-		return;
+	auto cinema = cinema_for_operation ();
+	if (cinema) {
+		edit_cinema(cinema);
 	}
+}
 
-	pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
 
-	CinemaDialog* d = new CinemaDialog (
-		GetParent(), _("Edit cinema"), c.second->name, c.second->emails, c.second->notes, c.second->utc_offset_hour(), c.second->utc_offset_minute()
+void
+ScreensPanel::edit_cinema(shared_ptr<Cinema> cinema)
+{
+	CinemaDialog dialog(
+		GetParent(), _("Edit cinema"), cinema->name, cinema->emails, cinema->notes, cinema->utc_offset_hour(), cinema->utc_offset_minute()
 		);
 
-	if (d->ShowModal () == wxID_OK) {
-		c.second->name = d->name ();
-		c.second->emails = d->emails ();
-		c.second->notes = d->notes ();
-		c.second->set_utc_offset_hour (d->utc_offset_hour ());
-		c.second->set_utc_offset_minute (d->utc_offset_minute ());
-		_targets->SetItemText (c.first, std_to_wx (d->name()));
-		Config::instance()->changed (Config::CINEMAS);
+	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()));
 	}
-
-	d->Destroy ();
 }
 
+
 void
 ScreensPanel::remove_cinema_clicked ()
 {
 	if (_selected_cinemas.size() == 1) {
-		if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the cinema '%s'?"), std_to_wx(_selected_cinemas.begin()->second->name)))) {
+		if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the cinema '%s'?"), std_to_wx(_selected_cinemas[0]->name)))) {
 			return;
 		}
 	} else {
@@ -216,98 +330,114 @@ ScreensPanel::remove_cinema_clicked ()
 		}
 	}
 
-	for (CinemaMap::iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
-		Config::instance()->remove_cinema (i->second);
-		_targets->Delete (i->first);
+	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);
+		_targets->DeleteItem(*item);
 	}
 
 	selection_changed ();
 }
 
+
 void
 ScreensPanel::add_screen_clicked ()
 {
-	if (_selected_cinemas.size() != 1) {
+	auto cinema = cinema_for_operation ();
+	if (!cinema) {
 		return;
 	}
 
-	shared_ptr<Cinema> c = _selected_cinemas.begin()->second;
+	ScreenDialog dialog(GetParent(), _("Add Screen"));
 
-	ScreenDialog* d = new ScreenDialog (GetParent(), _("Add Screen"));
-	if (d->ShowModal () != wxID_OK) {
-		d->Destroy ();
+	if (dialog.ShowModal () != wxID_OK) {
 		return;
 	}
 
-	BOOST_FOREACH (shared_ptr<Screen> i, c->screens ()) {
-		if (i->name == d->name()) {
+	for (auto screen: cinema->screens()) {
+		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;
 		}
 	}
 
-	shared_ptr<Screen> s (new Screen (d->name(), d->notes(), d->recipient(), d->trusted_devices()));
-	c->add_screen (s);
-	optional<wxTreeItemId> id = add_screen (c, s);
+	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 ();
 }
 
+
 void
 ScreensPanel::edit_screen_clicked ()
 {
-	if (_selected_screens.size() != 1) {
-		return;
+	if (_selected_screens.size() == 1) {
+		edit_screen(_selected_screens[0]);
 	}
+}
+
 
-	pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
+void
+ScreensPanel::edit_screen(shared_ptr<Screen> edit_screen)
+{
+	ScreenDialog dialog(
+		GetParent(), _("Edit screen"),
+		edit_screen->name,
+		edit_screen->notes,
+		edit_screen->recipient,
+		edit_screen->recipient_file,
+		edit_screen->trusted_devices
+		);
 
-	ScreenDialog* d = new ScreenDialog (GetParent(), _("Edit screen"), s.second->name, s.second->notes, s.second->recipient, s.second->trusted_devices);
-	if (d->ShowModal () != wxID_OK) {
-		d->Destroy ();
+	if (dialog.ShowModal() != wxID_OK) {
 		return;
 	}
 
-	shared_ptr<Cinema> c = s.second->cinema;
-	BOOST_FOREACH (shared_ptr<Screen> i, c->screens ()) {
-		if (i != s.second && i->name == d->name()) {
+	auto cinema = edit_screen->cinema;
+	for (auto screen: cinema->screens()) {
+		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;
 		}
 	}
 
-	s.second->name = d->name ();
-	s.second->notes = d->notes ();
-	s.second->recipient = d->recipient ();
-	s.second->trusted_devices = d->trusted_devices ();
-	_targets->SetItemText (s.first, std_to_wx (d->name()));
-	Config::instance()->changed (Config::CINEMAS);
+	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();
 
-	d->Destroy ();
+	auto item = screen_to_item(edit_screen);
+	DCPOMATIC_ASSERT (item);
+	_targets->SetItemText(*item, std_to_wx(dialog.name()));
 }
 
+
 void
 ScreensPanel::remove_screen_clicked ()
 {
 	if (_selected_screens.size() == 1) {
-		if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the screen '%s'?"), std_to_wx(_selected_screens.begin()->second->name)))) {
+		if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the screen '%s'?"), std_to_wx(_selected_screens[0]->name)))) {
 			return;
 		}
 	} else {
@@ -316,56 +446,37 @@ ScreensPanel::remove_screen_clicked ()
 		}
 	}
 
-	for (ScreenMap::iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
-		CinemaMap::iterator j = _cinemas.begin ();
-		while (j != _cinemas.end ()) {
-			list<shared_ptr<Screen> > sc = j->second->screens ();
-			if (find (sc.begin(), sc.end(), i->second) != sc.end ()) {
-				break;
-			}
-
-			++j;
-		}
-
-		if (j == _cinemas.end()) {
-			continue;
-		}
-
-		j->second->remove_screen (i->second);
-		_targets->Delete (i->first);
+	for (auto const& screen: _selected_screens) {
+		screen->cinema->remove_screen(screen);
+		auto item = screen_to_item(screen);
+		DCPOMATIC_ASSERT(item);
+		_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();
 }
 
-list<shared_ptr<Screen> >
+
+vector<shared_ptr<Screen>>
 ScreensPanel::screens () const
 {
-	list<shared_ptr<Screen> > s;
-
-	for (CinemaMap::const_iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
-		list<shared_ptr<Screen> > sc = i->second->screens ();
-		for (list<shared_ptr<Screen> >::const_iterator j = sc.begin(); j != sc.end(); ++j) {
-			s.push_back (*j);
-		}
-	}
-
-	for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
-		s.push_back (i->second);
-	}
-
-	s.sort ();
-	s.unique ();
-
-	return s;
+	vector<shared_ptr<Screen>> output;
+	std::copy (_checked_screens.begin(), _checked_screens.end(), std::back_inserter(output));
+	return output;
 }
 
+
 void
-ScreensPanel::selection_changed_shim (wxTreeEvent &)
+ScreensPanel::selection_changed_shim (wxTreeListEvent &)
 {
 	selection_changed ();
 }
 
+
 void
 ScreensPanel::selection_changed ()
 {
@@ -373,70 +484,241 @@ ScreensPanel::selection_changed ()
 		return;
 	}
 
-	wxArrayTreeItemIds s;
-	_targets->GetSelections (s);
+	wxTreeListItems selection;
+	_targets->GetSelections (selection);
 
 	_selected_cinemas.clear ();
 	_selected_screens.clear ();
 
-	for (size_t i = 0; i < s.GetCount(); ++i) {
-		CinemaMap::const_iterator j = _cinemas.find (s[i]);
-		if (j != _cinemas.end ()) {
-			_selected_cinemas[j->first] = j->second;
+	for (size_t i = 0; i < selection.size(); ++i) {
+		if (auto cinema = item_to_cinema(selection[i])) {
+			_selected_cinemas.push_back(cinema);
 		}
-		ScreenMap::const_iterator k = _screens.find (s[i]);
-		if (k != _screens.end ()) {
-			_selected_screens[k->first] = k->second;
+		if (auto screen = item_to_screen(selection[i])) {
+			_selected_screens.push_back(screen);
 		}
 	}
 
 	setup_sensitivity ();
-	ScreensChanged ();
 }
 
+
+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 _collator.compare(a->name, b->name) < 0; }
+		);
+
+	return cinemas;
+}
+
+
 void
 ScreensPanel::add_cinemas ()
 {
-	_root = _targets->AddRoot ("Foo");
-
-	BOOST_FOREACH (shared_ptr<Cinema> i, Config::instance()->cinemas ()) {
-		add_cinema (i);
+	for (auto cinema: sorted_cinemas()) {
+		add_cinema (cinema, wxTLI_LAST);
 	}
 }
 
+
 void
-ScreensPanel::search_changed ()
+ScreensPanel::clear_and_re_add()
 {
 	_targets->DeleteAllItems ();
-	_cinemas.clear ();
-	_screens.clear ();
+
+	_item_to_cinema.clear ();
+	_cinema_to_item.clear ();
+	_item_to_screen.clear ();
+	_screen_to_item.clear ();
 
 	add_cinemas ();
+}
+
+
+void
+ScreensPanel::search_changed ()
+{
+	clear_and_re_add();
 
 	_ignore_selection_change = true;
 
-	for (CinemaMap::const_iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
-		/* The wxTreeItemIds will now be different, so we must search by cinema */
-		CinemaMap::const_iterator j = _cinemas.begin ();
-		while (j != _cinemas.end() && j->second != i->second) {
-			++j;
+	for (auto const& selection: _selected_cinemas) {
+		if (auto item = cinema_to_item(selection)) {
+			_targets->Select (*item);
 		}
+	}
 
-		if (j != _cinemas.end ()) {
-			_targets->SelectItem (j->first);
+	for (auto const& selection: _selected_screens) {
+		if (auto item = screen_to_item(selection)) {
+			_targets->Select (*item);
 		}
 	}
 
-	for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
-		ScreenMap::const_iterator j = _screens.begin ();
-		while (j != _screens.end() && j->second != i->second) {
-			++j;
+	_ignore_selection_change = false;
+
+	_ignore_check_change = true;
+
+	for (auto const& checked: _checked_screens) {
+		if (auto item = screen_to_item(checked)) {
+			_targets->CheckItem(*item, wxCHK_CHECKED);
+			setup_cinema_checked_state(*item);
 		}
+	}
+
+	_ignore_check_change = false;
+}
+
+
+void
+ScreensPanel::set_screen_checked (wxTreeListItem item, bool checked)
+{
+	auto screen = item_to_screen(item);
+	DCPOMATIC_ASSERT(screen);
+	if (checked) {
+		_checked_screens.insert(screen);
+	} else {
+		_checked_screens.erase(screen);
+	}
+}
+
 
-		if (j != _screens.end ()) {
-			_targets->SelectItem (j->first);
+void
+ScreensPanel::setup_cinema_checked_state (wxTreeListItem screen)
+{
+	auto cinema = _targets->GetItemParent(screen);
+	DCPOMATIC_ASSERT (cinema.IsOk());
+	int checked = 0;
+	int unchecked = 0;
+	for (auto child = _targets->GetFirstChild(cinema); child.IsOk(); child = _targets->GetNextSibling(child)) {
+		if (_targets->GetCheckedState(child) == wxCHK_CHECKED) {
+		    ++checked;
+		} else {
+		    ++unchecked;
 		}
 	}
+	if (checked == 0) {
+		_targets->CheckItem(cinema, wxCHK_UNCHECKED);
+	} else if (unchecked == 0) {
+		_targets->CheckItem(cinema, wxCHK_CHECKED);
+	} else {
+		_targets->CheckItem(cinema, wxCHK_UNDETERMINED);
+	}
+}
 
-	_ignore_selection_change = false;
+
+void
+ScreensPanel::checkbox_changed (wxTreeListEvent& ev)
+{
+	if (_ignore_check_change) {
+		return;
+	}
+
+	if (item_to_cinema(ev.GetItem())) {
+		/* Cinema: check/uncheck all children */
+		auto const checked = _targets->GetCheckedState(ev.GetItem());
+		for (auto child = _targets->GetFirstChild(ev.GetItem()); child.IsOk(); child = _targets->GetNextSibling(child)) {
+			_targets->CheckItem(child, checked);
+			set_screen_checked(child, checked);
+		}
+	} else {
+		set_screen_checked(ev.GetItem(), _targets->GetCheckedState(ev.GetItem()));
+		setup_cinema_checked_state(ev.GetItem());
+	}
+
+	ScreensChanged ();
+}
+
+
+shared_ptr<Cinema>
+ScreensPanel::item_to_cinema (wxTreeListItem item) const
+{
+	auto iter = _item_to_cinema.find (item);
+	if (iter == _item_to_cinema.end()) {
+		return {};
+	}
+
+	return iter->second;
+}
+
+
+shared_ptr<Screen>
+ScreensPanel::item_to_screen (wxTreeListItem item) const
+{
+	auto iter = _item_to_screen.find (item);
+	if (iter == _item_to_screen.end()) {
+		return {};
+	}
+
+	return iter->second;
+}
+
+
+optional<wxTreeListItem>
+ScreensPanel::cinema_to_item (shared_ptr<Cinema> cinema) const
+{
+	auto iter = _cinema_to_item.find (cinema);
+	if (iter == _cinema_to_item.end()) {
+		return {};
+	}
+
+	return iter->second;
+}
+
+
+optional<wxTreeListItem>
+ScreensPanel::screen_to_item (shared_ptr<Screen> screen) const
+{
+	auto iter = _screen_to_item.find (screen);
+	if (iter == _screen_to_item.end()) {
+		return {};
+	}
+
+	return iter->second;
+}
+
+
+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)
+{
+	auto iter = _item_to_cinema.find(ev.GetItem());
+	if (iter != _item_to_cinema.end()) {
+		edit_cinema(iter->second);
+	} else {
+		auto iter = _item_to_screen.find(ev.GetItem());
+		if (iter != _item_to_screen.end()) {
+			edit_screen(iter->second);
+		}
+	}
+}
+
+