X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=7e012b522e3212fd1ccb0198b93e9e1001c743cb;hb=e9e8951e0961564121f9c6cc4ce87555eebf9ec8;hp=ce5f2555e308a8cd6d2e75ade7cf11dc95fbdd8a;hpb=e02afbbc64a6f615e450a3c68b8900588bd21fd0;p=dcpomatic.git

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index ce5f2555e..7e012b522 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -1,169 +1,157 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "lib/config.h"
-#include "lib/cinema.h"
-#include "lib/screen.h"
 #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 "lib/cinema.h"
+#include "lib/screen.h"
+#include <boost/foreach.hpp>
 
 using std::list;
 using std::pair;
+using std::cout;
 using std::map;
+using std::string;
 using std::make_pair;
 using boost::shared_ptr;
+using boost::optional;
+using namespace dcpomatic;
 
 ScreensPanel::ScreensPanel (wxWindow* parent)
 	: wxPanel (parent, wxID_ANY)
+	, _ignore_selection_change (false)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
+	_search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (200, -1));
+	_search->ShowCancelButton (true);
+	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);
-	targets->Add (_targets, 1, wxEXPAND | wxTOP | wxRIGHT, DCPOMATIC_SIZER_GAP);
-
-	_root = _targets->AddRoot ("Foo");
+	targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
-	list<shared_ptr<Cinema> > c = Config::instance()->cinemas ();
-	for (list<shared_ptr<Cinema> >::iterator i = c.begin(); i != c.end(); ++i) {
-		add_cinema (*i);
-	}
-
-	_targets->ExpandAll ();
+	add_cinemas ();
 
 	wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
 
-	_add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
-	target_buttons->Add (_add_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-	_edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
-	target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-	_remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
-	target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-
-	_add_screen = new wxButton (this, wxID_ANY, _("Add Screen..."));
-	target_buttons->Add (_add_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-	_edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen..."));
-	target_buttons->Add (_edit_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-	_remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen"));
-	target_buttons->Add (_remove_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+	_add_cinema = new Button (this, _("Add Cinema..."));
+	target_buttons->Add (_add_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+	_edit_cinema = new Button (this, _("Edit Cinema..."));
+	target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+	_remove_cinema = new Button (this, _("Remove Cinema"));
+	target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+	_add_screen = new Button (this, _("Add Screen..."));
+	target_buttons->Add (_add_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+	_edit_screen = new Button (this, _("Edit Screen..."));
+	target_buttons->Add (_edit_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+	_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);
 
 	sizer->Add (targets, 1, wxEXPAND);
 
-	_targets->Bind       (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&ScreensPanel::selection_changed, this));
+	_search->Bind        (wxEVT_TEXT, boost::bind (&ScreensPanel::search_changed, this));
+	_targets->Bind       (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
 
-	_add_cinema->Bind    (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::add_cinema_clicked, this));
-	_edit_cinema->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::edit_cinema_clicked, this));
-	_remove_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::remove_cinema_clicked, 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));
+	_remove_cinema->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::remove_cinema_clicked, this));
 
-	_add_screen->Bind    (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::add_screen_clicked, this));
-	_edit_screen->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::edit_screen_clicked, this));
-	_remove_screen->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::remove_screen_clicked, this));
+	_add_screen->Bind    (wxEVT_BUTTON, boost::bind (&ScreensPanel::add_screen_clicked, this));
+	_edit_screen->Bind   (wxEVT_BUTTON, boost::bind (&ScreensPanel::edit_screen_clicked, this));
+	_remove_screen->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::remove_screen_clicked, this));
 
 	SetSizer (sizer);
 }
 
-list<pair<wxTreeItemId, shared_ptr<Cinema> > >
-ScreensPanel::selected_cinemas () const
+ScreensPanel::~ScreensPanel ()
 {
-	wxArrayTreeItemIds s;
-	_targets->GetSelections (s);
-
-	list<pair<wxTreeItemId, shared_ptr<Cinema> > > c;
-	for (size_t i = 0; i < s.GetCount(); ++i) {
-		map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator j = _cinemas.find (s[i]);
-		if (j != _cinemas.end ()) {
-			c.push_back (make_pair (j->first, j->second));
-		}
-	}
-
-	return c;
-}
-
-list<pair<wxTreeItemId, shared_ptr<Screen> > >
-ScreensPanel::selected_screens () const
-{
-	wxArrayTreeItemIds s;
-	_targets->GetSelections (s);
-
-	list<pair<wxTreeItemId, shared_ptr<Screen> > > c;
-	for (size_t i = 0; i < s.GetCount(); ++i) {
-		map<wxTreeItemId, shared_ptr<Screen> >::const_iterator j = _screens.find (s[i]);
-		if (j != _screens.end ()) {
-			c.push_back (make_pair (j->first, j->second));
-		}
-	}
-
-	return c;
+	_targets->Unbind (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
 }
 
 void
 ScreensPanel::setup_sensitivity ()
 {
-	bool const sc = selected_cinemas().size() == 1;
-	bool const ss = selected_screens().size() == 1;
+	bool const sc = _selected_cinemas.size() == 1;
+	bool const ss = _selected_screens.size() == 1;
 
 	_edit_cinema->Enable (sc);
-	_remove_cinema->Enable (sc);
+	_remove_cinema->Enable (_selected_cinemas.size() >= 1);
 
 	_add_screen->Enable (sc);
 	_edit_screen->Enable (ss);
-	_remove_screen->Enable (ss);
+	_remove_screen->Enable (_selected_screens.size() >= 1);
 }
 
-
 void
 ScreensPanel::add_cinema (shared_ptr<Cinema> c)
 {
+	string search = wx_to_std (_search->GetValue ());
+	transform (search.begin(), search.end(), search.begin(), ::tolower);
+
+	if (!search.empty ()) {
+		string name = c->name;
+		transform (name.begin(), name.end(), name.begin(), ::tolower);
+		if (name.find (search) == string::npos) {
+			return;
+		}
+	}
+
 	_cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c;
 
 	list<shared_ptr<Screen> > sc = c->screens ();
 	for (list<shared_ptr<Screen> >::iterator i = sc.begin(); i != sc.end(); ++i) {
 		add_screen (c, *i);
 	}
+
+	_targets->SortChildren (_root);
 }
 
-void
+optional<wxTreeItemId>
 ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
 {
-	map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator i = _cinemas.begin();
+	CinemaMap::const_iterator i = _cinemas.begin();
 	while (i != _cinemas.end() && i->second != c) {
 		++i;
 	}
 
 	if (i == _cinemas.end()) {
-		return;
+		return optional<wxTreeItemId> ();
 	}
 
 	_screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s;
-	_targets->Expand (i->first);
+	return i->first;
 }
 
 void
 ScreensPanel::add_cinema_clicked ()
 {
-	CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
+	CinemaDialog* d = new CinemaDialog (GetParent(), _("Add Cinema"));
 	if (d->ShowModal () == wxID_OK) {
-		shared_ptr<Cinema> c (new Cinema (d->name(), d->email()));
+		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);
 		add_cinema (c);
 	}
@@ -174,18 +162,24 @@ ScreensPanel::add_cinema_clicked ()
 void
 ScreensPanel::edit_cinema_clicked ()
 {
-	if (selected_cinemas().size() != 1) {
+	if (_selected_cinemas.size() != 1) {
 		return;
 	}
 
-	pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
+	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()
+		);
 
-	CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->email);
 	if (d->ShowModal () == wxID_OK) {
 		c.second->name = d->name ();
-		c.second->email = d->email ();
+		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::instance()->changed (Config::CINEMAS);
 	}
 
 	d->Destroy ();
@@ -194,35 +188,50 @@ ScreensPanel::edit_cinema_clicked ()
 void
 ScreensPanel::remove_cinema_clicked ()
 {
-	if (selected_cinemas().size() != 1) {
-		return;
+	for (CinemaMap::iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
+		Config::instance()->remove_cinema (i->second);
+		_targets->Delete (i->first);
 	}
 
-	pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
-
-	Config::instance()->remove_cinema (c.second);
-	_targets->Delete (c.first);
+	selection_changed ();
 }
 
 void
 ScreensPanel::add_screen_clicked ()
 {
-	if (selected_cinemas().size() != 1) {
+	if (_selected_cinemas.size() != 1) {
 		return;
 	}
 
-	shared_ptr<Cinema> c = selected_cinemas().front().second;
+	shared_ptr<Cinema> c = _selected_cinemas.begin()->second;
 
-	ScreenDialog* d = new ScreenDialog (this, "Add Screen");
+	ScreenDialog* d = new ScreenDialog (GetParent(), _("Add Screen"));
 	if (d->ShowModal () != wxID_OK) {
+		d->Destroy ();
 		return;
 	}
 
-	shared_ptr<Screen> s (new Screen (d->name(), d->certificate()));
+	BOOST_FOREACH (shared_ptr<Screen> i, c->screens ()) {
+		if (i->name == d->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()
+					)
+				);
+			return;
+		}
+	}
+
+	shared_ptr<Screen> s (new Screen (d->name(), d->recipient(), d->trusted_devices()));
 	c->add_screen (s);
-	add_screen (c, s);
+	optional<wxTreeItemId> id = add_screen (c, s);
+	if (id) {
+		_targets->Expand (id.get ());
+	}
 
-	Config::instance()->changed ();
+	Config::instance()->changed (Config::CINEMAS);
 
 	d->Destroy ();
 }
@@ -230,48 +239,65 @@ ScreensPanel::add_screen_clicked ()
 void
 ScreensPanel::edit_screen_clicked ()
 {
-	if (selected_screens().size() != 1) {
+	if (_selected_screens.size() != 1) {
 		return;
 	}
 
-	pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+	pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
 
-	ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->certificate);
-	if (d->ShowModal () == wxID_OK) {
-		s.second->name = d->name ();
-		s.second->certificate = d->certificate ();
-		_targets->SetItemText (s.first, std_to_wx (d->name()));
-		Config::instance()->changed ();
+	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 ();
+		return;
+	}
+
+	shared_ptr<Cinema> c = s.second->cinema;
+	BOOST_FOREACH (shared_ptr<Screen> i, c->screens ()) {
+		if (i != s.second && i->name == d->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()
+					)
+				);
+			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);
+
 	d->Destroy ();
 }
 
 void
 ScreensPanel::remove_screen_clicked ()
 {
-	if (selected_screens().size() != 1) {
-		return;
-	}
-
-	pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+	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;
+		}
 
-	map<wxTreeItemId, shared_ptr<Cinema> >::iterator i = _cinemas.begin ();
-	while (i != _cinemas.end ()) {
-		list<shared_ptr<Screen> > sc = i->second->screens ();
-		if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
-			break;
+		if (j == _cinemas.end()) {
+			continue;
 		}
-	}
 
-	if (i == _cinemas.end()) {
-		return;
+		j->second->remove_screen (i->second);
+		_targets->Delete (i->first);
 	}
 
-	i->second->remove_screen (s.second);
-	_targets->Delete (s.first);
-
-	Config::instance()->changed ();
+	Config::instance()->changed (Config::CINEMAS);
 }
 
 list<shared_ptr<Screen> >
@@ -279,16 +305,14 @@ ScreensPanel::screens () const
 {
 	list<shared_ptr<Screen> > s;
 
-	list<pair<wxTreeItemId, shared_ptr<Cinema> > > cinemas = selected_cinemas ();
-	for (list<pair<wxTreeItemId, shared_ptr<Cinema> > >::iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
+	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);
 		}
 	}
 
-	list<pair<wxTreeItemId, shared_ptr<Screen> > > screens = selected_screens ();
-	for (list<pair<wxTreeItemId, shared_ptr<Screen> > >::iterator i = screens.begin(); i != screens.end(); ++i) {
+	for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
 		s.push_back (i->second);
 	}
 
@@ -298,9 +322,83 @@ ScreensPanel::screens () const
 	return s;
 }
 
+void
+ScreensPanel::selection_changed_shim (wxTreeEvent &)
+{
+	selection_changed ();
+}
+
 void
 ScreensPanel::selection_changed ()
 {
+	if (_ignore_selection_change) {
+		return;
+	}
+
+	wxArrayTreeItemIds s;
+	_targets->GetSelections (s);
+
+	_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;
+		}
+		ScreenMap::const_iterator k = _screens.find (s[i]);
+		if (k != _screens.end ()) {
+			_selected_screens[k->first] = k->second;
+		}
+	}
+
 	setup_sensitivity ();
 	ScreensChanged ();
 }
+
+void
+ScreensPanel::add_cinemas ()
+{
+	_root = _targets->AddRoot ("Foo");
+
+	BOOST_FOREACH (shared_ptr<Cinema> i, Config::instance()->cinemas ()) {
+		add_cinema (i);
+	}
+}
+
+void
+ScreensPanel::search_changed ()
+{
+	_targets->DeleteAllItems ();
+	_cinemas.clear ();
+	_screens.clear ();
+
+	add_cinemas ();
+
+	_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;
+		}
+
+		if (j != _cinemas.end ()) {
+			_targets->SelectItem (j->first);
+		}
+	}
+
+	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;
+		}
+
+		if (j != _screens.end ()) {
+			_targets->SelectItem (j->first);
+		}
+	}
+
+	_ignore_selection_change = false;
+}