X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fvideo_panel.cc;h=5fcd527b8ba6daf8efdf70d1b6b4f73c2817030a;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=e7d02fe30378494e548a6c72ca83008614d84e31;hpb=c4bb5614c02316ac54cb88a4f1f9885a09329ef2;p=dcpomatic.git

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index e7d02fe30..5fcd527b8 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -51,8 +51,8 @@ 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;
@@ -86,10 +86,14 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
 	_crop_label = create_label (this, _("Crop"), true);
 
-#ifdef __WXGTK3__
+#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;
@@ -162,7 +166,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_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"));
-	_scale_custom_edit = new Button (this, _("Edit..."));
+	_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);
@@ -173,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);
@@ -217,20 +221,13 @@ 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;
-	}
+	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));
 	_frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
@@ -238,45 +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));
+	_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));
+	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));
+	_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));
+	_bottom_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 #else
-	crop->Add (_top_bottom_link, wxGBPosition(cr, 2));
+	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);
-	_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;
@@ -285,32 +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 | 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, _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;