X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.cc;h=f054763c864a5676ca11c03fd9db52d7051c9384;hb=d511d6702d66b93ead66c067be239173fd2d36f2;hp=6ec52ff382c1a9d0369841d211a7cb43c67930c9;hpb=726f18338c5aaf9119bd10517d23584e32fdeccb;p=dcpomatic.git

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 6ec52ff38..f054763c8 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -24,6 +24,7 @@
 #include "timeline_dialog.h"
 #include "wx_util.h"
 #include "content_panel.h"
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -45,6 +46,13 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 	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);
@@ -52,7 +60,7 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 	_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));
+	_sequence_video->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video_toggled, this));
 
 	_film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
 }
@@ -70,7 +78,7 @@ TimelineDialog::sequence_video_toggled ()
 	if (!film) {
 		return;
 	}
-		
+
 	film->set_sequence_video (_sequence_video->GetValue ());
 }
 
@@ -86,3 +94,9 @@ TimelineDialog::film_changed (Film::Property p)
 		_sequence_video->SetValue (film->sequence_video ());
 	}
 }
+
+void
+TimelineDialog::set_selection (ContentList selection)
+{
+	_timeline.set_selection (selection);
+}