X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.cc;h=0230d665d10cc8bc29cf917ab280522255f75311;hb=7926a03f67cf0a371e43b5d8b4d075c7a789a478;hp=699687a956f05e77497edaf12629248730968974;hpb=ad5c8849fc3ef5aad88201f28db5474a60db4436;p=dcpomatic.git

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 699687a95..0230d665d 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,10 @@
 
 */
 
-#include "lib/util.h"
 #include "timecode.h"
 #include "wx_util.h"
+#include "dcpomatic_button.h"
+#include "lib/util.h"
 #include <iostream>
 
 using std::string;
@@ -30,7 +31,7 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 	: wxPanel (parent)
 	, _set_button (0)
 {
-	wxSize const s = TimecodeBase::size (parent);
+	auto const s = TimecodeBase::size (parent);
 
 	wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
 	wxArrayString list;
@@ -45,30 +46,31 @@ TimecodeBase::TimecodeBase (wxWindow* parent, bool set_button)
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
 	_editable = new wxPanel (this);
-	wxSizer* editable_sizer = new wxBoxSizer (wxHORIZONTAL);
+	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);
+	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);
+	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);
+	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);
+
 	if (set_button) {
-		_set_button = new wxButton (_editable, wxID_ANY, _("Set"));
+		_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);
+	_fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
 
 	_hours->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
 	_minutes->Bind	  (wxEVT_TEXT,   boost::bind (&TimecodeBase::changed, this));
@@ -103,7 +105,7 @@ TimecodeBase::clear ()
 void
 TimecodeBase::changed ()
 {
-	if (_set_button) {
+	if (_set_button && !_ignore_changed) {
 		_set_button->Enable (true);
 	}
 }
@@ -115,6 +117,21 @@ TimecodeBase::set_clicked ()
 	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
@@ -129,7 +146,11 @@ wxSize
 TimecodeBase::size (wxWindow* parent)
 {
 	wxClientDC dc (parent);
-	wxSize size = dc.GetTextExtent (wxT ("9999"));
+#ifdef DCPOMATIC_OSX
+	auto size = dc.GetTextExtent(wxT("999"));
+#else
+	auto size = dc.GetTextExtent(wxT("99999"));
+#endif
 	size.SetHeight (-1);
 	return size;
 }