projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make KDM output options checkboxes rather than radios (part of #848).
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.cc
diff --git
a/src/wx/timeline_dialog.cc
b/src/wx/timeline_dialog.cc
index ab2162b3964181ae65cf0ee5b7be4695d019855d..aef66d8032fde91e3671aae5eeb138501dfe75c8 100644
(file)
--- a/
src/wx/timeline_dialog.cc
+++ b/
src/wx/timeline_dialog.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-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/>.
*/
*/
@@
-24,6
+25,7
@@
#include "timeline_dialog.h"
#include "wx_util.h"
#include "content_panel.h"
#include "timeline_dialog.h"
#include "wx_util.h"
#include "content_panel.h"
+#include <iostream>
using std::list;
using std::cout;
using std::list;
using std::cout;
@@
-39,20
+41,27
@@
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL);
_snap = new wxCheckBox (this, wxID_ANY, _("Snap"));
controls->Add (_snap);
wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL);
_snap = new wxCheckBox (this, wxID_ANY, _("Snap"));
controls->Add (_snap);
- _sequence
_video = new wxCheckBox (this, wxID_ANY, _("Keep video
in sequence"));
- controls->Add (_sequence
_video
, 1, wxLEFT, 12);
+ _sequence
= new wxCheckBox (this, wxID_ANY, _("Keep video and subtitles
in sequence"));
+ controls->Add (_sequence, 1, wxLEFT, 12);
sizer->Add (controls, 0, wxALL, 12);
sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
sizer->Add (controls, 0, wxALL, 12);
sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
+#ifdef DCPOMATIC_LINUX
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+ if (buttons) {
+ sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+#endif
+
SetSizer (sizer);
sizer->Layout ();
sizer->SetSizeHints (this);
_snap->SetValue (_timeline.snap ());
_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::snap_toggled, this));
SetSizer (sizer);
sizer->Layout ();
sizer->SetSizeHints (this);
_snap->SetValue (_timeline.snap ());
_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::snap_toggled, this));
- film_changed (Film::SEQUENCE
_VIDEO
);
- _s
nap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video
_toggled, this));
+ film_changed (Film::SEQUENCE);
+ _s
equence->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence
_toggled, this));
_film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
}
_film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
}
@@
-64,14
+73,14
@@
TimelineDialog::snap_toggled ()
}
void
}
void
-TimelineDialog::sequence_
video_
toggled ()
+TimelineDialog::sequence_toggled ()
{
shared_ptr<Film> film = _film.lock ();
if (!film) {
return;
}
{
shared_ptr<Film> film = _film.lock ();
if (!film) {
return;
}
- film->set_sequence
_video (_sequence_video
->GetValue ());
+ film->set_sequence
(_sequence
->GetValue ());
}
void
}
void
@@
-82,7
+91,13
@@
TimelineDialog::film_changed (Film::Property p)
return;
}
return;
}
- if (p == Film::SEQUENCE
_VIDEO
) {
- _sequence
_video->SetValue (film->sequence_video
());
+ if (p == Film::SEQUENCE) {
+ _sequence
->SetValue (film->sequence
());
}
}
}
}
+
+void
+TimelineDialog::set_selection (ContentList selection)
+{
+ _timeline.set_selection (selection);
+}