using boost::bind;
using boost::optional;
using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
VideoPanel::VideoPanel (ContentPanel* p)
_crop_label = create_label (this, _("Crop"), true);
+#ifdef __WXGTK3__
+ int const crop_width = 128;
+ int const link_width = 32;
+ int const link_height = 64;
+#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<VideoContent> (
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);
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);
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 = new wxRadioButton (this, wxID_ANY, _("custom"));
_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..."));
-
_colour_conversion_label = create_label (this, _("Colour conversion"), true);
_colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
_colour_conversion->Append (_("None"));
_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, 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));
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));
+#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));
add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 3));
_right_crop->add (crop, wxGBPosition (cr, 4));
+#endif
++cr;
add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0));
_top_crop->add (crop, wxGBPosition (cr, 1));
+#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));
+#else
crop->Add (_top_bottom_link, wxGBPosition(cr, 2));
add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 3));
_bottom_crop->add (crop, wxGBPosition (cr, 4));
+#endif
add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0));
_grid->Add (crop, wxGBPosition(r, 1));
++r;
_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);
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);
+ 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, _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);
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) {
setup_sensitivity ();
} else if (property == VideoContentProperty::FADE_IN) {
}
}
-/** 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 ()
_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 {
_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());
}