Split screens panel from KDMDialog.
authorCarl Hetherington <cth@carlh.net>
Mon, 5 Oct 2015 21:56:51 +0000 (22:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 9 Oct 2015 12:44:47 +0000 (13:44 +0100)
src/wx/kdm_dialog.cc
src/wx/kdm_dialog.h
src/wx/screens_panel.cc [new file with mode: 0644]
src/wx/screens_panel.h [new file with mode: 0644]
src/wx/wscript

index f6baecdf2826d06de594e1bd02f424477d963c7d..83648080871cab300bbb8a45322a34d0d8ad54a1 100644 (file)
@@ -21,6 +21,7 @@
 #include "cinema_dialog.h"
 #include "screen_dialog.h"
 #include "wx_util.h"
+#include "screens_panel.h"
 #include "lib/cinema.h"
 #include "lib/config.h"
 #include "lib/film.h"
@@ -57,45 +58,12 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
        wxFont subheading_font (*wxNORMAL_FONT);
        subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
-
        /* Sub-heading: Screens */
        wxStaticText* h = new wxStaticText (this, wxID_ANY, _("Screens"));
        h->SetFont (subheading_font);
        vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL);
-
-       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");
-
-       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 ();
-
-       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);
-
-       targets->Add (target_buttons, 0, 0);
-
-       vertical->Add (targets, 1, wxEXPAND);
-
+       _screens = new ScreensPanel (this);
+       vertical->Add (_screens, 1, wxEXPAND);
 
        /* Sub-heading: Timing */
        h = new wxStaticText (this, wxID_ANY, S_("KDM|Timing"));
@@ -204,15 +172,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 
        /* Bind */
 
-       _targets->Bind       (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&KDMDialog::setup_sensitivity, this));
-
-       _add_cinema->Bind    (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::add_cinema_clicked, this));
-       _edit_cinema->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::edit_cinema_clicked, this));
-       _remove_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::remove_cinema_clicked, this));
-
-       _add_screen->Bind    (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::add_screen_clicked, this));
-       _edit_screen->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::edit_screen_clicked, this));
-       _remove_screen->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::remove_screen_clicked, this));
+       _screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this));
 
        _cpl->Bind           (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&KDMDialog::update_cpl_summary, this));
        _cpl_browse->Bind    (wxEVT_COMMAND_BUTTON_CLICKED,  boost::bind (&KDMDialog::cpl_browse_clicked, this));
@@ -227,229 +187,21 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
        overall_sizer->SetSizeHints (this);
 }
 
-list<pair<wxTreeItemId, shared_ptr<Cinema> > >
-KDMDialog::selected_cinemas () const
-{
-       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> > >
-KDMDialog::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;
-}
-
 void
 KDMDialog::setup_sensitivity ()
 {
-       bool const sc = selected_cinemas().size() == 1;
-       bool const ss = selected_screens().size() == 1;
-       bool const sd = _cpl->GetSelection() != -1;
-
-       _edit_cinema->Enable (sc);
-       _remove_cinema->Enable (sc);
+       _screens->setup_sensitivity ();
 
-       _add_screen->Enable (sc);
-       _edit_screen->Enable (ss);
-       _remove_screen->Enable (ss);
+       bool const sd = _cpl->GetSelection() != -1;
 
        wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
        if (ok) {
-               ok->Enable ((selected_cinemas().size() > 0 || selected_screens().size() > 0) && sd);
+               ok->Enable (!_screens->screens().empty() && sd);
        }
 
        _folder->Enable (_write_to->GetValue ());
 }
 
-void
-KDMDialog::add_cinema (shared_ptr<Cinema> c)
-{
-       _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);
-       }
-}
-
-void
-KDMDialog::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
-{
-       map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator i = _cinemas.begin();
-       while (i != _cinemas.end() && i->second != c) {
-               ++i;
-       }
-
-       if (i == _cinemas.end()) {
-               return;
-       }
-
-       _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s;
-       _targets->Expand (i->first);
-}
-
-void
-KDMDialog::add_cinema_clicked ()
-{
-       CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
-       if (d->ShowModal () == wxID_OK) {
-               shared_ptr<Cinema> c (new Cinema (d->name(), d->email()));
-               Config::instance()->add_cinema (c);
-               add_cinema (c);
-       }
-
-       d->Destroy ();
-}
-
-void
-KDMDialog::edit_cinema_clicked ()
-{
-       if (selected_cinemas().size() != 1) {
-               return;
-       }
-
-       pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
-
-       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 ();
-               _targets->SetItemText (c.first, std_to_wx (d->name()));
-               Config::instance()->changed ();
-       }
-
-       d->Destroy ();
-}
-
-void
-KDMDialog::remove_cinema_clicked ()
-{
-       if (selected_cinemas().size() != 1) {
-               return;
-       }
-
-       pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
-
-       Config::instance()->remove_cinema (c.second);
-       _targets->Delete (c.first);
-}
-
-void
-KDMDialog::add_screen_clicked ()
-{
-       if (selected_cinemas().size() != 1) {
-               return;
-       }
-
-       shared_ptr<Cinema> c = selected_cinemas().front().second;
-
-       ScreenDialog* d = new ScreenDialog (this, "Add Screen");
-       if (d->ShowModal () != wxID_OK) {
-               return;
-       }
-
-       shared_ptr<Screen> s (new Screen (d->name(), d->certificate()));
-       c->add_screen (s);
-       add_screen (c, s);
-
-       Config::instance()->changed ();
-
-       d->Destroy ();
-}
-
-void
-KDMDialog::edit_screen_clicked ()
-{
-       if (selected_screens().size() != 1) {
-               return;
-       }
-
-       pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
-
-       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 ();
-       }
-
-       d->Destroy ();
-}
-
-void
-KDMDialog::remove_screen_clicked ()
-{
-       if (selected_screens().size() != 1) {
-               return;
-       }
-
-       pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
-
-       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 (i == _cinemas.end()) {
-               return;
-       }
-
-       i->second->remove_screen (s.second);
-       _targets->Delete (s.first);
-
-       Config::instance()->changed ();
-}
-
-list<shared_ptr<Screen> >
-KDMDialog::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) {
-               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) {
-               s.push_back (i->second);
-       }
-
-       s.sort ();
-       s.unique ();
-
-       return s;
-}
-
 boost::posix_time::ptime
 KDMDialog::from () const
 {
@@ -564,3 +316,9 @@ KDMDialog::cpl_browse_clicked ()
        _cpl->SetSelection (_cpls.size() - 1);
        update_cpl_summary ();
 }
+
+list<shared_ptr<Screen> >
+KDMDialog::screens () const
+{
+       return _screens->screens ();
+}
index 2621cbbfe70b1ddb4c22d07552c8ed329702851a..5588aa9f235ecf2f9a9d3a98a4d9d876eb7df156 100644 (file)
@@ -34,6 +34,7 @@ class DirPickerCtrl;
 class Cinema;
 class Screen;
 class Film;
+class ScreensPanel;
 struct CPLSummary;
 
 class KDMDialog : public wxDialog
@@ -54,16 +55,6 @@ public:
        dcp::Formulation formulation () const;
 
 private:
-       void add_cinema (boost::shared_ptr<Cinema>);
-       void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
-       void add_cinema_clicked ();
-       void edit_cinema_clicked ();
-       void remove_cinema_clicked ();
-       void add_screen_clicked ();
-       void edit_screen_clicked ();
-       void remove_screen_clicked ();
-       std::list<std::pair<wxTreeItemId, boost::shared_ptr<Cinema> > > selected_cinemas () const;
-       std::list<std::pair<wxTreeItemId, boost::shared_ptr<Screen> > > selected_screens () const;
        void setup_sensitivity ();
        void update_cpl_choice ();
        void update_cpl_summary ();
@@ -71,13 +62,7 @@ private:
 
        static boost::posix_time::ptime posix_time (wxDatePickerCtrl *, wxTimePickerCtrl *);
 
-       wxTreeCtrl* _targets;
-       wxButton* _add_cinema;
-       wxButton* _edit_cinema;
-       wxButton* _remove_cinema;
-       wxButton* _add_screen;
-       wxButton* _edit_screen;
-       wxButton* _remove_screen;
+       ScreensPanel* _screens;
        wxDatePickerCtrl* _from_date;
        wxDatePickerCtrl* _until_date;
        wxTimePickerCtrl* _from_time;
@@ -96,8 +81,5 @@ private:
 #endif
        wxRadioButton* _email;
 
-       wxTreeItemId _root;
-       std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
-       std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
        std::vector<CPLSummary> _cpls;
 };
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
new file mode 100644 (file)
index 0000000..ce5f255
--- /dev/null
@@ -0,0 +1,306 @@
+/*
+    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#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"
+
+using std::list;
+using std::pair;
+using std::map;
+using std::make_pair;
+using boost::shared_ptr;
+
+ScreensPanel::ScreensPanel (wxWindow* parent)
+       : wxPanel (parent, wxID_ANY)
+{
+       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+
+       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");
+
+       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 ();
+
+       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);
+
+       targets->Add (target_buttons, 0, 0);
+
+       sizer->Add (targets, 1, wxEXPAND);
+
+       _targets->Bind       (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&ScreensPanel::selection_changed, 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_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));
+
+       SetSizer (sizer);
+}
+
+list<pair<wxTreeItemId, shared_ptr<Cinema> > >
+ScreensPanel::selected_cinemas () const
+{
+       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;
+}
+
+void
+ScreensPanel::setup_sensitivity ()
+{
+       bool const sc = selected_cinemas().size() == 1;
+       bool const ss = selected_screens().size() == 1;
+
+       _edit_cinema->Enable (sc);
+       _remove_cinema->Enable (sc);
+
+       _add_screen->Enable (sc);
+       _edit_screen->Enable (ss);
+       _remove_screen->Enable (ss);
+}
+
+
+void
+ScreensPanel::add_cinema (shared_ptr<Cinema> c)
+{
+       _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);
+       }
+}
+
+void
+ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
+{
+       map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator i = _cinemas.begin();
+       while (i != _cinemas.end() && i->second != c) {
+               ++i;
+       }
+
+       if (i == _cinemas.end()) {
+               return;
+       }
+
+       _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s;
+       _targets->Expand (i->first);
+}
+
+void
+ScreensPanel::add_cinema_clicked ()
+{
+       CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
+       if (d->ShowModal () == wxID_OK) {
+               shared_ptr<Cinema> c (new Cinema (d->name(), d->email()));
+               Config::instance()->add_cinema (c);
+               add_cinema (c);
+       }
+
+       d->Destroy ();
+}
+
+void
+ScreensPanel::edit_cinema_clicked ()
+{
+       if (selected_cinemas().size() != 1) {
+               return;
+       }
+
+       pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
+
+       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 ();
+               _targets->SetItemText (c.first, std_to_wx (d->name()));
+               Config::instance()->changed ();
+       }
+
+       d->Destroy ();
+}
+
+void
+ScreensPanel::remove_cinema_clicked ()
+{
+       if (selected_cinemas().size() != 1) {
+               return;
+       }
+
+       pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
+
+       Config::instance()->remove_cinema (c.second);
+       _targets->Delete (c.first);
+}
+
+void
+ScreensPanel::add_screen_clicked ()
+{
+       if (selected_cinemas().size() != 1) {
+               return;
+       }
+
+       shared_ptr<Cinema> c = selected_cinemas().front().second;
+
+       ScreenDialog* d = new ScreenDialog (this, "Add Screen");
+       if (d->ShowModal () != wxID_OK) {
+               return;
+       }
+
+       shared_ptr<Screen> s (new Screen (d->name(), d->certificate()));
+       c->add_screen (s);
+       add_screen (c, s);
+
+       Config::instance()->changed ();
+
+       d->Destroy ();
+}
+
+void
+ScreensPanel::edit_screen_clicked ()
+{
+       if (selected_screens().size() != 1) {
+               return;
+       }
+
+       pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+
+       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 ();
+       }
+
+       d->Destroy ();
+}
+
+void
+ScreensPanel::remove_screen_clicked ()
+{
+       if (selected_screens().size() != 1) {
+               return;
+       }
+
+       pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+
+       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 (i == _cinemas.end()) {
+               return;
+       }
+
+       i->second->remove_screen (s.second);
+       _targets->Delete (s.first);
+
+       Config::instance()->changed ();
+}
+
+list<shared_ptr<Screen> >
+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) {
+               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) {
+               s.push_back (i->second);
+       }
+
+       s.sort ();
+       s.unique ();
+
+       return s;
+}
+
+void
+ScreensPanel::selection_changed ()
+{
+       setup_sensitivity ();
+       ScreensChanged ();
+}
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
new file mode 100644 (file)
index 0000000..f7d81b9
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#include <wx/wx.h>
+#include <wx/treectrl.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
+#include <map>
+
+class Cinema;
+class Screen;
+
+class ScreensPanel : public wxPanel
+{
+public:
+       ScreensPanel (wxWindow* parent);
+
+       std::list<boost::shared_ptr<Screen> > screens () const;
+       void setup_sensitivity ();
+
+       boost::signals2::signal<void ()> ScreensChanged;
+
+private:
+       void add_cinema (boost::shared_ptr<Cinema>);
+       void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
+       void add_cinema_clicked ();
+       void edit_cinema_clicked ();
+       void remove_cinema_clicked ();
+       void add_screen_clicked ();
+       void edit_screen_clicked ();
+       void remove_screen_clicked ();
+       std::list<std::pair<wxTreeItemId, boost::shared_ptr<Cinema> > > selected_cinemas () const;
+       std::list<std::pair<wxTreeItemId, boost::shared_ptr<Screen> > > selected_screens () const;
+       void selection_changed ();
+
+       wxTreeCtrl* _targets;
+       wxButton* _add_cinema;
+       wxButton* _edit_cinema;
+       wxButton* _remove_cinema;
+       wxButton* _add_screen;
+       wxButton* _edit_screen;
+       wxButton* _remove_screen;
+       wxTreeItemId _root;
+       std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
+       std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+};
index 1fb35f1cdd602ccd79c702be1fc2f073ac40477f..094962ed586abaadc881b719ca5c8ca241bea5e8 100644 (file)
@@ -61,6 +61,7 @@ sources = """
           repeat_dialog.cc
           report_problem_dialog.cc
           screen_dialog.cc
+          screens_panel.cc
           server_dialog.cc
           servers_list_dialog.cc
           subtitle_panel.cc