Merge branch 'subs'

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 409ab361caeca8675bd7fbdad56bfd5c4ae10166..4277ed12dc03a9f26d1242977ebb5d38b557f9a3 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -18,28 +18,91 @@
 */
 
 /** @file src/wx/wx_util.cc
- *  @brief Some utility functions.
+ *  @brief Some utility functions and classes.
  */
 
+#include <boost/thread.hpp>
 #include "wx_util.h"
 
 using namespace std;
+using namespace boost;
 
+/** Add a wxStaticText to a wxSizer, aligning it at vertical centre.
+ *  @param s Sizer to add to.
+ *  @param p Parent window for the wxStaticText.
+ *  @param t Text for the wxStaticText.
+ *  @param prop Properties to pass when calling Add() on the wxSizer.
+ */
 wxStaticText *
-add_label_to_sizer (wxSizer* s, wxWindow* p, list<wxControl*>& c, string t)
+add_label_to_sizer (wxSizer* s, wxWindow* p, string t, int prop)
 {
-       wxStaticText* m = new wxStaticText (p, wxID_ANY, wxString (t.c_str (), wxConvUTF8));
-       c.push_back (m);
-       s->Add (m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+       wxStaticText* m = new wxStaticText (p, wxID_ANY, std_to_wx (t));
+       s->Add (m, prop, wxALIGN_CENTER_VERTICAL | wxALL, 6);
        return m;
 }
 
-#if 0
+/** Pop up an error dialogue box.
+ *  @param parent Parent.
+ *  @param m Message.
+ */
+void
+error_dialog (wxWindow* parent, string m)
+{
+       wxMessageDialog* d = new wxMessageDialog (parent, std_to_wx (m), wxT ("DVD-o-matic"), wxOK);
+       d->ShowModal ();
+       d->Destroy ();
+}
+
+/** @param s wxWidgets string.
+ *  @return Corresponding STL string.
+ */
+string
+wx_to_std (wxString s)
+{
+       return string (s.mb_str ());
+}
+
+/** @param s STL string.
+ *  @return Corresponding wxWidgets string.
+ */
+wxString
+std_to_wx (string s)
+{
+       return wxString (s.c_str(), wxConvUTF8);
+}
+
+int const ThreadedStaticText::_update_event_id = 10000;
+
+/** @param parent Parent for the wxStaticText.
+ *  @param initial Initial text for the wxStaticText while the computation is being run.
+ *  @param fn Function which works out what the wxStaticText content should be and returns it.
+ */
+ThreadedStaticText::ThreadedStaticText (wxWindow* parent, string initial, function<string ()> fn)
+       : wxStaticText (parent, wxID_ANY, std_to_wx (initial))
+{
+       Connect (_update_event_id, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ThreadedStaticText::thread_finished), 0, this);
+       _thread = new thread (bind (&ThreadedStaticText::run, this, fn));
+}
+
+ThreadedStaticText::~ThreadedStaticText ()
+{
+       _thread->interrupt ();
+       _thread->join ();
+       delete _thread;
+}
+
+/** Run our thread and post the result to the GUI thread via AddPendingEvent */
+void
+ThreadedStaticText::run (function<string ()> fn)
+{
+       wxCommandEvent ev (wxEVT_COMMAND_TEXT_UPDATED, _update_event_id);
+       ev.SetString (std_to_wx (fn ()));
+       GetEventHandler()->AddPendingEvent (ev);
+}
+
+/** Called in the GUI thread when our worker thread has finished */
 void
-error_dialog (string m)
+ThreadedStaticText::thread_finished (wxCommandEvent& ev)
 {
-       Gtk::MessageDialog d (m, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
-       d.set_title ("DVD-o-matic");
-       d.run ();
+       SetLabel (ev.GetString ());
 }
-#endif