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 8c7194c4a7433084878347568ddcdb1ccb17e322..9b0ed85627d0dafd57b212e3db0d87383f9be782 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -37,7 +37,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, list<string> emails, string notes)
        : wxDialog (parent, wxID_ANY, title)
 {
        auto overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -51,11 +51,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));
@@ -84,17 +79,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);
 
@@ -131,31 +115,6 @@ CinemaDialog::emails () const
        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
 {