X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=55c53e79d2924cc4889c86ec61ea910443eb9431;hb=d43aadb0bbb5cbdebbc5c95cb3065ed0aa49296a;hp=27d5b9cd35f3f4e87bd771d3f76402c1f674592e;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 27d5b9cd3..55c53e79d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,20 +17,20 @@ */ -#include #include "lib/content.h" #include "lib/image_content.h" +#include "lib/raw_convert.h" #include "timing_panel.h" #include "wx_util.h" #include "timecode.h" #include "content_panel.h" +#include using std::cout; using std::string; using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using dcp::raw_convert; TimingPanel::TimingPanel (ContentPanel* p) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ @@ -39,20 +39,54 @@ TimingPanel::TimingPanel (ContentPanel* p) wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); _sizer->Add (grid, 0, wxALL, 8); + wxSize size = TimecodeBase::size (this); + + wxSizer* labels = new wxBoxSizer (wxHORIZONTAL); + //// TRANSLATORS: this is an abbreviation for "hours" + wxStaticText* t = 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); +#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); +#ifdef DCPOMATIC_LINUX + gtk_label_set_line_wrap (GTK_LABEL (t->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); +#ifdef DCPOMATIC_LINUX + gtk_label_set_line_wrap (GTK_LABEL (t->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); +#ifdef DCPOMATIC_LINUX + gtk_label_set_line_wrap (GTK_LABEL (t->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 = new Timecode (this); + _position = new Timecode (this); grid->Add (_position); add_label_to_sizer (grid, this, _("Full length"), true); - _full_length = new Timecode (this); + _full_length = new Timecode (this); grid->Add (_full_length); add_label_to_sizer (grid, this, _("Trim from start"), true); - _trim_start = new Timecode (this); + _trim_start = new Timecode (this); grid->Add (_trim_start); add_label_to_sizer (grid, this, _("Trim from end"), true); - _trim_end = new Timecode (this); + _trim_end = new Timecode (this); grid->Add (_trim_end); add_label_to_sizer (grid, this, _("Play length"), true); - _play_length = new Timecode (this); + _play_length = new Timecode (this); grid->Add (_play_length); { @@ -66,6 +100,30 @@ TimingPanel::TimingPanel (ContentPanel* p) grid->Add (s, 1, wxEXPAND); } + grid->AddSpacer (0); + + /* We can't use Wrap() here as it doesn't work with markup: + * http://trac.wxwidgets.org/ticket/13389 + */ + + wxString in = _("Only change this if it the content's frame rate has been read incorrectly."); + wxString out; + int const width = 20; + int current = 0; + for (size_t i = 0; i < in.Length(); ++i) { + if (in[i] == ' ' && current >= width) { + out += '\n'; + current = 0; + } else { + out += in[i]; + ++current; + } + } + + t = new wxStaticText (this, wxID_ANY, wxT ("")); + t->SetLabelMarkup (out); + grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); + _position->Changed.connect (boost::bind (&TimingPanel::position_changed, this)); _full_length->Changed.connect (boost::bind (&TimingPanel::full_length_changed, this)); _trim_start->Changed.connect (boost::bind (&TimingPanel::trim_start_changed, this)); @@ -75,6 +133,40 @@ TimingPanel::TimingPanel (ContentPanel* p) _set_video_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimingPanel::set_video_frame_rate, this)); } +void +TimingPanel::update_full_length () +{ + ContentList cl = _parent->selected (); + + set check; + for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { + check.insert ((*i)->full_length ()); + } + + if (check.size() == 1) { + _full_length->set (cl.front()->full_length (), _parent->film()->video_frame_rate ()); + } else { + _full_length->clear (); + } +} + +void +TimingPanel::update_play_length () +{ + ContentList cl = _parent->selected (); + + set check; + for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { + check.insert ((*i)->length_after_trim ()); + } + + if (check.size() == 1) { + _play_length->set (cl.front()->length_after_trim (), _parent->film()->video_frame_rate ()); + } else { + _play_length->clear (); + } +} + void TimingPanel::film_content_changed (int property) { @@ -104,16 +196,7 @@ TimingPanel::film_content_changed (int property) property == VideoContentProperty::VIDEO_FRAME_TYPE ) { - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->full_length ()); - } - - if (check.size() == 1) { - _full_length->set (cl.front()->full_length (), film_video_frame_rate); - } else { - _full_length->clear (); - } + update_full_length (); } else if (property == ContentProperty::TRIM_START) { @@ -150,16 +233,7 @@ TimingPanel::film_content_changed (int property) property == VideoContentProperty::VIDEO_FRAME_TYPE ) { - set check; - for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - check.insert ((*i)->length_after_trim ()); - } - - if (check.size() == 1) { - _play_length->set (cl.front()->length_after_trim (), film_video_frame_rate); - } else { - _play_length->clear (); - } + update_play_length (); } if (property == VideoContentProperty::VIDEO_FRAME_RATE) { @@ -281,3 +355,12 @@ TimingPanel::content_selection_changed () film_content_changed (ContentProperty::TRIM_END); film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE); } + +void +TimingPanel::film_changed (Film::Property p) +{ + if (p == Film::VIDEO_FRAME_RATE) { + update_full_length (); + update_play_length (); + } +}