Move UTC offset for KDMs from the cinema to the point of KDM creation (#2300).

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

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index f6007d2351eeb4cd9e740ff4acb978cac50a77f9..771a59892b491715ef805fb64317550be42c93b8 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -28,7 +28,6 @@
 using std::back_inserter;
 using std::copy;
 using std::cout;
-using std::list;
 using std::string;
 using std::vector;
 using boost::bind;
@@ -37,7 +36,7 @@ using namespace boost::placeholders;
 #endif
 
 
-CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails, string notes, int utc_offset_hour, int utc_offset_minute)
+CinemaDialog::CinemaDialog(wxWindow* parent, wxString title, string name, vector<string> emails, string notes)
        : wxDialog (parent, wxID_ANY, title)
 {
        auto overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -51,11 +50,6 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
        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));
@@ -69,9 +63,9 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
        vector<EditableListColumn> columns;
        columns.push_back (EditableListColumn(_("Address"), 500, true));
        _email_list = new EditableList<string, EmailDialog> (
-               this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), [](string s, int) {
+               this, columns, bind(&CinemaDialog::emails, this), bind (&CinemaDialog::set_emails, this, _1), [](string s, int) {
                        return s;
-               }, false, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
+               }, EditableListTitle::INVISIBLE, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
                );
 
        sizer->Add (_email_list, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND);
@@ -84,17 +78,6 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
                overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
 
-       /* 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);
 
@@ -117,45 +100,12 @@ CinemaDialog::set_emails (vector<string> e)
 
 
 vector<string>
-CinemaDialog::get_emails () const
+CinemaDialog::emails() const
 {
        return _emails;
 }
 
 
-list<string>
-CinemaDialog::emails () const
-{
-       list<string> e;
-       copy (_emails.begin(), _emails.end(), back_inserter(e));
-       return e;
-}
-
-
-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::notes () const
 {