UI tweaks for still image DCPs with audio.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index d3f318af667460d53a38ccd90a901cc47a09a644..999ea8753f68bd45b9141bfc9a2c536da3b38e23 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -77,14 +77,6 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
        make_subtitle_panel ();
        _notebook->AddPage (_subtitle_panel, _("Subtitles"), false);
 
-       wxColour col = _notebook->GetThemeBackgroundColour();
-       if (col.Ok()) {
-               _film_panel->SetBackgroundColour (col);
-               _video_panel->SetBackgroundColour (col);
-               _audio_panel->SetBackgroundColour (col);
-               _subtitle_panel->SetBackgroundColour (col);
-       }
-       
        set_film (_film);
        connect_to_widgets ();
 
@@ -101,7 +93,9 @@ FilmEditor::make_film_panel ()
 {
        _film_panel = new wxPanel (_notebook);
        _film_sizer = new wxFlexGridSizer (2, 4, 4);
-       _film_panel->SetSizer (_film_sizer);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_film_sizer, 0, wxALL, 8);
+       _film_panel->SetSizer (pad);
 
        add_label_to_sizer (_film_sizer, _film_panel, "Name");
        _name = new wxTextCtrl (_film_panel, wxID_ANY);
@@ -120,6 +114,11 @@ FilmEditor::make_film_panel ()
        _content = new wxFilePickerCtrl (_film_panel, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
        _film_sizer->Add (_content, 1, wxEXPAND);
 
+       _trust_content_header = new wxCheckBox (_film_panel, wxID_ANY, wxT ("Trust content's header"));
+       video_control (_trust_content_header);
+       _film_sizer->Add (_trust_content_header, 1);
+       _film_sizer->AddSpacer (0);
+
        add_label_to_sizer (_film_sizer, _film_panel, "Content Type");
        _dcp_content_type = new wxComboBox (_film_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);
        _film_sizer->Add (_dcp_content_type);
@@ -140,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);
        }
@@ -180,6 +179,7 @@ FilmEditor::connect_to_widgets ()
        _edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
        _format->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this);
        _content->Connect (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::content_changed), 0, this);
+       _trust_content_header->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::trust_content_header_changed), 0, this);
        _left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
        _right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
        _top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
@@ -215,7 +215,9 @@ FilmEditor::make_video_panel ()
 {
        _video_panel = new wxPanel (_notebook);
        _video_sizer = new wxFlexGridSizer (2, 4, 4);
-       _video_panel->SetSizer (_video_sizer);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_video_sizer, 0, wxALL, 8);
+       _video_panel->SetSizer (pad);
 
        add_label_to_sizer (_video_sizer, _video_panel, "Format");
        _format = new wxComboBox (_video_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);
@@ -267,7 +269,7 @@ FilmEditor::make_video_panel ()
        _top_crop->SetRange (0, 1024);
        _right_crop->SetRange (0, 1024);
        _bottom_crop->SetRange (0, 1024);
-       _still_duration->SetRange (0, 60 * 60);
+       _still_duration->SetRange (1, 60 * 60);
        _dcp_trim_start->SetRange (0, 100);
        _dcp_trim_end->SetRange (0, 100);
 }
@@ -277,7 +279,9 @@ FilmEditor::make_audio_panel ()
 {
        _audio_panel = new wxPanel (_notebook);
        _audio_sizer = new wxFlexGridSizer (2, 4, 4);
-       _audio_panel->SetSizer (_audio_sizer);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_audio_sizer, 0, wxALL, 8);
+       _audio_panel->SetSizer (pad);
 
        {
                video_control (add_label_to_sizer (_audio_sizer, _audio_panel, "Audio Gain"));
@@ -312,7 +316,7 @@ FilmEditor::make_audio_panel ()
        }
 
        _use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio"));
-       _audio_sizer->Add (video_control (_use_external_audio));
+       _audio_sizer->Add (_use_external_audio);
        _audio_sizer->AddSpacer (0);
 
        assert (MAX_AUDIO_CHANNELS == 6);
@@ -329,7 +333,7 @@ FilmEditor::make_audio_panel ()
        for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
                add_label_to_sizer (_audio_sizer, _audio_panel, channels[i]);
                _external_audio[i] = new wxFilePickerCtrl (_audio_panel, wxID_ANY, wxT (""), wxT ("Select Audio File"), wxT ("*.wav"));
-               _audio_sizer->Add (video_control (_external_audio[i]), 1, wxEXPAND);
+               _audio_sizer->Add (_external_audio[i], 1, wxEXPAND);
        }
 
        _audio_gain->SetRange (-60, 60);
@@ -341,14 +345,16 @@ FilmEditor::make_subtitle_panel ()
 {
        _subtitle_panel = new wxPanel (_notebook);
        _subtitle_sizer = new wxFlexGridSizer (2, 4, 4);
-       _subtitle_panel->SetSizer (_subtitle_sizer);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_subtitle_sizer, 0, wxALL, 8);
+       _subtitle_panel->SetSizer (pad);
 
        _with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, wxT("With Subtitles"));
        video_control (_with_subtitles);
        _subtitle_sizer->Add (_with_subtitles, 1);
        
        _subtitle_stream = new wxComboBox (_subtitle_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);
-       _subtitle_sizer->Add (_subtitle_stream);
+       _subtitle_sizer->Add (video_control (_subtitle_stream));
 
        video_control (add_label_to_sizer (_subtitle_sizer, _subtitle_panel, "Subtitle Offset"));
        _subtitle_offset = new wxSpinCtrl (_subtitle_panel);
@@ -427,6 +433,16 @@ FilmEditor::content_changed (wxCommandEvent &)
        }
 }
 
+void
+FilmEditor::trust_content_header_changed (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->set_trust_content_header (_trust_content_header->GetValue ());
+}
+
 /** Called when the DCP A/B switch has been toggled */
 void
 FilmEditor::dcp_ab_toggled (wxCommandEvent &)
@@ -495,6 +511,9 @@ FilmEditor::film_changed (Film::Property p)
                setup_subtitle_control_sensitivity ();
                setup_streams ();
                break;
+       case Film::TRUST_CONTENT_HEADER:
+               checked_set (_trust_content_header, _film->trust_content_header ());
+               break;
        case Film::SUBTITLE_STREAMS:
                setup_subtitle_control_sensitivity ();
                setup_streams ();
@@ -569,8 +588,6 @@ FilmEditor::film_changed (Film::Property p)
                checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
                _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
                break;
-       case Film::THUMBS:
-               break;
        case Film::DCP_AB:
                checked_set (_dcp_ab, _film->dcp_ab ());
                break;
@@ -694,6 +711,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
        film_changed (Film::NAME);
        film_changed (Film::USE_DCI_NAME);
        film_changed (Film::CONTENT);
+       film_changed (Film::TRUST_CONTENT_HEADER);
        film_changed (Film::DCP_CONTENT_TYPE);
        film_changed (Film::FORMAT);
        film_changed (Film::CROP);
@@ -731,6 +749,7 @@ FilmEditor::set_things_sensitive (bool s)
        _edit_dci_button->Enable (s);
        _format->Enable (s);
        _content->Enable (s);
+       _trust_content_header->Enable (s);
        _left_crop->Enable (s);
        _right_crop->Enable (s);
        _top_crop->Enable (s);