/*
- 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.
- 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 <http://www.gnu.org/licenses/>.
*/
#include "timeline_dialog.h"
#include "wx_util.h"
#include "content_panel.h"
+#include <iostream>
using std::list;
using std::cout;
using boost::shared_ptr;
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
- : wxDialog (cp->panel(), wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+ : wxDialog (
+ cp->panel(),
+ wxID_ANY,
+ _("Timeline"),
+ wxDefaultPosition,
+ wxSize (640, 512),
+#ifdef DCPOMATIC_OSX
+ /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps
+ the window above all others (and not just our own) it's better than nothing for now.
+ */
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+#else
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+#endif
+ )
, _film (film)
, _timeline (this, cp, film)
{
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);
+#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));
- film_changed (Film::SEQUENCE_VIDEO);
- _snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video_toggled, this));
+ _snap->Bind (wxEVT_CHECKBOX, boost::bind (&TimelineDialog::snap_toggled, this));
+ film_changed (Film::SEQUENCE);
+ _sequence->Bind (wxEVT_CHECKBOX, boost::bind (&TimelineDialog::sequence_toggled, this));
- film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
+ _film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
}
void
}
void
-TimelineDialog::sequence_video_toggled ()
+TimelineDialog::sequence_toggled ()
{
shared_ptr<Film> film = _film.lock ();
if (!film) {
return;
}
-
- film->set_sequence_video (_sequence_video->GetValue ());
+
+ film->set_sequence (_sequence->GetValue ());
}
void
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);
+}