Tidy up still-image UI.
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Dec 2012 20:16:07 +0000 (20:16 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Dec 2012 20:16:07 +0000 (20:16 +0000)
src/wx/film_editor.cc
src/wx/film_viewer.cc

index 908bb3a1e70294399ac4f47c8d26e5546b55b693..0243c6afc9e368ca0c3df2463d0002577252e463 100644 (file)
@@ -139,12 +139,12 @@ FilmEditor::make_film_panel ()
        {
                video_control (add_label_to_sizer (_film_sizer, _film_panel, "Trim frames"));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               add_label_to_sizer (s, _film_panel, "Start");
+               video_control (add_label_to_sizer (s, _film_panel, "Start"));
                _dcp_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_dcp_trim_start);
-               add_label_to_sizer (s, _film_panel, "End");
+               s->Add (video_control (_dcp_trim_start));
+               video_control (add_label_to_sizer (s, _film_panel, "End"));
                _dcp_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_dcp_trim_end);
+               s->Add (video_control (_dcp_trim_end));
 
                _film_sizer->Add (s);
        }
index 3ee761ba48204e205ff65dec95e9b068f8dfe485..8cc4776d1a53a1dc8078116ef8cea2d7b0fb23c3 100644 (file)
@@ -99,6 +99,8 @@ FilmViewer::film_changed (Film::Property p)
                calculate_sizes ();
                get_frame ();
                _panel->Refresh ();
+               _slider->Show (_film->content_type() == VIDEO);
+               _play_button->Show (_film->content_type() == VIDEO);
                break;
        }
        case Film::WITH_SUBTITLES: