Add hinting to the seek dialogue; may be a nice fix for #1736.

[dcpomatic.git] / src / wx / timecode.h

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 18eddfdb4a19b72fa2eb854e46b53f01e0d453fc..0c99d536187cfeb61586cd9a28c1d91a62bebe08 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,18 +23,19 @@
 
 #include "wx_util.h"
 #include "lib/types.h"
+#include <dcp/raw_convert.h>
 #include <wx/wx.h>
 #include <boost/signals2.hpp>
-#include <boost/lexical_cast.hpp>
 
 class TimecodeBase : public wxPanel
 {
 public:
-       TimecodeBase (wxWindow *);
+       TimecodeBase (wxWindow *, bool set_button);
 
        void clear ();
 
        void set_editable (bool);
+       void set_focus ();
 
        boost::signals2::signal<void ()> Changed;
 
@@ -58,8 +59,8 @@ template <class T>
 class Timecode : public TimecodeBase
 {
 public:
-       Timecode (wxWindow* parent)
-               : TimecodeBase (parent)
+       Timecode (wxWindow* parent, bool set_button = true)
+               : TimecodeBase (parent, set_button)
        {
 
        }
@@ -72,28 +73,52 @@ public:
                int f;
                t.split (fps, h, m, s, f);
 
-               checked_set (_hours, boost::lexical_cast<std::string> (h));
-               checked_set (_minutes, boost::lexical_cast<std::string> (m));
-               checked_set (_seconds, boost::lexical_cast<std::string> (s));
-               checked_set (_frames, boost::lexical_cast<std::string> (f));
+               checked_set (_hours, dcp::raw_convert<std::string>(h));
+               checked_set (_minutes, dcp::raw_convert<std::string>(m));
+               checked_set (_seconds, dcp::raw_convert<std::string>(s));
+               checked_set (_frames, dcp::raw_convert<std::string>(f));
 
                checked_set (_fixed, t.timecode (fps));
        }
 
-       T get (int fps) const
+       void set_hint (T t, float fps)
+       {
+               int h;
+               int m;
+               int s;
+               int f;
+               t.split (fps, h, m, s, f);
+
+               _hours->SetHint (std_to_wx(dcp::raw_convert<std::string>(h)));
+               _minutes->SetHint (std_to_wx(dcp::raw_convert<std::string>(m)));
+               _seconds->SetHint (std_to_wx(dcp::raw_convert<std::string>(s)));
+               _frames->SetHint (std_to_wx(dcp::raw_convert<std::string>(f)));
+       }
+
+       T get (float fps) const
        {
                T t;
-               std::string const h = wx_to_std (_hours->GetValue ());
-               t += T::from_seconds (boost::lexical_cast<int> (h.empty() ? "0" : h) * 3600);
-               std::string const m = wx_to_std (_minutes->GetValue());
-               t += T::from_seconds (boost::lexical_cast<int> (m.empty() ? "0" : m) * 60);
-               std::string const s = wx_to_std (_seconds->GetValue());
-               t += T::from_seconds (boost::lexical_cast<int> (s.empty() ? "0" : s));
-               std::string const f = wx_to_std (_frames->GetValue());
-               t += T::from_seconds (boost::lexical_cast<double> (f.empty() ? "0" : f) / fps);
+               std::string const h = value_or_hint (_hours);
+               t += T::from_seconds (dcp::raw_convert<int>(h.empty() ? "0" : h) * 3600);
+               std::string const m = value_or_hint (_minutes);
+               t += T::from_seconds (dcp::raw_convert<int>(m.empty() ? "0" : m) * 60);
+               std::string const s = value_or_hint (_seconds);
+               t += T::from_seconds (dcp::raw_convert<int>(s.empty() ? "0" : s));
+               std::string const f = value_or_hint (_frames);
+               t += T::from_seconds (dcp::raw_convert<double>(f.empty() ? "0" : f) / fps);
 
                return t;
        }
+
+private:
+       std::string value_or_hint (wxTextCtrl const * t) const
+       {
+               if (!t->GetValue().IsEmpty()) {
+                       return wx_to_std (t->GetValue());
+               } else {
+                       return wx_to_std (t->GetHint());
+               }
+       }
 };
 
 #endif