/*
- 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::map;
using std::string;
using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
+using boost::optional;
+using namespace dcpomatic;
ScreensPanel::ScreensPanel (wxWindow* parent)
: wxPanel (parent, wxID_ANY)
{
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
- _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (200, -1));
+#ifdef __WXGTK3__
+ int const height = 30;
+#else
+ int const height = -1;
+#endif
+
+ _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, 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);
add_cinemas ();
- _targets->ExpandAll ();
-
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);
- _search->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreensPanel::search_changed, this));
- _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, &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);
}
ScreensPanel::~ScreensPanel ()
{
- _targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this);
+ _targets->Unbind (wxEVT_TREE_SEL_CHANGED, &ScreensPanel::selection_changed_shim, this);
}
void
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
+
+optional<wxTreeItemId>
ScreensPanel::add_cinema (shared_ptr<Cinema> c)
{
string search = wx_to_std (_search->GetValue ());
string name = c->name;
transform (name.begin(), name.end(), name.begin(), ::tolower);
if (name.find (search) == string::npos) {
- return;
+ return optional<wxTreeItemId>();
}
}
- _cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c;
+ wxTreeItemId id = _targets->AppendItem(_root, std_to_wx(c->name));
+
+ _cinemas[id] = 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);
+ BOOST_FOREACH (shared_ptr<Screen> i, c->screens()) {
+ add_screen (c, i);
}
_targets->SortChildren (_root);
+
+ return id;
}
-void
+
+optional<wxTreeItemId>
ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
{
CinemaMap::const_iterator i = _cinemas.begin();
}
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->emails()));
+ 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);
+ optional<wxTreeItemId> id = add_cinema (c);
+ if (id) {
+ _targets->Unselect ();
+ _targets->SelectItem (*id);
+ }
}
d->Destroy ();
pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
- CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->emails);
+ 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()
+ );
+
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::instance()->changed (Config::CINEMAS);
}
d->Destroy ();
void
ScreensPanel::remove_cinema_clicked ()
{
- if (_selected_cinemas.size() != 1) {
- return;
+ 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)))) {
+ return;
+ }
+ } else {
+ if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove %d cinemas?"), int(_selected_cinemas.size())))) {
+ return;
+ }
}
- pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
+ for (CinemaMap::iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
+ Config::instance()->remove_cinema (i->second);
+ _targets->Delete (i->first);
+ }
- Config::instance()->remove_cinema (c.second);
- _targets->Delete (c.first);
+ selection_changed ();
}
void
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);
- 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 ();
}
pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
- ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->recipient, s.second->trusted_devices);
- if (d->ShowModal () == wxID_OK) {
- s.second->name = d->name ();
- 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 ();
}
void
ScreensPanel::remove_screen_clicked ()
{
- if (_selected_screens.size() != 1) {
- return;
+ 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)))) {
+ return;
+ }
+ } else {
+ if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove %d screens?"), int(_selected_screens.size())))) {
+ return;
+ }
}
- pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
+ 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;
+ }
- CinemaMap::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;
+ ++j;
}
- ++i;
- }
+ 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> >
}
void
-ScreensPanel::selection_changed (wxTreeEvent &)
+ScreensPanel::selection_changed_shim (wxTreeEvent &)
+{
+ selection_changed ();
+}
+
+void
+ScreensPanel::selection_changed ()
{
if (_ignore_selection_change) {
return;
projects / dcpomatic.git / blobdiff