Remove sequence video button from main view; from 1.x.

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index b4b9f13da51f9193bff49b3eeaf5ec99e1d8d012..473fd5173a5e50719d254e327c0721236854e4f2 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -82,9 +82,6 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f)
                _sizer->Add (s, 0, wxEXPAND | wxALL, 6);
        }
 
-       _sequence_video = new wxCheckBox (_panel, wxID_ANY, _("Keep video in sequence"));
-       _sizer->Add (_sequence_video);
-
        _notebook = new wxNotebook (_panel, wxID_ANY);
        _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
 
@@ -107,7 +104,6 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> f)
        _earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::earlier_clicked, this));
        _later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::later_clicked, this));
        _timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::timeline_clicked, this));
-       _sequence_video->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ContentPanel::sequence_video_changed, this));
 }
 
 ContentList
@@ -193,16 +189,6 @@ ContentPanel::selected_ffmpeg ()
        return sc;
 }
 
-void
-ContentPanel::sequence_video_changed ()
-{
-       if (!_film) {
-               return;
-       }
-       
-       _film->set_sequence_video (_sequence_video->GetValue ());
-}
-
 void
 ContentPanel::film_changed (Film::Property p)
 {
@@ -210,9 +196,6 @@ ContentPanel::film_changed (Film::Property p)
        case Film::CONTENT:
                setup ();
                break;
-       case Film::SEQUENCE_VIDEO:
-               checked_set (_sequence_video, _film->sequence_video ());
-               break;
        default:
                break;
        }
@@ -359,7 +342,6 @@ ContentPanel::set_general_sensitivity (bool s)
        _earlier->Enable (s);
        _later->Enable (s);
        _timeline->Enable (s);
-       _sequence_video->Enable (s);
 
        /* Set the panels in the content notebook */
        for (list<ContentSubPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index ab198411ddf5b9296aa19aab163621af55b34bb4..88aac70495d0d66a48f97e1edf359fd24e377f39 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -66,7 +66,6 @@ public:
        void add_file_clicked ();
        
 private:       
-       void sequence_video_changed ();
        void selection_changed ();
        void add_folder_clicked ();
        void remove_clicked ();
@@ -89,7 +88,6 @@ private:
        wxButton* _earlier;
        wxButton* _later;
        wxButton* _timeline;
-       wxCheckBox* _sequence_video;
        ContentSubPanel* _video_panel;
        ContentSubPanel* _audio_panel;
        ContentSubPanel* _subtitle_panel;