pot/merge.

[dcpomatic.git] / src / wx / timeline_dialog.cc

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index bc3e8db9931d45ae7de3b39787df38aa409633c6..9caa629338e34a7110fdacf849041fb206e4fad4 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -23,15 +23,17 @@
 #include "film_editor.h"
 #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 (FilmEditor* ed, shared_ptr<Film> film)
-       : wxDialog (ed, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+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)
        , _film (film)
-       , _timeline (this, ed, film)
+       , _timeline (this, cp, film)
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
@@ -44,6 +46,13 @@ TimelineDialog::TimelineDialog (FilmEditor* ed, 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);
@@ -51,9 +60,9 @@ TimelineDialog::TimelineDialog (FilmEditor* ed, 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.connect (bind (&TimelineDialog::film_changed, this, _1));
+       _film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
 }
 
 void
@@ -69,7 +78,7 @@ TimelineDialog::sequence_video_toggled ()
        if (!film) {
                return;
        }
-               
+
        film->set_sequence_video (_sequence_video->GetValue ());
 }