X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimecode.cc;h=754483c0c2ce08407bc11c9d4af682937ac1f095;hp=bd0a182c2f4d6b1d3dd027875449c31863c25410;hb=9001a63be211fd8e97431f8fc07c66af01554f5a;hpb=e491397c0028a80ac4a48a92007f783746553c1a

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index bd0a182c2..754483c0c 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -1,37 +1,37 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
-#include "lib/util.h"
 #include "timecode.h"
 #include "wx_util.h"
-#include <boost/lexical_cast.hpp>
+#include "dcpomatic_button.h"
+#include "lib/util.h"
+#include <iostream>
 
 using std::string;
 using std::cout;
-using boost::lexical_cast;
 
-TimecodeBase::TimecodeBase (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);
+	wxSize const s = TimecodeBase::size (parent);
 
 	wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
 	wxArrayString list;
@@ -44,65 +44,78 @@ TimecodeBase::TimecodeBase (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);
+	_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);
+	_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);
+	_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);
+	_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"));
+		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 (&TimecodeBase::changed, this));
-	_minutes->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&TimecodeBase::changed, this));
-	_seconds->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&TimecodeBase::changed, this));
-	_frames->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&TimecodeBase::changed, this));
-	_set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&TimecodeBase::set_clicked, this));
 
-	_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);
 
 	SetSizerAndFit (_sizer);
 }
 
+void
+TimecodeBase::set_focus ()
+{
+	_hours->SetFocus ();
+}
+
 void
 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
 TimecodeBase::changed ()
 {
-	_set_button->Enable (true);
+	if (_set_button) {
+		_set_button->Enable (true);
+	}
 }
 
 void
 TimecodeBase::set_clicked ()
 {
 	Changed ();
-	_set_button->Enable (false);
+	if (_set_button) {
+		_set_button->Enable (false);
+	}
 }
 
 void
@@ -112,3 +125,12 @@ TimecodeBase::set_editable (bool e)
 	_fixed->Show (!e);
 	_sizer->Layout ();
 }
+
+wxSize
+TimecodeBase::size (wxWindow* parent)
+{
+	wxClientDC dc (parent);
+	wxSize size = dc.GetTextExtent (wxT ("9999"));
+	size.SetHeight (-1);
+	return size;
+}