X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=5fcd527b8ba6daf8efdf70d1b6b4f73c2817030a;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=24099e1ccd97ed2b524ce31a9bc20490542e4e25;hpb=4edc14c8b1410e24f68b510cc14409b96c0338a3;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 24099e1cc..5fcd527b8 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -51,11 +51,14 @@ using std::pair; using std::cout; using std::list; using std::set; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::bind; using boost::optional; using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif VideoPanel::VideoPanel (ContentPanel* p) @@ -69,8 +72,6 @@ VideoPanel::VideoPanel (ContentPanel* p) font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); - _use = new wxCheckBox (this, wxID_ANY, _("Use")); - _type_label = create_label (this, _("Type"), true); _frame_type = new ContentChoice ( this, @@ -85,8 +86,19 @@ VideoPanel::VideoPanel (ContentPanel* p) _crop_label = create_label (this, _("Crop"), true); +#if defined(__WXGTK3__) + int const crop_width = 128; + int const link_width = 32; + int const link_height = 64; +#elif defined(DCPOMATIC_OSX) + int const crop_width = 56; + int const link_width = 24; + int const link_height = 28; +#else int const crop_width = 56; + int const link_width = 22; int const link_height = 28; +#endif _left_crop_label = create_label (this, _("Left"), true); _left_crop = new ContentSpinCtrl ( @@ -99,7 +111,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::bind (&VideoPanel::left_crop_changed, this) ); - _left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(22, link_height)); + _left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height)); _left_right_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG)); _right_crop_label = create_label (this, _("Right"), true); @@ -124,7 +136,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::bind (&VideoPanel::top_crop_changed, this) ); - _top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(22, link_height)); + _top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height)); _top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG)); _bottom_crop_label = create_label (this, _("Bottom"), true); @@ -146,16 +158,15 @@ VideoPanel::VideoPanel (ContentPanel* p) wxClientDC dc (this); wxSize size = dc.GetTextExtent (wxT ("A quite long name")); +#ifdef __WXGTK3__ + size.SetWidth (size.GetWidth() + 64); +#endif size.SetHeight (-1); _scale_label = create_label (this, _("Scale"), true); _scale_fit = new wxRadioButton (this, wxID_ANY, _("to fit DCP")); - _scale_custom = new wxRadioButton (this, wxID_ANY, _("custom"), wxDefaultPosition, size); - _scale_custom_edit = new Button (this, _("Edit...")); - - _filters_label = create_label (this, _("Filters"), true); - _filters = new StaticText (this, _("None"), wxDefaultPosition, size); - _filters_button = new Button (this, _("Edit...")); + _scale_custom = new wxRadioButton (this, wxID_ANY, _("custom")); + _scale_custom_edit = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit..."))); _colour_conversion_label = create_label (this, _("Colour conversion"), true); _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size); @@ -166,7 +177,7 @@ VideoPanel::VideoPanel (ContentPanel* p) /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix _colour_conversion->Append (S_("Colour|Custom")); - _edit_colour_conversion_button = new Button (this, _("Edit...")); + _edit_colour_conversion_button = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit..."))); _range_label = create_label (this, _("Range"), true); _range = new wxChoice (this, wxID_ANY); @@ -194,9 +205,7 @@ VideoPanel::VideoPanel (ContentPanel* p) _fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this)); _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this)); - _use->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::use_clicked, this)); _reference->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this)); - _filters_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_filters_clicked, this)); _scale_fit->Bind (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_fit_clicked, this)); _scale_custom->Bind (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_custom_clicked, this)); _scale_custom_edit->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::scale_custom_edit_clicked, this)); @@ -212,23 +221,12 @@ VideoPanel::VideoPanel (ContentPanel* p) void VideoPanel::add_to_grid () { - bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; - int r = 0; - _reference->Show (full); - _reference_note->Show (full && !_reference_note->GetLabel().IsEmpty()); - - if (full) { - wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); - reference_sizer->Add (_reference, 0); - reference_sizer->Add (_reference_note, 0); - _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3)); - ++r; - } - - _use->Show (full); - _grid->Add (_use, wxGBPosition(r, 0), wxGBSpan(1, 2)); + wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); + reference_sizer->Add (_reference, 0); + reference_sizer->Add (_reference_note, 0); + _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3)); ++r; add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0)); @@ -237,34 +235,36 @@ VideoPanel::add_to_grid () int cr = 0; wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0)); - _left_crop->add (crop, wxGBPosition (cr, 1)); - crop->Add (_left_right_link, wxGBPosition(cr, 2)); + _left_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); +#ifdef __WXGTK3__ + crop->Add (_left_right_link, wxGBPosition(cr, 2), wxGBSpan(2, 1)); + ++cr; + add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition(cr, 0)); + _right_crop->add (crop, wxGBPosition(cr, 1)); +#else + crop->Add (_left_right_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 3)); - _right_crop->add (crop, wxGBPosition (cr, 4)); + _right_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); +#endif ++cr; add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0)); - _top_crop->add (crop, wxGBPosition (cr, 1)); - crop->Add (_top_bottom_link, wxGBPosition(cr, 2)); + _top_crop->add (crop, wxGBPosition (cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); +#ifdef __WXGTK3__ + crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxGBSpan(2, 1)); + ++cr; + add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition(cr, 0)); + _bottom_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); +#else + crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 3)); - _bottom_crop->add (crop, wxGBPosition (cr, 4)); + _bottom_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); +#endif add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0)); _grid->Add (crop, wxGBPosition(r, 1)); ++r; - _scale_label->Show (full); - _scale_fit->Show (full); - _scale_custom->Show (full); - _scale_custom_edit->Show (full); - _filters_label->Show (full); - _filters->Show (full); - _filters_button->Show (full); - _colour_conversion_label->Show (full); - _colour_conversion->Show (full); - _edit_colour_conversion_button->Show (full); - _range_label->Show (full); - _range->Show (full); - add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0)); _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3)); ++r; @@ -273,41 +273,30 @@ VideoPanel::add_to_grid () _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3)); ++r; - if (full) { - add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0)); - { - wxSizer* v = new wxBoxSizer (wxVERTICAL); - v->Add (_scale_fit, 0, wxBOTTOM, 4); - wxSizer* h = new wxBoxSizer (wxHORIZONTAL); - h->Add (_scale_custom, 1, wxRIGHT, 6); - h->Add (_scale_custom_edit, 0); - v->Add (h, 0); - _grid->Add (v, wxGBPosition(r, 1)); - } - ++r; - - add_label_to_sizer (_grid, _filters_label, true, wxGBPosition (r, 0)); - { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); - s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL); - _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - } - ++r; - - add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0)); - { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); - s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); - _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - } - ++r; + add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0)); + { + wxSizer* v = new wxBoxSizer (wxVERTICAL); + v->Add (_scale_fit, 0, wxBOTTOM, 4); + wxSizer* h = new wxBoxSizer (wxHORIZONTAL); + h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6); + h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL); + v->Add (h, 0); + _grid->Add (v, wxGBPosition(r, 1)); + } + ++r; - add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0)); - _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL); - ++r; + add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0)); + { + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); } + ++r; + + add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0)); + _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL); + ++r; _grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6); ++r; @@ -415,30 +404,7 @@ VideoPanel::film_content_changed (int property) setup_sensitivity (); - } else if (property == FFmpegContentProperty::FILTERS) { - if (fcs) { - string p = Filter::ffmpeg_string (fcs->filters ()); - if (p.empty ()) { - checked_set (_filters, _("None")); - } else { - if (p.length() > 25) { - p = p.substr (0, 25) + "..."; - } - checked_set (_filters, p); - } - } } else if (property == VideoContentProperty::USE) { - set check; - BOOST_FOREACH (shared_ptr i, vc) { - check.insert (i->video->use()); - } - - if (check.size() == 1) { - checked_set (_use, vc.front()->video->use()); - } else { - checked_set (_use, false); - } - setup_sensitivity (); } else if (property == VideoContentProperty::FADE_IN) { set check; @@ -502,20 +468,6 @@ VideoPanel::film_content_changed (int property) } } -/** Called when the `Edit filters' button has been clicked */ -void -VideoPanel::edit_filters_clicked () -{ - FFmpegContentList c = _parent->selected_ffmpeg (); - if (c.size() != 1) { - return; - } - - FilterDialog* d = new FilterDialog (this, c.front()->filters()); - d->ActiveChanged.connect (bind (&FFmpegContent::set_filters, c.front(), _1)); - d->ShowModal (); - d->Destroy (); -} void VideoPanel::setup_description () @@ -625,9 +577,14 @@ VideoPanel::setup_sensitivity () } setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot); - bool const enable = !_reference->GetValue() && _use->GetValue(); + bool any_use = false; + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + if (i->video && i->video->use()) { + any_use = true; + } + } - _use->Enable (!_reference->GetValue()); + bool const enable = !_reference->GetValue() && any_use; if (!enable) { _frame_type->wrapped()->Enable (false); @@ -641,8 +598,6 @@ VideoPanel::setup_sensitivity () _scale_custom->Enable (false); _scale_custom_edit->Enable (false); _description->Enable (false); - _filters->Enable (false); - _filters_button->Enable (false); _colour_conversion->Enable (false); _range->Enable (false); } else { @@ -661,10 +616,8 @@ VideoPanel::setup_sensitivity () _scale_custom->Enable (true); _scale_custom_edit->Enable (_scale_custom->GetValue()); _description->Enable (true); - _filters->Enable (true); - _filters_button->Enable (single && !ffmpeg_sel.empty ()); _colour_conversion->Enable (!video_sel.empty()); - _range->Enable (single && !video_sel.empty()); + _range->Enable (single && !video_sel.empty() && !dcp); } ContentList vc = _parent->selected_video (); @@ -698,13 +651,6 @@ VideoPanel::fade_out_changed () } } -void -VideoPanel::use_clicked () -{ - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { - i->video->set_use (_use->GetValue()); - } -} void VideoPanel::reference_clicked ()