X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=8db7a10355f14400e806baa134cf8acd18f17dde;hp=000a85128a342aeeed535e3d96ee79ed0cb13a28;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hpb=5ece03888d29137a6bd78c3781bc04b4f2fc0d89

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 000a85128..8db7a1035 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,14 @@
 
 */
 
-#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;
@@ -35,6 +36,7 @@ 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)
@@ -54,40 +56,40 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
 	wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
 
-	_add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
+	_add_cinema = new Button (this, _("Add Cinema..."));
 	target_buttons->Add (_add_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-	_edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
+	_edit_cinema = new Button (this, _("Edit Cinema..."));
 	target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-	_remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
+	_remove_cinema = new Button (this, _("Remove Cinema"));
 	target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-	_add_screen = new wxButton (this, wxID_ANY, _("Add Screen..."));
+	_add_screen = new Button (this, _("Add Screen..."));
 	target_buttons->Add (_add_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-	_edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen..."));
+	_edit_screen = new Button (this, _("Edit Screen..."));
 	target_buttons->Add (_edit_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-	_remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen"));
+	_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);
 
-	_search->Bind        (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreensPanel::search_changed, this));
-	_targets->Bind       (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, 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);
 }
 
 ScreensPanel::~ScreensPanel ()
 {
-	_targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
+	_targets->Unbind (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
 }
 
 void
@@ -167,7 +169,7 @@ ScreensPanel::edit_cinema_clicked ()
 	pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
 
 	CinemaDialog* d = new CinemaDialog (
-		this, _("Edit cinema"), c.second->name, c.second->emails, c.second->notes, c.second->utc_offset_hour(), c.second->utc_offset_minute()
+		GetParent(), _("Edit cinema"), c.second->name, c.second->emails, c.second->notes, c.second->utc_offset_hour(), c.second->utc_offset_minute()
 		);
 
 	if (d->ShowModal () == wxID_OK) {
@@ -177,7 +179,7 @@ ScreensPanel::edit_cinema_clicked ()
 		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 ();
@@ -203,19 +205,33 @@ ScreensPanel::add_screen_clicked ()
 
 	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->recipient(), d->trusted_devices()));
+	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->notes(), d->recipient(), d->trusted_devices()));
 	c->add_screen (s);
 	optional<wxTreeItemId> id = add_screen (c, s);
 	if (id) {
 		_targets->Expand (id.get ());
 	}
 
-	Config::instance()->changed ();
+	Config::instance()->changed (Config::CINEMAS);
 
 	d->Destroy ();
 }
@@ -229,16 +245,33 @@ ScreensPanel::edit_screen_clicked ()
 
 	pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
 
-	ScreenDialog* d = new ScreenDialog (this, _("Edit screen"), s.second->name, s.second->notes, s.second->recipient, s.second->trusted_devices);
-	if (d->ShowModal () == wxID_OK) {
-		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 ();
+	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 ();
 }
 
@@ -264,7 +297,7 @@ ScreensPanel::remove_screen_clicked ()
 		_targets->Delete (i->first);
 	}
 
-	Config::instance()->changed ();
+	Config::instance()->changed (Config::CINEMAS);
 }
 
 list<shared_ptr<Screen> >