X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcinema_dialog.cc;h=659d334a24717f40d54a899c9ae2262ce80d0c33;hb=4b76291eb0328840de4c5938a1be6340e5dea0fe;hp=6fb4acc6b5f8465851731fa7b997f9a94828acfc;hpb=581ea73e56388d87a0c7f736efce447076618393;p=dcpomatic.git diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc index 6fb4acc6b..659d334a2 100644 --- a/src/wx/cinema_dialog.cc +++ b/src/wx/cinema_dialog.cc @@ -1,123 +1,163 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2021 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 +#include "lib/util.h" + -using std::string; -using std::vector; -using std::copy; using std::back_inserter; -using std::list; +using std::copy; using std::cout; +using std::list; +using std::string; +using std::vector; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif -static string -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); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); - wxGridBagSizer* sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); int r = 0; - add_label_to_sizer (sizer, this, _("Name"), true, wxGBPosition (r, 0)); - _name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (500, -1)); - sizer->Add (_name, wxGBPosition (r, 1)); + add_label_to_sizer (sizer, this, _("Name"), true, wxGBPosition(r, 0)); + _name = new wxTextCtrl (this, wxID_ANY, std_to_wx(name), wxDefaultPosition, wxSize(500, -1)); + sizer->Add (_name, wxGBPosition(r, 1)); ++r; - add_label_to_sizer (sizer, this, _("UTC offset (time zone)"), true, wxGBPosition (r, 0)); + 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)); + sizer->Add (_utc_offset, wxGBPosition(r, 1)); ++r; - add_label_to_sizer (sizer, this, _("Email addresses for KDM delivery"), false, wxGBPosition (r, 0), wxGBSpan (1, 2)); + 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(_("Address"))); _email_list = new EditableList ( - this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&column, _1) + this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), [](string s, int) { + return s; + }, true, false ); - sizer->Add (_email_list, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND); + sizer->Add (_email_list, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND); ++r; overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (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)); + /* 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 (utc_offset + 11); + _utc_offset->SetSelection (sel); overall_sizer->Layout (); overall_sizer->SetSizeHints (this); + + _name->SetFocus (); } + string CinemaDialog::name () const { return wx_to_std (_name->GetValue()); } + void CinemaDialog::set_emails (vector e) { _emails = e; } + vector CinemaDialog::get_emails () const { return _emails; } + list CinemaDialog::emails () const { list e; - copy (_emails.begin(), _emails.end(), back_inserter (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 () const +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()); }