X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=f64a84f7a15231e891871e5d71d7e86223bd6ed9;hb=23583dfb56181c76126e652042e9d1940367aa27;hp=d7ed46f467eca85192d6b6c355cf375830a72d9b;hpb=c8be0644833dce6ff39202430bba0ab358f3e096;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index d7ed46f46..f64a84f7a 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -26,10 +26,10 @@ #include "move_to_dialog.h" #include "lib/content.h" #include "lib/image_content.h" -#include "lib/subtitle_content.h" +#include "lib/text_content.h" #include "lib/dcp_subtitle_content.h" #include "lib/audio_content.h" -#include "lib/text_subtitle_content.h" +#include "lib/string_text_file_content.h" #include "lib/video_content.h" #include #include @@ -44,86 +44,58 @@ using boost::dynamic_pointer_cast; using boost::optional; using dcp::locale_convert; -TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) +TimingPanel::TimingPanel (ContentPanel* p, ControlFilmViewer* viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ /// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix : ContentSubPanel (p, S_("Timing|Timing")) , _viewer (viewer) { - wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); - _sizer->Add (grid, 0, wxALL, 8); - wxSize size = TimecodeBase::size (this); - wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); + for (int i = 0; i < 3; ++i) { + _colon[i] = create_label (this, wxT(":"), false); + } + //// TRANSLATORS: this is an abbreviation for "hours" - wxStaticText* t = new wxStaticText (this, wxID_ANY, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _h_label = new wxStaticText (this, wxID_ANY, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX /* Hack to work around failure to centre text on GTK */ - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); + gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE); #endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); //// TRANSLATORS: this is an abbreviation for "minutes" - t = new wxStaticText (this, wxID_ANY, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _m_label = new wxStaticText (this, wxID_ANY, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); + gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE); #endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); //// TRANSLATORS: this is an abbreviation for "seconds" - t = new wxStaticText (this, wxID_ANY, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _s_label = new wxStaticText (this, wxID_ANY, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); + gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE); #endif - labels->Add (t, 1, wxEXPAND); - add_label_to_sizer (labels, this, wxT (":"), false); //// TRANSLATORS: this is an abbreviation for "frames" - t = new wxStaticText (this, wxID_ANY, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); + _f_label = new wxStaticText (this, wxID_ANY, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL); #ifdef DCPOMATIC_LINUX - gtk_label_set_line_wrap (GTK_LABEL (t->GetHandle()), FALSE); + gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE); #endif - labels->Add (t, 1, wxEXPAND); - grid->Add (new wxStaticText (this, wxID_ANY, wxT (""))); - grid->Add (labels); - add_label_to_sizer (grid, this, _("Position"), true); + _position_label = create_label (this, _("Position"), true); _position = new Timecode (this); - grid->Add (_position); _move_to_start_of_reel = new wxButton (this, wxID_ANY, _("Move to start of reel")); - grid->AddSpacer (0); - grid->Add (_move_to_start_of_reel); - add_label_to_sizer (grid, this, _("Full length"), true); + _full_length_label = create_label (this, _("Full length"), true); _full_length = new Timecode (this); - grid->Add (_full_length); - add_label_to_sizer (grid, this, _("Trim from start"), true); + _trim_start_label = create_label (this, _("Trim from start"), true); _trim_start = new Timecode (this); - grid->Add (_trim_start); _trim_start_to_playhead = new wxButton (this, wxID_ANY, _("Trim up to current position")); - grid->AddSpacer (0); - grid->Add (_trim_start_to_playhead); - add_label_to_sizer (grid, this, _("Trim from end"), true); + _trim_end_label = create_label (this, _("Trim from end"), true); _trim_end = new Timecode (this); - grid->Add (_trim_end); _trim_end_to_playhead = new wxButton (this, wxID_ANY, _("Trim after current position")); - grid->AddSpacer (0); - grid->Add (_trim_end_to_playhead); - add_label_to_sizer (grid, this, _("Play length"), true); + _play_length_label = create_label (this, _("Play length"), true); _play_length = new Timecode (this); - grid->Add (_play_length); - - { - add_label_to_sizer (grid, this, _("Video frame rate"), true); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _video_frame_rate = new wxTextCtrl (this, wxID_ANY); - s->Add (_video_frame_rate, 1, wxEXPAND); - _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set")); - _set_video_frame_rate->Enable (false); - s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8); - grid->Add (s, 1, wxEXPAND); - } - grid->AddSpacer (0); + _video_frame_rate_label = create_label (this, _("Video frame rate"), true); + _video_frame_rate = new wxTextCtrl (this, wxID_ANY); + _set_video_frame_rate = new wxButton (this, wxID_ANY, _("Set")); + _set_video_frame_rate->Enable (false); /* We can't use Wrap() here as it doesn't work with markup: * http://trac.wxwidgets.org/ticket/13389 @@ -143,16 +115,12 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) } } - t = new wxStaticText (this, wxID_ANY, wxT ("")); - t->SetLabelMarkup (out); + _tip = new wxStaticText (this, wxID_ANY, wxT ("")); + _tip->SetLabelMarkup (out); #ifdef DCPOMATIC_OSX /* Hack to stop hidden text on some versions of OS X */ - t->SetMinSize (wxSize (-1, 256)); + _tip->SetMinSize (wxSize (-1, 256)); #endif - grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); - - /* Completely speculative fix for #891 */ - grid->Layout (); _position->Changed.connect (boost::bind (&TimingPanel::position_changed, this)); _move_to_start_of_reel->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::move_to_start_of_reel_clicked, this)); @@ -168,6 +136,87 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) _viewer->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this)); setup_sensitivity (); + add_to_grid (); +} + +void +TimingPanel::add_to_grid () +{ + bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; + + int r = 0; + + wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); + labels->Add (_h_label, 1, wxEXPAND); + add_label_to_sizer (labels, _colon[0], false); + labels->Add (_m_label, 1, wxEXPAND); + add_label_to_sizer (labels, _colon[1], false); + labels->Add (_s_label, 1, wxEXPAND); + add_label_to_sizer (labels, _colon[2], false); + labels->Add (_f_label, 1, wxEXPAND); + _grid->Add (labels, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _position_label, true, wxGBPosition(r, 0)); + _grid->Add (_position, wxGBPosition(r, 1)); + ++r; + + _move_to_start_of_reel->Show (full); + _full_length_label->Show (full); + _full_length->Show (full); + _trim_start_label->Show (full); + _trim_start->Show (full); + _trim_start_to_playhead->Show (full); + _trim_end_label->Show (full); + _trim_end->Show (full); + _trim_end_to_playhead->Show (full); + _play_length_label->Show (full); + _play_length->Show (full); + _video_frame_rate_label->Show (full); + _video_frame_rate->Show (full); + _set_video_frame_rate->Show (full); + _tip->Show (full); + + if (full) { + _grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0)); + _grid->Add (_full_length, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_start, wxGBPosition(r, 1)); + ++r; + + _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_end, wxGBPosition(r, 1)); + ++r; + + _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0)); + _grid->Add (_play_length, wxGBPosition(r, 1)); + ++r; + + { + add_label_to_sizer (_grid, _video_frame_rate_label, true, wxGBPosition(r, 0)); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_video_frame_rate, 1, wxEXPAND); + s->Add (_set_video_frame_rate, 0, wxLEFT | wxRIGHT, 8); + _grid->Add (s, wxGBPosition(r, 1), wxGBSpan(1, 2)); + } + ++r; + + _grid->Add (_tip, wxGBPosition(r, 1), wxGBSpan(1, 2)); + } + + /* Completely speculative fix for #891 */ + _grid->Layout (); } void @@ -282,7 +331,7 @@ TimingPanel::film_content_changed (int property) ++count_ac; content = i; } - if (i->subtitle && i->video_frame_rate()) { + if (!i->text.empty() && i->video_frame_rate()) { ++count_sc; content = i; } @@ -395,7 +444,7 @@ TimingPanel::play_length_changed () BOOST_FOREACH (shared_ptr i, _parent->selected ()) { FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ()); i->set_trim_end ( - ContentTime (i->full_length() - play_length, frc) - i->trim_start () + ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start () ); } } @@ -409,9 +458,16 @@ TimingPanel::video_frame_rate_changed () void TimingPanel::set_video_frame_rate () { - double const fr = locale_convert (wx_to_std (_video_frame_rate->GetValue ())); + optional fr; + if (_video_frame_rate->GetValue() != wxT("")) { + fr = locale_convert (wx_to_std (_video_frame_rate->GetValue ())); + } BOOST_FOREACH (shared_ptr i, _parent->selected ()) { - i->set_video_frame_rate (fr); + if (fr) { + i->set_video_frame_rate (*fr); + } else { + i->unset_video_frame_rate (); + } } _set_video_frame_rate->Enable (false);