projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make content list and buttons taller on low-res displays.
[dcpomatic.git]
/
src
/
wx
/
cinema_dialog.cc
diff --git
a/src/wx/cinema_dialog.cc
b/src/wx/cinema_dialog.cc
index b4663195f27ab9438a39af4b00cd41a0c197e803..36aabf7766014b4cc12541914cb05179e8d71246 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,8
+38,8
@@
column (string s)
return s;
}
return s;
}
-CinemaDialog::CinemaDialog (wxWindow* parent,
string title, string name, list<string> email
s, int utc_offset_hour, int utc_offset_minute)
- : wxDialog (parent, wxID_ANY,
std_to_wx (title)
)
+CinemaDialog::CinemaDialog (wxWindow* parent,
wxString title, string name, list<string> emails, string note
s, int utc_offset_hour, int utc_offset_minute)
+ : wxDialog (parent, wxID_ANY,
title
)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
@@
-56,6
+57,11
@@
CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<st
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;
add_label_to_sizer (sizer, this, _("Email addresses for KDM delivery"), false, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
@@
-64,7
+70,7
@@
CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<st
vector<string> columns;
columns.push_back (wx_to_std (_("Address")));
_email_list = new EditableList<string, EmailDialog> (
vector<string> columns;
columns.push_back (wx_to_std (_("Address")));
_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);
@@
-84,6
+90,7
@@
CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<st
_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-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-4"), -4, 0));
_offsets.push_back (Offset (_("UTC-3:30"), -3, 30));
_offsets.push_back (Offset (_("UTC-3"), -3, 0));
@@
-95,15
+102,18
@@
CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<st
_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));
- size_t sel;
+ /* 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) {
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) {
@@
-146,8
+156,8
@@
CinemaDialog::emails () const
int
CinemaDialog::utc_offset_hour () const
{
int
CinemaDialog::utc_offset_hour () const
{
-
size_t const sel =
_utc_offset->GetSelection();
- if (sel < 0 || sel >
_offsets.size(
)) {
+
int const sel =
_utc_offset->GetSelection();
+ if (sel < 0 || sel >
int (_offsets.size()
)) {
return 0;
}
return 0;
}
@@
-157,10
+167,16
@@
CinemaDialog::utc_offset_hour () const
int
CinemaDialog::utc_offset_minute () const
{
int
CinemaDialog::utc_offset_minute () const
{
-
size_t const sel =
_utc_offset->GetSelection();
- if (sel < 0 || sel >
_offsets.size(
)) {
+
int const sel =
_utc_offset->GetSelection();
+ if (sel < 0 || sel >
int (_offsets.size()
)) {
return 0;
}
return _offsets[sel].minute;
}
return 0;
}
return _offsets[sel].minute;
}
+
+string
+CinemaDialog::notes () const
+{
+ return wx_to_std (_notes->GetValue ());
+}