projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve OpenFileError so that it doesn't say "opening for read"
[dcpomatic.git]
/
src
/
wx
/
cinema_dialog.cc
diff --git
a/src/wx/cinema_dialog.cc
b/src/wx/cinema_dialog.cc
index df56b9cbee224cab31ed1d9a21fbb756cef97779..ff5d1faf61976b43ed4d0bc36853cbfcf3eba458 100644
(file)
--- a/
src/wx/cinema_dialog.cc
+++ b/
src/wx/cinema_dialog.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
@@
-37,7
+38,7
@@
column (string s)
return s;
}
return s;
}
-CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails, int utc_offset_hour, int utc_offset_minute)
+CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails,
string notes,
int utc_offset_hour, int utc_offset_minute)
: wxDialog (parent, wxID_ANY, title)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
: wxDialog (parent, wxID_ANY, title)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
@@
-56,15
+57,20
@@
CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
sizer->Add (_utc_offset, wxGBPosition (r, 1));
++r;
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));
+ ++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));
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<
string
> columns;
- columns.push_back (
wx_to_std (_("Address"
)));
+ vector<
EditableListColumn
> columns;
+ columns.push_back (
EditableListColumn(wx_to_std(_("Address")
)));
_email_list = new EditableList<string, EmailDialog> (
_email_list = new EditableList<string, EmailDialog> (
- this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&
string_not_empty, _1), bind (&
column, _1)
+ this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&column, _1)
);
sizer->Add (_email_list, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND);
);
sizer->Add (_email_list, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND);
@@
-96,10
+102,12
@@
CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
_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+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+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));
_offsets.push_back (Offset (_("UTC+10"), 10, 0));
_offsets.push_back (Offset (_("UTC+11"), 11, 0));
_offsets.push_back (Offset (_("UTC+12"), 12, 0));
@@
-166,3
+174,9
@@
CinemaDialog::utc_offset_minute () const
return _offsets[sel].minute;
}
return _offsets[sel].minute;
}
+
+string
+CinemaDialog::notes () const
+{
+ return wx_to_std (_notes->GetValue ());
+}