X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcinema_dialog.cc;h=84fde5f41acb0985a4ed45d74a7612650e51d7d2;hp=e663fc3b80f96129e66e98f6bd1e115c8b4f6966;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=e8204f55c981493b99814f71a50b3c3d62601032

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index e663fc3b8..84fde5f41 100644
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -1,62 +1,153 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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 "cinema_dialog.h"
 #include "wx_util.h"
+#include "lib/dcpomatic_assert.h"
+#include "lib/util.h"
+
 
+using std::back_inserter;
+using std::copy;
+using std::cout;
 using std::string;
+using std::vector;
+using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
-CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, string email)
-	: wxDialog (parent, wxID_ANY, std_to_wx (title))
+
+CinemaDialog::CinemaDialog(wxWindow* parent, wxString title, string name, vector<string> emails, string notes, int utc_offset_hour, int utc_offset_minute)
+	: wxDialog (parent, wxID_ANY, title)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (overall_sizer);
+
+	auto sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	int r = 0;
+
+	add_label_to_sizer (sizer, this, _("Name"), true, wxGBPosition(r, 0));
+	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx(name), wxDefaultPosition, wxSize(500, -1));
+	sizer->Add (_name, wxGBPosition(r, 1));
+	++r;
+
+	add_label_to_sizer (sizer, this, _("UTC offset (time zone)"), true, wxGBPosition(r, 0));
+	_utc_offset = new wxChoice (this, wxID_ANY);
+	sizer->Add (_utc_offset, wxGBPosition(r, 1));
+	++r;
+
+	add_label_to_sizer (sizer, this, _("Notes"), true, wxGBPosition(r, 0));
+	_notes = new wxTextCtrl (this, wxID_ANY, std_to_wx(notes), wxDefaultPosition, wxSize(500, -1));
+	sizer->Add (_notes, wxGBPosition(r, 1));
+	++r;
+
+	add_label_to_sizer (sizer, this, _("Email addresses for KDM delivery"), false, wxGBPosition(r, 0), wxGBSpan(1, 2));
+	++r;
 
-	add_label_to_sizer (table, this, _("Name"), true);
-	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1));
-	table->Add (_name, 1, wxEXPAND);
+	copy (emails.begin(), emails.end(), back_inserter (_emails));
 
-	add_label_to_sizer (table, this, _("Email address for KDM delivery"), true);
-	_email = new wxTextCtrl (this, wxID_ANY, std_to_wx (email), wxDefaultPosition, wxSize (256, -1));
-	table->Add (_email, 1, wxEXPAND);
+	vector<EditableListColumn> columns;
+	columns.push_back (EditableListColumn(_("Address"), 500, true));
+	_email_list = new EditableList<string, EmailDialog> (
+		this, columns, bind(&CinemaDialog::emails, this), bind (&CinemaDialog::set_emails, this, _1), [](string s, int) {
+			return s;
+		}, EditableListTitle::INVISIBLE, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
+		);
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	sizer->Add (_email_list, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND);
+	++r;
+
+	overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+	auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
 	if (buttons) {
 		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	SetSizer (overall_sizer);
+	/* Default to UTC */
+	size_t sel = get_offsets (_offsets);
+	for (size_t i = 0; i < _offsets.size(); ++i) {
+		_utc_offset->Append (_offsets[i].name);
+		if (_offsets[i].hour == utc_offset_hour && _offsets[i].minute == utc_offset_minute) {
+			sel = i;
+		}
+	}
+
+	_utc_offset->SetSelection (sel);
+
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
+
+	_name->SetFocus ();
 }
 
+
 string
 CinemaDialog::name () const
 {
 	return wx_to_std (_name->GetValue());
 }
 
+
+void
+CinemaDialog::set_emails (vector<string> e)
+{
+	_emails = e;
+}
+
+
+vector<string>
+CinemaDialog::emails() const
+{
+	return _emails;
+}
+
+
+int
+CinemaDialog::utc_offset_hour () const
+{
+	int const sel = _utc_offset->GetSelection();
+	if (sel < 0 || sel > int(_offsets.size())) {
+		return 0;
+	}
+
+	return _offsets[sel].hour;
+}
+
+
+int
+CinemaDialog::utc_offset_minute () const
+{
+	int const sel = _utc_offset->GetSelection();
+	if (sel < 0 || sel > int(_offsets.size())) {
+		return 0;
+	}
+
+	return _offsets[sel].minute;
+}
+
+
 string
-CinemaDialog::email () const
+CinemaDialog::notes () const
 {
-	return wx_to_std (_email->GetValue());
+	return wx_to_std (_notes->GetValue());
 }