From dd7c63112eda87f2e491261873075acff114396b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 May 2020 21:43:24 +0200 Subject: [PATCH] Reformat crop controls. --- src/wx/video_panel.cc | 13 ++++++++----- src/wx/video_panel.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 992ddf115..b01e9b8aa 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -102,7 +102,9 @@ VideoPanel::VideoPanel (ContentPanel* p) &caster ); - _left_crop_label = create_label (this, _("Left crop"), true); + _crop_label = create_label (this, _("Crop"), true); + + _left_crop_label = create_label (this, _("Left"), true); _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -112,7 +114,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::set_left_crop) ); - _right_crop_label = create_label (this, _("Right crop"), true); + _right_crop_label = create_label (this, _("Right"), true); _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -122,7 +124,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::set_right_crop) ); - _top_crop_label = create_label (this, _("Top crop"), true); + _top_crop_label = create_label (this, _("Top"), true); _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -132,7 +134,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::set_top_crop) ); - _bottom_crop_label = create_label (this, _("Bottom crop"), true); + _bottom_crop_label = create_label (this, _("Bottom"), true); _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -257,7 +259,8 @@ VideoPanel::add_to_grid () _top_crop->add (crop, wxGBPosition (cr, 1)); add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2)); _bottom_crop->add (crop, wxGBPosition (cr, 3)); - _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4)); + add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0)); + _grid->Add (crop, wxGBPosition(r, 1), wxGBSpan(2, 3)); r += 2; _scale_to_label->Show (full); diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h index ad0ba402a..04063ef54 100644 --- a/src/wx/video_panel.h +++ b/src/wx/video_panel.h @@ -64,6 +64,7 @@ private: wxCheckBox* _use; wxStaticText* _type_label; ContentChoice* _frame_type; + wxStaticText* _crop_label; wxStaticText* _left_crop_label; ContentSpinCtrl* _left_crop; wxStaticText* _right_crop_label; -- 2.30.2