X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcinema_dialog.cc;h=84fde5f41acb0985a4ed45d74a7612650e51d7d2;hp=36aabf7766014b4cc12541914cb05179e8d71246;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=03ff0afa934e0a1919d65d1407b4b5997672ca09 diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc index 36aabf776..84fde5f41 100644 --- a/src/wx/cinema_dialog.cc +++ b/src/wx/cinema_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,102 +18,73 @@ */ + #include "cinema_dialog.h" #include "wx_util.h" #include "lib/dcpomatic_assert.h" #include "lib/util.h" -#include -using std::string; -using std::vector; -using std::copy; + using std::back_inserter; -using std::list; +using std::copy; using std::cout; +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, wxString title, string name, list emails, string notes, int utc_offset_hour, int utc_offset_minute) +CinemaDialog::CinemaDialog(wxWindow* parent, wxString title, string name, vector 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, _("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)); + 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)); + 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"), 500, true)); _email_list = new EditableList ( - this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&column, _1) + this, columns, bind(&CinemaDialog::emails, this), bind (&CinemaDialog::set_emails, this, _1), [](string s, int) { + return s; + }, EditableListTitle::INVISIBLE, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); - 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()); } - _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; + 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) { @@ -125,58 +96,58 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list< 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 +CinemaDialog::emails() const { return _emails; } -list -CinemaDialog::emails () const -{ - list 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())) { + 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())) { + if (sel < 0 || sel > int(_offsets.size())) { return 0; } return _offsets[sel].minute; } + string CinemaDialog::notes () const { - return wx_to_std (_notes->GetValue ()); + return wx_to_std (_notes->GetValue()); }