Put fade back into simple mode.

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index d47c81a15b1358781dc1c590c94c61947f76f833..7e7dd6fbdade58d1fd75a24b2858235e4e0e9d16 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -169,12 +169,6 @@ TimingPanel::add_to_grid ()
        _move_to_start_of_reel->Show (full);
        _full_length_label->Show (full);
        _full_length->Show (full);
-       _trim_start_label->Show (full);
-       _trim_start->Show (full);
-       _trim_start_to_playhead->Show (full);
-       _trim_end_label->Show (full);
-       _trim_end->Show (full);
-       _trim_end_to_playhead->Show (full);
        _play_length_label->Show (full);
        _play_length->Show (full);
        _video_frame_rate_label->Show (full);
@@ -189,21 +183,23 @@ TimingPanel::add_to_grid ()
                add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0));
                _grid->Add (_full_length, wxGBPosition(r, 1));
                ++r;
+       }
 
-               add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0));
-               _grid->Add (_trim_start, wxGBPosition(r, 1));
-               ++r;
+       add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0));
+       _grid->Add (_trim_start, wxGBPosition(r, 1));
+       ++r;
 
-               _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1));
-               ++r;
+       _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1));
+       ++r;
 
-               add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0));
-               _grid->Add (_trim_end, wxGBPosition(r, 1));
-               ++r;
+       add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0));
+       _grid->Add (_trim_end, wxGBPosition(r, 1));
+       ++r;
 
-               _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
-               ++r;
+       _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
+       ++r;
 
+       if (full) {
                add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
                _grid->Add (_play_length, wxGBPosition(r, 1));
                ++r;

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 605d4ff68e48852542a57647b4f39b5276f00b25..6615215d5e7efe2770fc357404ac8768fe7230a3 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -244,10 +244,6 @@ VideoPanel::add_to_grid ()
        _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
        r += 2;
 
-       _fade_in_label->Show (full);
-       _fade_in->Show (full);
-       _fade_out_label->Show (full);
-       _fade_out->Show (full);
        _scale_to_label->Show (full);
        _scale->show (full);
        _filters_label->Show (full);
@@ -257,15 +253,15 @@ VideoPanel::add_to_grid ()
        _colour_conversion->Show (full);
        _edit_colour_conversion_button->Show (full);
 
-       if (full) {
-               add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
-               _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
-               ++r;
+       add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
+       _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
+       ++r;
 
-               add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
-               _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
-               ++r;
+       add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
+       _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
+       ++r;
 
+       if (full) {
                add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0));
                _scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
                ++r;