Basic cinema / screen database.

7 files changed, 340 insertions, 37 deletions

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
new file mode 100644
index 000000000..9e3b1507d
--- /dev/null
+++ b/src/wx/cinema_dialog.cc
@@ -0,0 +1,62 @@
+/*
+    Copyright (C) 2012 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 "cinema_dialog.h"
+#include "wx_util.h"
+
+using std::string;
+
+CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, string email)
+	: wxDialog (parent, wxID_ANY, std_to_wx (title))
+{
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+	table->AddGrowableCol (1, 1);
+
+	add_label_to_sizer (table, this, "Name");
+	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1));
+	table->Add (_name, 1, wxEXPAND);
+
+	add_label_to_sizer (table, this, "Email address for KDM delivery");
+	_email = new wxTextCtrl (this, wxID_ANY, std_to_wx (email), wxDefaultPosition, wxSize (256, -1));
+	table->Add (_email, 1, wxEXPAND);
+
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+	
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (overall_sizer);
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+}
+
+string
+CinemaDialog::name () const
+{
+	return wx_to_std (_name->GetValue());
+}
+
+string
+CinemaDialog::email () const
+{
+	return wx_to_std (_email->GetValue());
+}
diff --git a/src/wx/new_cinema_dialog.cc b/src/wx/cinema_dialog.h
index 22fd61be9..02520eea9 100644
--- a/src/wx/new_cinema_dialog.cc
+++ b/src/wx/cinema_dialog.h
@@ -17,10 +17,17 @@
 
 */
 
-#include "new_cinema_dialog.h"
+#include <wx/wx.h>
 
-NewCinemaDialog::NewCinemaDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("New Cinema"))
+class CinemaDialog : public wxDialog
 {
+public:
+	CinemaDialog (wxWindow *, std::string, std::string name = "", std::string email = "");
+
+	std::string name () const;
+	std::string email () const;
 	
-}
+private:
+	wxTextCtrl* _name;
+	wxTextCtrl* _email;
+};
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 519317dcc..c9479b3c9 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -21,8 +21,10 @@
 #include <wx/datectrl.h>
 #include <wx/timectrl.h>
 #include "lib/cinema.h"
+#include "lib/config.h"
 #include "kdm_dialog.h"
-#include "new_cinema_dialog.h"
+#include "cinema_dialog.h"
+#include "screen_dialog.h"
 #include "wx_util.h"
 #ifdef __WXMSW__
 #include "dir_picker_ctrl.h"
@@ -30,7 +32,11 @@
 #include <wx/filepicker.h>
 #endif
 
-using namespace std;
+using std::string;
+using std::map;
+using std::list;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
 
 KDMDialog::KDMDialog (wxWindow* parent)
@@ -46,23 +52,33 @@ KDMDialog::KDMDialog (wxWindow* parent)
 	targets->Add (_targets, 1, wxEXPAND | wxALL, 6);
 
 	_root = _targets->AddRoot ("Foo");
-	shared_ptr<Cinema> csy (new Cinema ("City Screen York"));
-	add_cinema (csy);
-	add_screen (csy, shared_ptr<Screen> (new Screen ("Screen 1")));
-	add_screen (csy, shared_ptr<Screen> (new Screen ("Screen 2")));
-	add_screen (csy, shared_ptr<Screen> (new Screen ("Screen 3")));
+
+	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);
 
-	_new_cinema = new wxButton (this, wxID_ANY, _("New Cinema..."));
-	target_buttons->Add (_new_cinema, 1, wxEXPAND | wxALL, 6);
-	_new_screen = new wxButton (this, wxID_ANY, _("New Screen..."));
-	target_buttons->Add (_new_screen, 1, wxEXPAND | wxALL, 6);
+	_add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
+	target_buttons->Add (_add_cinema, 1, 0, 6);
+	_edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
+	target_buttons->Add (_edit_cinema, 1, 0, 6);
+	_remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
+	target_buttons->Add (_remove_cinema, 1, 0, 6);
+	
+	_add_screen = new wxButton (this, wxID_ANY, _("Add Screen..."));
+	target_buttons->Add (_add_screen, 1, 0, 6);
+	_edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen..."));
+	target_buttons->Add (_edit_screen, 1, 0, 6);
+	_remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen"));
+	target_buttons->Add (_remove_screen, 1, 0, 6);
 
-	targets->Add (target_buttons, 0, wxEXPAND | wxALL, 6);
+	targets->Add (target_buttons, 0, 0, 6);
 
-	vertical->Add (targets, 0, wxEXPAND | wxALL, 6);
+	vertical->Add (targets, 1, wxEXPAND | wxALL, 6);
 
 	wxFlexGridSizer* table = new wxFlexGridSizer (3, 2, 6);
 	add_label_to_sizer (table, this, "From");
@@ -87,7 +103,7 @@ KDMDialog::KDMDialog (wxWindow* parent)
 
 	table->Add (_folder, 1, wxEXPAND);
 	
-	vertical->Add (table, 1, wxEXPAND | wxALL, 6);
+	vertical->Add (table, 0, wxEXPAND | wxALL, 6);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
@@ -95,36 +111,84 @@ KDMDialog::KDMDialog (wxWindow* parent)
 	}
 
 	_targets->Connect (wxID_ANY, wxEVT_COMMAND_TREE_SEL_CHANGED, wxCommandEventHandler (KDMDialog::targets_selection_changed), 0, this);
-	_new_cinema->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::new_cinema_clicked), 0, this);
-	_new_screen->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::new_screen_clicked), 0, this);
 
-	_new_screen->Enable (false);
+	_add_cinema->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::add_cinema_clicked), 0, this);
+	_edit_cinema->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::edit_cinema_clicked), 0, this);
+	_remove_cinema->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::remove_cinema_clicked), 0, this);
+
+	_add_screen->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::add_screen_clicked), 0, this);
+	_edit_screen->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::edit_screen_clicked), 0, this);
+	_remove_screen->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::remove_screen_clicked), 0, this);
+
+	setup_sensitivity ();
 	
 	SetSizer (vertical);
 	vertical->Layout ();
 	vertical->SetSizeHints (this);
 }
 
-void
-KDMDialog::targets_selection_changed (wxCommandEvent &)
+list<pair<wxTreeItemId, shared_ptr<Cinema> > >
+KDMDialog::selected_cinemas () const
 {
 	wxArrayTreeItemIds s;
 	_targets->GetSelections (s);
 
-	bool selected_cinema = false;
+	list<pair<wxTreeItemId, shared_ptr<Cinema> > > c;
 	for (size_t i = 0; i < s.GetCount(); ++i) {
-		if (_cinemas.find (s[i]) != _cinemas.end()) {
-			selected_cinema = true;
+		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::targets_selection_changed (wxCommandEvent &)
+{
+	setup_sensitivity ();
+}
+
+void
+KDMDialog::setup_sensitivity ()
+{
+	bool const sc = selected_cinemas().size() == 1;
+	bool const ss = selected_screens().size() == 1;
+	
+	_edit_cinema->Enable (sc);
+	_remove_cinema->Enable (sc);
 	
-	_new_screen->Enable (selected_cinema);	
+	_add_screen->Enable (sc);
+	_edit_screen->Enable (ss);
+	_remove_screen->Enable (ss);
 }
 
 void
 KDMDialog::add_cinema (shared_ptr<Cinema> c)
 {
 	_cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c;
+
+	for (list<shared_ptr<Screen> >::iterator i = c->screens.begin(); i != c->screens.end(); ++i) {
+		add_screen (c, *i);
+	}
 }
 
 void
@@ -143,15 +207,117 @@ KDMDialog::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
 }
 
 void
-KDMDialog::new_cinema_clicked (wxCommandEvent &)
+KDMDialog::add_cinema_clicked (wxCommandEvent &)
+{
+	CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
+	d->ShowModal ();
+
+	shared_ptr<Cinema> c (new Cinema (d->name(), d->email()));
+	Config::instance()->add_cinema (c);
+	add_cinema (c);
+
+	Config::instance()->write ();
+	
+	d->Destroy ();
+}
+
+void
+KDMDialog::edit_cinema_clicked (wxCommandEvent &)
+{
+	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);
+	d->ShowModal ();
+
+	c.second->name = d->name ();
+	c.second->email = d->email ();
+	_targets->SetItemText (c.first, std_to_wx (d->name()));
+
+	Config::instance()->write ();
+
+	d->Destroy ();	
+}
+
+void
+KDMDialog::remove_cinema_clicked (wxCommandEvent &)
+{
+	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);
+
+	Config::instance()->write ();	
+}
+
+void
+KDMDialog::add_screen_clicked (wxCommandEvent &)
+{
+	if (selected_cinemas().size() != 1) {
+		return;
+	}
+
+	shared_ptr<Cinema> c = selected_cinemas().front().second;
+	
+	ScreenDialog* d = new ScreenDialog (this, "Add Screen");
+	d->ShowModal ();
+
+	shared_ptr<Screen> s (new Screen (d->name()));
+	c->screens.push_back (s);
+	add_screen (c, s);
+
+	Config::instance()->write ();
+
+	d->Destroy ();
+}
+
+void
+KDMDialog::edit_screen_clicked (wxCommandEvent &)
 {
-	NewCinemaDialog* d = new NewCinemaDialog (this);
+	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);
 	d->ShowModal ();
+
+	s.second->name = d->name ();
+	_targets->SetItemText (s.first, std_to_wx (d->name()));
+
+	Config::instance()->write ();
+
 	d->Destroy ();
 }
 
 void
-KDMDialog::new_screen_clicked (wxCommandEvent &)
+KDMDialog::remove_screen_clicked (wxCommandEvent &)
 {
+	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() && find (i->second->screens.begin(), i->second->screens.end(), s.second) == i->second->screens.end()) {
+		++i;
+	}
+
+	if (i == _cinemas.end()) {
+		return;
+	}
+
+	i->second->screens.remove (s.second);
+	_targets->Delete (s.first);
 
+	Config::instance()->write ();
 }
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index d45d4bef8..4e449cee3 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -40,12 +40,23 @@ private:
 	void add_cinema (boost::shared_ptr<Cinema>);
 	void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
 	void targets_selection_changed (wxCommandEvent &);
-	void new_cinema_clicked (wxCommandEvent &);
-	void new_screen_clicked (wxCommandEvent &);
+	void add_cinema_clicked (wxCommandEvent &);
+	void edit_cinema_clicked (wxCommandEvent &);
+	void remove_cinema_clicked (wxCommandEvent &);
+	void add_screen_clicked (wxCommandEvent &);
+	void edit_screen_clicked (wxCommandEvent &);
+	void remove_screen_clicked (wxCommandEvent &);
+	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 ();
 	
 	wxTreeCtrl* _targets;
-	wxButton* _new_cinema;
-	wxButton* _new_screen;
+	wxButton* _add_cinema;
+	wxButton* _edit_cinema;
+	wxButton* _remove_cinema;
+	wxButton* _add_screen;
+	wxButton* _edit_screen;
+	wxButton* _remove_screen;
 	wxDatePickerCtrl* _from_date;
 	wxDatePickerCtrl* _to_date;
 	wxTimePickerCtrl* _from_time;
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
new file mode 100644
index 000000000..32f36ab8b
--- /dev/null
+++ b/src/wx/screen_dialog.cc
@@ -0,0 +1,52 @@
+/*
+    Copyright (C) 2012 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 "screen_dialog.h"
+#include "wx_util.h"
+
+using std::string;
+
+ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name)
+	: wxDialog (parent, wxID_ANY, std_to_wx (title))
+{
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+	table->AddGrowableCol (1, 1);
+
+	add_label_to_sizer (table, this, "Name");
+	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1));
+	table->Add (_name, 1, wxEXPAND);
+
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+	
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (overall_sizer);
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+}
+
+string
+ScreenDialog::name () const
+{
+	return wx_to_std (_name->GetValue());
+}
diff --git a/src/wx/new_cinema_dialog.h b/src/wx/screen_dialog.h
index 9e05bba41..78869782f 100644
--- a/src/wx/new_cinema_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -19,9 +19,13 @@
 
 #include <wx/wx.h>
 
-class NewCinemaDialog : public wxDialog
+class ScreenDialog : public wxDialog
 {
 public:
-	NewCinemaDialog (wxWindow *);
+	ScreenDialog (wxWindow *, std::string, std::string name = "");
 
+	std::string name () const;
+	
+private:
+	wxTextCtrl* _name;
 };
diff --git a/src/wx/wscript b/src/wx/wscript
index 1f0bc127a..82d9d3738 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -24,8 +24,9 @@ def build(bld):
                  job_manager_view.cc
                  job_wrapper.cc
                  kdm_dialog.cc
-                 new_cinema_dialog.cc
+                 cinema_dialog.cc
                  new_film_dialog.cc
+                 screen_dialog.cc
                  properties_dialog.cc
                  server_dialog.cc
                  wx_util.cc