X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimecode.cc;h=0230d665d10cc8bc29cf917ab280522255f75311;hp=07cb0be6586b6485defff73b314ad2702fac87f5;hb=121988b23c485ccb5ac8220c1776d10cb33e0db7;hpb=6de35d058821acc092d2aae75543024a97026b8a diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc index 07cb0be65..0230d665d 100644 --- a/src/wx/timecode.cc +++ b/src/wx/timecode.cc @@ -1,37 +1,37 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include "lib/util.h" #include "timecode.h" #include "wx_util.h" +#include "dcpomatic_button.h" +#include "lib/util.h" +#include using std::string; using std::cout; -using boost::lexical_cast; -Timecode::Timecode (wxWindow* parent) +TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button) : wxPanel (parent) + , _set_button (0) { - wxClientDC dc (parent); - wxSize size = dc.GetTextExtent (wxT ("9999")); - size.SetHeight (-1); + auto const s = TimecodeBase::size (parent); wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); wxArrayString list; @@ -44,38 +44,42 @@ Timecode::Timecode (wxWindow* parent) validator.SetIncludes (list); _sizer = new wxBoxSizer (wxHORIZONTAL); - + _editable = new wxPanel (this); - wxSizer* editable_sizer = new wxBoxSizer (wxHORIZONTAL); - _hours = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator); + auto editable_sizer = new wxBoxSizer (wxHORIZONTAL); + _hours = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator); _hours->SetMaxLength (2); editable_sizer->Add (_hours); - add_label_to_sizer (editable_sizer, _editable, wxT (":"), false); - _minutes = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator); + add_label_to_sizer (editable_sizer, _editable, wxT(":"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + _minutes = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator); _minutes->SetMaxLength (2); editable_sizer->Add (_minutes); - add_label_to_sizer (editable_sizer, _editable, wxT (":"), false); - _seconds = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator); + add_label_to_sizer (editable_sizer, _editable, wxT (":"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + _seconds = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator); _seconds->SetMaxLength (2); editable_sizer->Add (_seconds); - add_label_to_sizer (editable_sizer, _editable, wxT (":"), false); - _frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator); + add_label_to_sizer (editable_sizer, _editable, wxT (":"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + _frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, s, 0, validator); _frames->SetMaxLength (2); editable_sizer->Add (_frames); - _set_button = new wxButton (_editable, wxID_ANY, _("Set")); - editable_sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8); + + if (set_button) { + _set_button = new Button (_editable, _("Set"), wxDefaultPosition, small_button_size(parent, _("Set"))); + editable_sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8); + } _editable->SetSizerAndFit (editable_sizer); _sizer->Add (_editable); - _fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false); - - _hours->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this)); - _minutes->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this)); - _seconds->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this)); - _frames->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&Timecode::changed, this)); - _set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Timecode::set_clicked, this)); + _fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); - _set_button->Enable (false); + _hours->Bind (wxEVT_TEXT, boost::bind (&TimecodeBase::changed, this)); + _minutes->Bind (wxEVT_TEXT, boost::bind (&TimecodeBase::changed, this)); + _seconds->Bind (wxEVT_TEXT, boost::bind (&TimecodeBase::changed, this)); + _frames->Bind (wxEVT_TEXT, boost::bind (&TimecodeBase::changed, this)); + if (_set_button) { + _set_button->Bind (wxEVT_BUTTON, boost::bind (&TimecodeBase::set_clicked, this)); + _set_button->Enable (false); + } set_editable (true); @@ -83,65 +87,70 @@ Timecode::Timecode (wxWindow* parent) } void -Timecode::set (DCPTime t, int fps) -{ - int h; - int m; - int s; - int f; - t.split (fps, h, m, s, f); - - checked_set (_hours, lexical_cast (h)); - checked_set (_minutes, lexical_cast (m)); - checked_set (_seconds, lexical_cast (s)); - checked_set (_frames, lexical_cast (f)); - - _fixed->SetLabel (std_to_wx (t.timecode (fps))); -} - -DCPTime -Timecode::get (int fps) const +TimecodeBase::set_focus () { - DCPTime t; - string const h = wx_to_std (_hours->GetValue ()); - t += DCPTime::from_seconds (lexical_cast (h.empty() ? "0" : h) * 3600); - string const m = wx_to_std (_minutes->GetValue()); - t += DCPTime::from_seconds (lexical_cast (m.empty() ? "0" : m) * 60); - string const s = wx_to_std (_seconds->GetValue()); - t += DCPTime::from_seconds (lexical_cast (s.empty() ? "0" : s)); - string const f = wx_to_std (_frames->GetValue()); - t += DCPTime::from_seconds (lexical_cast (f.empty() ? "0" : f) / fps); - - return t; + _hours->SetFocus (); } void -Timecode::clear () +TimecodeBase::clear () { - checked_set (_hours, ""); - checked_set (_minutes, ""); - checked_set (_seconds, ""); - checked_set (_frames, ""); - _fixed->SetLabel (""); + checked_set (_hours, wxT ("")); + checked_set (_minutes, wxT ("")); + checked_set (_seconds, wxT ("")); + checked_set (_frames, wxT ("")); + checked_set (_fixed, wxT ("")); } void -Timecode::changed () +TimecodeBase::changed () { - _set_button->Enable (true); + if (_set_button && !_ignore_changed) { + _set_button->Enable (true); + } } void -Timecode::set_clicked () +TimecodeBase::set_clicked () { Changed (); - _set_button->Enable (false); + if (_set_button) { + _set_button->Enable (false); + } + + _ignore_changed = true; + if (_hours->GetValue().IsEmpty()) { + _hours->SetValue(wxT("0")); + } + if (_minutes->GetValue().IsEmpty()) { + _minutes->SetValue(wxT("0")); + } + if (_seconds->GetValue().IsEmpty()) { + _seconds->SetValue(wxT("0")); + } + if (_frames->GetValue().IsEmpty()) { + _frames->SetValue(wxT("0")); + } + _ignore_changed = false; } void -Timecode::set_editable (bool e) +TimecodeBase::set_editable (bool e) { _editable->Show (e); _fixed->Show (!e); _sizer->Layout (); } + +wxSize +TimecodeBase::size (wxWindow* parent) +{ + wxClientDC dc (parent); +#ifdef DCPOMATIC_OSX + auto size = dc.GetTextExtent(wxT("999")); +#else + auto size = dc.GetTextExtent(wxT("99999")); +#endif + size.SetHeight (-1); + return size; +}