No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 624fcb13af86d37a75e93cd2bfdef6c5a23bf0c6..b6285c835bc47ffa9f19f24a71e2ecd8aacb7cc4 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/>.
 
 */
 
@@ -37,8 +38,8 @@ column (string s)
        return s;
 }
 
-CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<string> emails, int utc_offset_hour, int utc_offset_minute)
-       : wxDialog (parent, wxID_ANY, std_to_wx (title))
+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);
        SetSizer (overall_sizer);
@@ -56,6 +57,11 @@ CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<st
        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;
 
@@ -84,6 +90,7 @@ CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<st
        _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));
@@ -103,7 +110,8 @@ CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<st
        _offsets.push_back (Offset (_("UTC+11"),   11,  0));
        _offsets.push_back (Offset (_("UTC+12"),   12,  0));
 
-       size_t sel;
+       /* Default to UTC */
+       size_t sel = 13;
        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) {
@@ -164,3 +172,9 @@ CinemaDialog::utc_offset_minute () const
 
        return _offsets[sel].minute;
 }
+
+string
+CinemaDialog::notes () const
+{
+       return wx_to_std (_notes->GetValue ());
+}