Various markup and tweaks.
[dcpomatic.git] / src / tools / dvdomatic.cc
index 02e2423a2bfdb3a39b5e52d6fd55e5237d1b48bb..52e551d2ae99d9158f41fd6a51d334b1d3438f9b 100644 (file)
 
 #include <iostream>
 #include <boost/filesystem.hpp>
+#ifdef __WXMSW__
+#include <shellapi.h>
+#endif
 #include <wx/aboutdlg.h>
+#include <wx/stdpaths.h>
+#include <wx/cmdline.h>
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
-#ifndef DVDOMATIC_DISABLE_PLAYER
-#include "wx/film_player.h"
-#endif
 #include "wx/job_manager_view.h"
 #include "wx/config_dialog.h"
 #include "wx/job_wrapper.h"
-//#include "gtk/dvd_title_dialog.h"
 #include "wx/wx_util.h"
+#include "wx/new_film_dialog.h"
+#include "wx/properties_dialog.h"
+#include "wx/wx_ui_signaller.h"
 #include "lib/film.h"
 #include "lib/format.h"
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/scaler.h"
 #include "lib/exceptions.h"
+#include "lib/version.h"
+#include "lib/ui_signaller.h"
+#include "lib/log.h"
+
+using std::cout;
+using std::string;
+using std::wstring;
+using std::stringstream;
+using std::map;
+using std::make_pair;
+using std::exception;
+using boost::shared_ptr;
 
-using namespace std;
-using namespace boost;
-
-static wxFrame* frame = 0;
 static FilmEditor* film_editor = 0;
 static FilmViewer* film_viewer = 0;
-
-#ifndef DVDOMATIC_DISABLE_PLAYER
-static FilmPlayer* film_player = 0;
-#endif
-static Film* film = 0;
+static shared_ptr<Film> film;
+static std::string log_level;
+static std::string film_to_load;
+static wxMenu* jobs_menu = 0;
+static wxLocale* locale = 0;
 
 static void set_menu_sensitivity ();
 
@@ -57,9 +69,12 @@ class FilmChangedDialog
 public:
        FilmChangedDialog ()
        {
-               stringstream s;
-               s << "Save changes to film \"" << film->name() << "\" before closing?";
-               _dialog = new wxMessageDialog (frame, std_to_wx (s.str()), wxT ("Film changed"), wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION);
+               _dialog = new wxMessageDialog (
+                       0,
+                       std_to_wx (String::compose ("Save changes to film \"%1\" before closing?", film->name())),
+                       _("Film changed"),
+                       wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
+                       );
        }
 
        ~FilmChangedDialog ()
@@ -95,8 +110,7 @@ maybe_save_then_delete_film ()
                }
        }
        
-       delete film;
-       film = 0;
+       film.reset ();
 }
 
 enum Sensitivity {
@@ -107,9 +121,9 @@ enum Sensitivity {
 map<wxMenuItem*, Sensitivity> menu_items;
        
 void
-add_item (wxMenu* menu, std::string text, int id, Sensitivity sens)
+add_item (wxMenu* menu, wxString text, int id, Sensitivity sens)
 {
-       wxMenuItem* item = menu->Append (id, std_to_wx (text));
+       wxMenuItem* item = menu->Append (id, text);
        menu_items.insert (make_pair (item, sens));
 }
 
@@ -129,13 +143,13 @@ enum {
        ID_file_new = 1,
        ID_file_open,
        ID_file_save,
+       ID_file_properties,
        ID_file_quit,
        ID_edit_preferences,
        ID_jobs_make_dcp,
        ID_jobs_send_dcp_to_tms,
-       ID_jobs_copy_from_dvd,
+       ID_jobs_show_dcp,
        ID_jobs_examine_content,
-       ID_jobs_make_dcp_from_existing_transcode,
        ID_help_about
 };
 
@@ -143,31 +157,32 @@ void
 setup_menu (wxMenuBar* m)
 {
        wxMenu* file = new wxMenu;
-       add_item (file, "New...", ID_file_new, ALWAYS);
-       add_item (file, "&Open...", ID_file_open, ALWAYS);
+       add_item (file, _("New..."), ID_file_new, ALWAYS);
+       add_item (file, _("&Open..."), ID_file_open, ALWAYS);
        file->AppendSeparator ();
-       add_item (file, "&Save", ID_file_save, NEEDS_FILM);
+       add_item (file, _("&Save"), ID_file_save, NEEDS_FILM);
        file->AppendSeparator ();
-       add_item (file, "&Quit", ID_file_quit, ALWAYS);
+       add_item (file, _("&Properties..."), ID_file_properties, NEEDS_FILM);
+       file->AppendSeparator ();
+       add_item (file, _("&Quit"), ID_file_quit, ALWAYS);
 
        wxMenu* edit = new wxMenu;
-       add_item (edit, "&Preferences...", ID_edit_preferences, ALWAYS);
+       add_item (edit, _("&Preferences..."), ID_edit_preferences, ALWAYS);
 
-       wxMenu* jobs = new wxMenu;
-       add_item (jobs, "&Make DCP", ID_jobs_make_dcp, NEEDS_FILM);
-       add_item (jobs, "&Send DCP to TMS", ID_jobs_send_dcp_to_tms, NEEDS_FILM);
-       add_item (jobs, "Copy from &DVD...", ID_jobs_copy_from_dvd, NEEDS_FILM);
-       jobs->AppendSeparator ();
-       add_item (jobs, "&Examine content", ID_jobs_examine_content, NEEDS_FILM);
-       add_item (jobs, "Make DCP from existing &transcode", ID_jobs_make_dcp_from_existing_transcode, NEEDS_FILM);
+       jobs_menu = new wxMenu;
+       add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM);
+       add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM);
+       add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM);
+       jobs_menu->AppendSeparator ();
+       add_item (jobs_menu, _("&Examine content"), ID_jobs_examine_content, NEEDS_FILM);
 
        wxMenu* help = new wxMenu;
-       add_item (help, "About", ID_help_about, ALWAYS);
+       add_item (help, _("About"), ID_help_about, ALWAYS);
 
-       m->Append (file, _("&File"));
-       m->Append (edit, _("&Edit"));
-       m->Append (jobs, _("&Jobs"));
-       m->Append (help, _("&Help"));
+       m->Append (file, _(_("&File")));
+       m->Append (edit, _(_("&Edit")));
+       m->Append (jobs_menu, _(_("&Jobs")));
+       m->Append (help, _(_("&Help")));
 }
 
 bool
@@ -177,18 +192,6 @@ window_closed (wxCommandEvent &)
        return false;
 }
 
-void
-file_changed (string f)
-{
-       stringstream s;
-       s << "DVD-o-matic";
-       if (!f.empty ()) {
-               s << " - " << f;
-       }
-       
-       frame->SetTitle (std_to_wx (s.str()));
-}
-
 class Frame : public wxFrame
 {
 public:
@@ -198,52 +201,156 @@ public:
                wxMenuBar* bar = new wxMenuBar;
                setup_menu (bar);
                SetMenuBar (bar);
+
+               Connect (ID_file_new, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_new));
+               Connect (ID_file_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_open));
+               Connect (ID_file_save, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_save));
+               Connect (ID_file_properties, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_properties));
+               Connect (ID_file_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_quit));
+               Connect (ID_edit_preferences, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::edit_preferences));
+               Connect (ID_jobs_make_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp));
+               Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms));
+               Connect (ID_jobs_show_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_show_dcp));
+               Connect (ID_jobs_examine_content, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_examine_content));
+               Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
+
+               Connect (wxID_ANY, wxEVT_MENU_OPEN, wxMenuEventHandler (Frame::menu_opened));
+
+               wxPanel* panel = new wxPanel (this);
+               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               s->Add (panel, 1, wxEXPAND);
+               SetSizer (s);
+
+               film_editor = new FilmEditor (film, panel);
+               film_viewer = new FilmViewer (film, panel);
+               JobManagerView* job_manager_view = new JobManagerView (panel);
+
+               _top_sizer = new wxBoxSizer (wxHORIZONTAL);
+               _top_sizer->Add (film_editor, 0, wxALL, 6);
+               _top_sizer->Add (film_viewer, 1, wxEXPAND | wxALL, 6);
+
+               wxBoxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
+               main_sizer->Add (_top_sizer, 2, wxEXPAND | wxALL, 6);
+               main_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
+               panel->SetSizer (main_sizer);
+
+               set_menu_sensitivity ();
+
+               /* XXX: calling these here is a bit of a hack */
+               film_editor->setup_visibility ();
+               
+               film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
+               if (film) {
+                       file_changed (film->directory ());
+               } else {
+                       file_changed ("");
+               }
+
+               set_film ();
+
+               film_editor->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Frame::film_editor_sized), 0, this);
+       }
+
+private:
+
+       void film_editor_sized (wxSizeEvent &)
+       {
+               static bool in_layout = false;
+               if (!in_layout) {
+                       in_layout = true;
+                       _top_sizer->Layout ();
+                       in_layout = false;
+               }
+       }
+
+       void menu_opened (wxMenuEvent& ev)
+       {
+               if (ev.GetMenu() != jobs_menu) {
+                       return;
+               }
+
+               bool const have_dcp = film && film->have_dcp();
+               jobs_menu->Enable (ID_jobs_send_dcp_to_tms, have_dcp);
+               jobs_menu->Enable (ID_jobs_show_dcp, have_dcp);
        }
 
+       void set_film ()
+       {
+               film_viewer->set_film (film);
+               film_editor->set_film (film);
+               set_menu_sensitivity ();
+       }
+
+       void file_changed (string f)
+       {
+               stringstream s;
+               s << _("DVD-o-matic");
+               if (!f.empty ()) {
+                       s << " - " << f;
+               }
+               
+               SetTitle (std_to_wx (s.str()));
+       }
+       
        void file_new (wxCommandEvent &)
        {
-               wxDirDialog* c = new wxDirDialog (frame, wxT ("New Film"));
-               int const r = c->ShowModal ();
-               c->Destroy ();
+               NewFilmDialog* d = new NewFilmDialog (this);
+               int const r = d->ShowModal ();
                
                if (r == wxID_OK) {
+
+                       if (boost::filesystem::exists (d->get_path())) {
+                               error_dialog (this, wxString::Format (_("The directory %s already exists."), d->get_path().c_str()));
+                               return;
+                       }
+                       
                        maybe_save_then_delete_film ();
-                       film = new Film (wx_to_std (c->GetPath ()));
-#if BOOST_FILESYSTEM_VERSION == 3              
-                       film->set_name (filesystem::path (wx_to_std (c->GetPath())).filename().generic_string());
-#else          
-                       film->set_name (filesystem::path (wx_to_std (c->GetPath())).filename());
-#endif         
-                       film_viewer->set_film (film);
-                       film_editor->set_film (film);
-                       set_menu_sensitivity ();
+                       film.reset (new Film (d->get_path (), false));
+                       film->log()->set_level (log_level);
+                       film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string());
+                       set_film ();
                }
+               
+               d->Destroy ();
        }
 
        void file_open (wxCommandEvent &)
        {
-               wxDirDialog* c = new wxDirDialog (frame, wxT ("Open Film"), wxT (""), wxDD_DIR_MUST_EXIST);
+               wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
                int const r = c->ShowModal ();
-               c->Destroy ();
                
                if (r == wxID_OK) {
                        maybe_save_then_delete_film ();
-                       film = new Film (wx_to_std (c->GetPath ()));
-                       film_viewer->set_film (film);
-                       film_editor->set_film (film);
-                       set_menu_sensitivity ();
+                       try {
+                               film.reset (new Film (wx_to_std (c->GetPath ())));
+                               film->log()->set_level (log_level);
+                               set_film ();
+                       } catch (std::exception& e) {
+                               wxString p = c->GetPath ();
+                               wxCharBuffer b = p.ToUTF8 ();
+                               error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), e.what()));
+                       }
                }
+
+               c->Destroy ();
        }
 
        void file_save (wxCommandEvent &)
        {
                film->write_metadata ();
        }
+
+       void file_properties (wxCommandEvent &)
+       {
+               PropertiesDialog* d = new PropertiesDialog (this, film);
+               d->ShowModal ();
+               d->Destroy ();
+       }
        
        void file_quit (wxCommandEvent &)
        {
                maybe_save_then_delete_film ();
-               frame->Close (true);
+               Close (true);
        }
 
        void edit_preferences (wxCommandEvent &)
@@ -256,31 +363,33 @@ public:
 
        void jobs_make_dcp (wxCommandEvent &)
        {
-               JobWrapper::make_dcp (this, film, true);
-       }
-       
-       void jobs_make_dcp_from_existing_transcode (wxCommandEvent &)
-       {
-               JobWrapper::make_dcp (this, film, false);
-       }
-       
-       void jobs_copy_from_dvd (wxCommandEvent &)
-       {
-//     try {
-//             DVDTitleDialog d;
-//             if (d.run () != Gtk::RESPONSE_OK) {
-//                     return;
-//             }
-//             film->copy_from_dvd ();
-//     } catch (DVDError& e) {
-//             error_dialog (e.what ());
-//     }
+               JobWrapper::make_dcp (this, film);
        }
        
        void jobs_send_dcp_to_tms (wxCommandEvent &)
        {
                film->send_dcp_to_tms ();
        }
+
+       void jobs_show_dcp (wxCommandEvent &)
+       {
+#ifdef __WXMSW__
+               string d = film->directory();
+               wstring w;
+               w.assign (d.begin(), d.end());
+               ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT);
+#else
+               int r = system ("which nautilus");
+               if (WEXITSTATUS (r) == 0) {
+                       system (string ("nautilus " + film->directory()).c_str ());
+               } else {
+                       int r = system ("which konqueror");
+                       if (WEXITSTATUS (r) == 0) {
+                               system (string ("konqueror " + film->directory()).c_str ());
+                       }
+               }
+#endif         
+       }
        
        void jobs_examine_content (wxCommandEvent &)
        {
@@ -291,87 +400,124 @@ public:
        {
                wxAboutDialogInfo info;
                info.SetName (_("DVD-o-matic"));
-               info.SetVersion (wxT (DVDOMATIC_VERSION));
-               info.SetDescription (_("DCP generation from arbitrary formats"));
-               info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis"));
+               if (strcmp (dvdomatic_git_commit, "release") == 0) {
+                       info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version)));
+               } else {
+                       info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit)));
+               }
+               info.SetDescription (_("Free, open-source DCP generation from almost anything."));
+               info.SetCopyright (_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"));
                wxArrayString authors;
                authors.Add (wxT ("Carl Hetherington"));
                authors.Add (wxT ("Terrence Meiczinger"));
                authors.Add (wxT ("Paul Davis"));
+               authors.Add (wxT ("Ole Laursen"));
                info.SetDevelopers (authors);
                info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
                wxAboutBox (info);
        }
+
+       wxSizer* _top_sizer;
+};
+
+#if wxMINOR_VERSION == 9
+static const wxCmdLineEntryDesc command_line_description[] = {
+       { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+        { wxCMD_LINE_PARAM, 0, 0, "film to load", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+       { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
+#else
+static const wxCmdLineEntryDesc command_line_description[] = {
+       { wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+        { wxCMD_LINE_PARAM, 0, 0, wxT("film to load"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+       { wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 }
+};
+#endif
+
+void
+setup_i18n ()
+{
+       int language = wxLANGUAGE_DEFAULT;
+       if (wxLocale::IsAvailable (language)) {
+               locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
+
+#ifdef __WXGTK__
+               locale->AddCatalogLookupPathPrefix (wxT (LOCALE_DIR));
+#endif
+
+               locale->AddCatalog ("libdvdomatic-wx");
+               locale->AddCatalog ("dvdomatic");
+               
+               if (!locale->IsOk()) {
+                       delete locale;
+                       locale = new wxLocale (wxLANGUAGE_ENGLISH);
+                       language = wxLANGUAGE_ENGLISH;
+               }
+       }
+}
 
 class App : public wxApp
 {
        bool OnInit ()
        {
-               if (!wxApp::OnInit ()) {
+               if (!wxApp::OnInit()) {
                        return false;
                }
-
+               
+#ifdef DVDOMATIC_POSIX         
+               unsetenv ("UBUNTU_MENUPROXY");
+#endif         
+               
                wxInitAllImageHandlers ();
+               setup_i18n ();
                
                dvdomatic_setup ();
 
-//             if (argc == 2 && boost::filesystem::is_directory (argv[1])) {
-//                     film = new Film (argv[1]);
-//             }
-               
-               frame = new Frame (_("DVD-o-matic"));
-               frame->Show (true);
-               
-               frame->Connect (ID_file_new, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_new));
-               frame->Connect (ID_file_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_open));
-               frame->Connect (ID_file_save, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_save));
-               frame->Connect (ID_file_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_quit));
-               frame->Connect (ID_edit_preferences, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::edit_preferences));
-               frame->Connect (ID_jobs_make_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp));
-               frame->Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms));
-               frame->Connect (ID_jobs_copy_from_dvd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_copy_from_dvd));
-               frame->Connect (ID_jobs_examine_content, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_examine_content));
-               frame->Connect (ID_jobs_make_dcp_from_existing_transcode, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp_from_existing_transcode));
-               frame->Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
-
-               film_editor = new FilmEditor (film, frame);
-               film_viewer = new FilmViewer (film, frame);
-#ifndef DVDOMATIC_DISABLE_PLAYER
-               film_player = new FilmPlayer (film, frame);
-#endif
-               JobManagerView* job_manager_view = new JobManagerView (frame);
+               if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
+                       try {
+                               film.reset (new Film (film_to_load));
+                               film->log()->set_level (log_level);
+                       } catch (exception& e) {
+                               error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
+                       }
+               }
 
-               wxSizer* rhs_sizer = new wxBoxSizer (wxVERTICAL);
-               rhs_sizer->Add (film_viewer, 3, wxEXPAND | wxALL);
-               rhs_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL);
+               Frame* f = new Frame (_("DVD-o-matic"));
+               SetTopWindow (f);
+               f->Maximize ();
+               f->Show ();
 
-               wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
-               main_sizer->Add (film_editor, 0, wxALL, 6);
-               main_sizer->Add (rhs_sizer, 1, wxEXPAND | wxALL, 6);
-               frame->SetSizer (main_sizer);
+               ui_signaller = new wxUISignaller (this);
+               this->Connect (-1, wxEVT_IDLE, wxIdleEventHandler (App::idle));
 
-               SetTopWindow (frame);
-               frame->Maximize ();
+               return true;
+       }
 
-               set_menu_sensitivity ();
+       void OnInitCmdLine (wxCmdLineParser& parser)
+       {
+               parser.SetDesc (command_line_description);
+               parser.SetSwitchChars (wxT ("-"));
+       }
 
-               /* XXX: calling these here is a bit of a hack */
-               film_editor->setup_visibility ();
-#ifndef DVDOMATIC_DISABLE_PLAYER       
-               film_player->setup_visibility ();
-#endif 
-               film_viewer->setup_visibility ();
-               
-               film_editor->FileChanged.connect (ptr_fun (file_changed));
-               if (film) {
-                       file_changed (film->directory ());
-               } else {
-                       file_changed ("");
+       bool OnCmdLineParsed (wxCmdLineParser& parser)
+       {
+               if (parser.GetParamCount() > 0) {
+                       film_to_load = wx_to_std (parser.GetParam(0));
                }
-               
+
+               wxString log;
+               if (parser.Found(wxT("log"), &log)) {
+                       log_level = wx_to_std (log);
+               }
+
                return true;
        }
+
+       void idle (wxIdleEvent &)
+       {
+               ui_signaller->ui_idle ();
+       }
 };
 
 IMPLEMENT_APP (App)