Use wxString for EditableListColumn.

[dcpomatic.git] / src / wx / cinema_dialog.cc

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index df56b9cbee224cab31ed1d9a21fbb756cef97779..ecb7d8107752b1cb385975471a68c887e1561164 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 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/>.
 
 */
 
@@ -30,6 +31,9 @@ using std::back_inserter;
 using std::list;
 using std::cout;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static string
 column (string s)
@@ -37,7 +41,7 @@ column (string s)
        return s;
 }
 
-CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails, int utc_offset_hour, int utc_offset_minute)
+CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails, string notes, int utc_offset_hour, int utc_offset_minute)
        : wxDialog (parent, wxID_ANY, title)
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -56,15 +60,20 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
        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;
 
        copy (emails.begin(), emails.end(), back_inserter (_emails));
 
-       vector<string> columns;
-       columns.push_back (wx_to_std (_("Address")));
+       vector<EditableListColumn> columns;
+       columns.push_back (EditableListColumn(_("Address")));
        _email_list = new EditableList<string, EmailDialog> (
-               this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&string_not_empty, _1), bind (&column, _1)
+               this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&column, _1)
                );
 
        sizer->Add (_email_list, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND);
@@ -77,35 +86,8 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
                overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
 
-       _offsets.push_back (Offset (_("UTC-11"),  -11,  0));
-       _offsets.push_back (Offset (_("UTC-10"),  -10,  0));
-       _offsets.push_back (Offset (_("UTC-9"),    -9,  0));
-       _offsets.push_back (Offset (_("UTC-8"),    -8,  0));
-       _offsets.push_back (Offset (_("UTC-7"),    -7,  0));
-       _offsets.push_back (Offset (_("UTC-6"),    -6,  0));
-       _offsets.push_back (Offset (_("UTC-5"),    -5,  0));
-       _offsets.push_back (Offset (_("UTC-4:30"), -4, 30));
-       _offsets.push_back (Offset (_("UTC-4"),    -4,  0));
-       _offsets.push_back (Offset (_("UTC-3:30"), -3, 30));
-       _offsets.push_back (Offset (_("UTC-3"),    -3,  0));
-       _offsets.push_back (Offset (_("UTC-2"),    -2,  0));
-       _offsets.push_back (Offset (_("UTC-1"),    -1,  0));
-       _offsets.push_back (Offset (_("UTC")  ,     0,  0));
-       _offsets.push_back (Offset (_("UTC+1"),     1,  0));
-       _offsets.push_back (Offset (_("UTC+2"),     2,  0));
-       _offsets.push_back (Offset (_("UTC+3"),     3,  0));
-       _offsets.push_back (Offset (_("UTC+4"),     4,  0));
-       _offsets.push_back (Offset (_("UTC+5"),     5,  0));
-       _offsets.push_back (Offset (_("UTC+6"),     6,  0));
-       _offsets.push_back (Offset (_("UTC+7"),     7,  0));
-       _offsets.push_back (Offset (_("UTC+8"),     8,  0));
-       _offsets.push_back (Offset (_("UTC+9"),     9,  0));
-       _offsets.push_back (Offset (_("UTC+10"),   10,  0));
-       _offsets.push_back (Offset (_("UTC+11"),   11,  0));
-       _offsets.push_back (Offset (_("UTC+12"),   12,  0));
-
        /* Default to UTC */
-       size_t sel = 13;
+       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) {
@@ -117,6 +99,8 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
 
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
+
+       _name->SetFocus ();
 }
 
 string
@@ -166,3 +150,9 @@ CinemaDialog::utc_offset_minute () const
 
        return _offsets[sel].minute;
 }
+
+string
+CinemaDialog::notes () const
+{
+       return wx_to_std (_notes->GetValue ());
+}