X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcinema_dialog.cc;h=ff5d1faf61976b43ed4d0bc36853cbfcf3eba458;hb=3dfe3b92df03eee932f3c92336197559c11a5913;hp=6fb4acc6b5f8465851731fa7b997f9a94828acfc;hpb=581ea73e56388d87a0c7f736efce447076618393;p=dcpomatic.git diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc index 6fb4acc6b..ff5d1faf6 100644 --- a/src/wx/cinema_dialog.cc +++ b/src/wx/cinema_dialog.cc @@ -1,25 +1,27 @@ /* Copyright (C) 2012-2016 Carl Hetherington - 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 . */ #include "cinema_dialog.h" #include "wx_util.h" #include "lib/dcpomatic_assert.h" +#include "lib/util.h" #include using std::string; @@ -36,8 +38,8 @@ column (string s) return s; } -CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list emails, int utc_offset) - : wxDialog (parent, wxID_ANY, std_to_wx (title)) +CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list 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); @@ -55,13 +57,18 @@ CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, listAdd (_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 columns; - columns.push_back (wx_to_std (_("Address"))); + vector columns; + columns.push_back (EditableListColumn(wx_to_std(_("Address")))); _email_list = new EditableList ( this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&column, _1) ); @@ -76,15 +83,45 @@ CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, listAdd (buttons, wxSizerFlags().Expand().DoubleBorder()); } - for (int i = -11; i <= -1; ++i) { - _utc_offset->Append (wxString::Format (_("UTC%d"), i)); - } - _utc_offset->Append (_("UTC")); - for (int i = 1; i <= 12; ++i) { - _utc_offset->Append (wxString::Format (_("UTC+%d"), i)); + _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+5:30"), 5, 30)); + _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+9:30"), 9, 30)); + _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; + 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 (utc_offset + 11); + _utc_offset->SetSelection (sel); overall_sizer->Layout (); overall_sizer->SetSizeHints (this); @@ -117,7 +154,29 @@ CinemaDialog::emails () const } int -CinemaDialog::utc_offset () const +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 { - return _utc_offset->GetSelection() - 11; + return wx_to_std (_notes->GetValue ()); }