X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=7a15475572fe837af9c8885e4906182f1234f52a;hb=1ad291db7e847fbb71e5bd9f2f81db6bfb2a022e;hp=d08a11ea9edd84d5e1ae34f3dbdaaf779c69701a;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index d08a11ea9..7a1547557 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,40 +17,31 @@ */ -#include -#include -#include -#ifdef __WXMSW__ -#include -#endif -#ifdef __WXOSX__ -#include -#endif -#include -#include -#include -#include -#include +/** @file src/tools/dcpomatic.cc + * @brief The main DCP-o-matic GUI. + */ + #include "wx/film_viewer.h" #include "wx/film_editor.h" #include "wx/job_manager_view.h" #include "wx/config_dialog.h" -#include "wx/job_wrapper.h" #include "wx/wx_util.h" #include "wx/new_film_dialog.h" -#include "wx/properties_dialog.h" -#include "wx/wx_ui_signaller.h" +#include "wx/wx_signal_manager.h" #include "wx/about_dialog.h" #include "wx/kdm_dialog.h" #include "wx/servers_list_dialog.h" #include "wx/hints_dialog.h" #include "wx/update_dialog.h" #include "wx/content_panel.h" +#include "wx/report_problem_dialog.h" +#include "wx/video_waveform_dialog.h" #include "lib/film.h" #include "lib/config.h" #include "lib/util.h" +#include "lib/video_content.h" #include "lib/version.h" -#include "lib/ui_signaller.h" +#include "lib/signal_manager.h" #include "lib/log.h" #include "lib/job_manager.h" #include "lib/transcode_job.h" @@ -60,12 +51,36 @@ #include "lib/send_kdm_email_job.h" #include "lib/server_finder.h" #include "lib/update.h" +#include "lib/cross.h" #include "lib/content_factory.h" +#include "lib/compose.hpp" +#include +#include +#include +#include +#include +#include +#ifdef __WXMSW__ +#include +#endif +#ifdef __WXOSX__ +#include +#endif +#include +#include +#include +#include + +#ifdef check +#undef check +#endif using std::cout; +using std::wcout; using std::string; using std::vector; using std::wstring; +using std::wstringstream; using std::map; using std::make_pair; using std::list; @@ -81,6 +96,8 @@ public: _dialog = new wxMessageDialog ( 0, wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (name).data()), + /// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current + /// project (Film) has been changed since it was last saved. _("Film changed"), wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION ); @@ -99,7 +116,7 @@ public: private: /* Not defined */ FilmChangedDialog (FilmChangedDialog const &); - + wxMessageDialog* _dialog; }; @@ -110,12 +127,11 @@ private: #define NEEDS_SELECTED_VIDEO_CONTENT 0x8 map menu_items; - + enum { ID_file_new = 1, ID_file_open, ID_file_save, - ID_file_properties, ID_file_history, /* Allow spare IDs after _history for the recent files list */ ID_content_scale_to_fit_width = 100, @@ -124,18 +140,22 @@ enum { ID_jobs_make_kdms, ID_jobs_send_dcp_to_tms, ID_jobs_show_dcp, + ID_tools_video_waveform, ID_tools_hints, ID_tools_encoding_servers, ID_tools_check_for_updates, + ID_tools_restore_default_preferences, + ID_help_report_a_problem, /* IDs for shortcuts (with no associated menu item) */ ID_add_file }; -class Frame : public wxFrame +class DOMFrame : public wxFrame { public: - Frame (wxString const & title) + DOMFrame (wxString const & title) : wxFrame (NULL, -1, title) + , _video_waveform_dialog (0) , _hints_dialog (0) , _servers_list_dialog (0) , _config_dialog (0) @@ -147,13 +167,13 @@ public: #if defined(DCPOMATIC_WINDOWS) if (Config::instance()->win32_console ()) { AllocConsole(); - + HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE); int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT); FILE* hf_out = _fdopen(hCrt, "w"); setvbuf(hf_out, NULL, _IONBF, 1); *stdout = *hf_out; - + HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE); hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT); FILE* hf_in = _fdopen(hCrt, "r"); @@ -168,37 +188,39 @@ public: setup_menu (bar); SetMenuBar (bar); - _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&Frame::config_changed, this)); + _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); config_changed (); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_new, this), ID_file_new); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_open, this), ID_file_open); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_save, this), ID_file_save); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_properties, this), ID_file_properties); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_exit, this), wxID_EXIT); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::edit_preferences, this), wxID_PREFERENCES); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_dcp, this), ID_jobs_make_dcp); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_kdms, this), ID_jobs_make_kdms); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_show_dcp, this), ID_jobs_show_dcp); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_hints, this), ID_tools_hints); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_encoding_servers, this), ID_tools_encoding_servers); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_check_for_updates, this), ID_tools_check_for_updates); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this), wxID_ABOUT); - - Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1)); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_new, this), ID_file_new); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_open, this), ID_file_open); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_save, this), ID_file_save); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_dcp, this), ID_jobs_make_dcp); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_show_dcp, this), ID_jobs_show_dcp); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_video_waveform, this), ID_tools_video_waveform); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_hints, this), ID_tools_hints); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_restore_default_preferences, this), ID_tools_restore_default_preferences); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); + + Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1)); /* Use a panel as the only child of the Frame so that we avoid the dark-grey background on Windows. */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - _film_editor = new FilmEditor (overall_panel); _film_viewer = new FilmViewer (overall_panel); - JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast (0)); + _film_editor = new FilmEditor (overall_panel, _film_viewer); + JobManagerView* job_manager_view = new JobManagerView (overall_panel); wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL); right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6); @@ -210,10 +232,10 @@ public: set_menu_sensitivity (); - _film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1)); + _film_editor->FileChanged.connect (bind (&DOMFrame::file_changed, this, _1)); file_changed (""); - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&Frame::set_menu_sensitivity, this)); + JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this)); overall_panel->SetSizer (main_sizer); @@ -222,6 +244,9 @@ public: Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file); wxAcceleratorTable accel_table (1, accel); SetAcceleratorTable (accel_table); + + /* Instantly save any config changes when using the DCP-o-matic GUI */ + Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ())); } void new_film (boost::filesystem::path path) @@ -236,7 +261,7 @@ public: try { maybe_save_then_delete_film (); - + shared_ptr film (new Film (file)); list const notes = film->read_metadata (); @@ -247,11 +272,11 @@ public: "in this version. Please check the film's settings carefully.") ); } - + for (list::const_iterator i = notes.begin(); i != notes.end(); ++i) { error_dialog (0, std_to_wx (*i)); } - + set_film (film); } catch (std::exception& e) { @@ -272,7 +297,7 @@ public: shared_ptr film () const { return _film; } - + private: void file_changed (boost::filesystem::path f) @@ -281,15 +306,15 @@ private: if (!f.empty ()) { s += " - " + f.string (); } - + SetTitle (std_to_wx (s)); } - + void file_new () { NewFilmDialog* d = new NewFilmDialog (this); int const r = d->ShowModal (); - + if (r == wxID_OK) { if (boost::filesystem::is_directory (d->get_path()) && !boost::filesystem::is_empty(d->get_path())) { @@ -310,11 +335,11 @@ private: ); return; } - + maybe_save_then_delete_film (); new_film (d->get_path ()); } - + d->Destroy (); } @@ -326,7 +351,7 @@ private: std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST ); - + int r; while (true) { r = c->ShowModal (); @@ -336,7 +361,7 @@ private: break; } } - + if (r == wxID_OK) { load_film (wx_to_std (c->GetPath ())); } @@ -349,13 +374,6 @@ private: _film->write_metadata (); } - void file_properties () - { - PropertiesDialog* d = new PropertiesDialog (this, _film); - d->ShowModal (); - d->Destroy (); - } - void file_history (wxCommandEvent& event) { vector history = Config::instance()->history (); @@ -364,7 +382,7 @@ private: load_film (history[n]); } } - + void file_exit () { /* false here allows the close handler to veto the close request */ @@ -379,18 +397,40 @@ private: _config_dialog->Show (this); } + void tools_restore_default_preferences () + { + Config::restore_defaults (); + } + void jobs_make_dcp () { double required; double available; + bool can_hard_link; - if (!_film->should_be_enough_disk_space (required, available)) { - if (!confirm_dialog (this, wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. Do you want to continue anyway?"), required, available))) { + if (!_film->should_be_enough_disk_space (required, available, can_hard_link)) { + wxString message; + if (can_hard_link) { + message = wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. Do you want to continue anyway?"), required, available); + } else { + message = wxString::Format (_("The DCP and intermediate files for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available. You would need half as much space if the filesystem supported hard links, but it does not. Do you want to continue anyway?"), required, available); + } + if (!confirm_dialog (this, message)) { return; } } - - JobWrapper::make_dcp (this, _film); + + try { + /* It seems to make sense to auto-save metadata here, since the make DCP may last + a long time, and crashes/power failures are moderately likely. + */ + _film->write_metadata (); + _film->make_dcp (); + } catch (BadSettingError& e) { + error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data())); + } catch (std::exception& e) { + error_dialog (this, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data())); + } } void jobs_make_kdms () @@ -398,7 +438,7 @@ private: if (!_film) { return; } - + KDMDialog* d = new KDMDialog (this, _film); if (d->ShowModal () != wxID_OK) { d->Destroy (); @@ -418,9 +458,9 @@ private: } catch (exception& e) { error_dialog (this, e.what ()); } catch (...) { - error_dialog (this, _("An unknown exeception occurred.")); + error_dialog (this, _("An unknown exception occurred.")); } - + d->Destroy (); } @@ -439,7 +479,7 @@ private: (*i)->scale_and_crop_to_fit_height (); } } - + void jobs_send_dcp_to_tms () { _film->send_dcp_to_tms (); @@ -447,12 +487,13 @@ private: void jobs_show_dcp () { -#ifdef __WXMSW__ - string d = _film->directory().string (); - wstring w; - w.assign (d.begin(), d.end()); - ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT); -#else +#ifdef DCPOMATIC_WINDOWS + wstringstream args; + args << "/select," << _film->dir (_film->dcp_name(false)); + ShellExecute (0, L"open", L"explorer.exe", args.str().c_str(), 0, SW_SHOWDEFAULT); +#endif + +#ifdef DCPOMATIC_LINUX int r = system ("which nautilus"); if (WEXITSTATUS (r) == 0) { r = system (string ("nautilus " + _film->directory().string()).c_str ()); @@ -468,7 +509,23 @@ private: } } } -#endif +#endif + +#ifdef DCPOMATIC_OSX + int r = system (string ("open -R " + _film->dir (_film->dcp_name (false)).string ()).c_str ()); + if (WEXITSTATUS (r)) { + error_dialog (this, _("Could not show DCP")); + } +#endif + } + + void tools_video_waveform () + { + if (!_video_waveform_dialog) { + _video_waveform_dialog = new VideoWaveformDialog (this, _film_viewer); + } + + _video_waveform_dialog->Show (); } void tools_hints () @@ -501,6 +558,15 @@ private: d->Destroy (); } + void help_report_a_problem () + { + ReportProblemDialog* d = new ReportProblemDialog (this, _film); + if (d->ShowModal () == wxID_OK) { + d->report (); + } + d->Destroy (); + } + bool should_close () { if (!JobManager::instance()->work_to_do ()) { @@ -518,7 +584,7 @@ private: d->Destroy (); return r; } - + void close (wxCloseEvent& ev) { if (!should_close ()) { @@ -531,7 +597,7 @@ private: now (without, as far as I can see, any way for us to find out). */ _config_changed_connection.disconnect (); - + maybe_save_then_delete_film (); ev.Skip (); } @@ -546,27 +612,27 @@ private: bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished (); bool const have_cpl = _film && !_film->cpls().empty (); bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty(); - + for (map::iterator j = menu_items.begin(); j != menu_items.end(); ++j) { - + bool enabled = true; - + if ((j->second & NEEDS_FILM) && !_film) { enabled = false; } - + if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) { enabled = false; } - + if ((j->second & NEEDS_CPL) && !have_cpl) { enabled = false; } - + if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) { enabled = false; } - + j->first->Enable (enabled); } } @@ -576,7 +642,7 @@ private: if (!_film) { return; } - + if (_film->dirty ()) { FilmChangedDialog d (_film->name ()); switch (d.run ()) { @@ -587,7 +653,7 @@ private: break; } } - + _film.reset (); } @@ -596,7 +662,7 @@ private: wxMenuItem* item = menu->Append (id, text); menu_items.insert (make_pair (item, sens)); } - + void setup_menu (wxMenuBar* m) { _file_menu = new wxMenu; @@ -604,22 +670,20 @@ private: add_item (_file_menu, _("&Open...\tCtrl-O"), ID_file_open, ALWAYS); _file_menu->AppendSeparator (); add_item (_file_menu, _("&Save\tCtrl-S"), ID_file_save, NEEDS_FILM); - _file_menu->AppendSeparator (); - add_item (_file_menu, _("&Properties..."), ID_file_properties, NEEDS_FILM); _history_position = _file_menu->GetMenuItems().GetCount(); -#ifndef __WXOSX__ +#ifndef __WXOSX__ _file_menu->AppendSeparator (); #endif - -#ifdef __WXOSX__ + +#ifdef __WXOSX__ add_item (_file_menu, _("&Exit"), wxID_EXIT, ALWAYS); #else add_item (_file_menu, _("&Quit"), wxID_EXIT, ALWAYS); -#endif - -#ifdef __WXOSX__ +#endif + +#ifdef __WXOSX__ add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #else wxMenu* edit = new wxMenu; @@ -629,7 +693,7 @@ private: wxMenu* content = new wxMenu; add_item (content, _("Scale to fit &width"), ID_content_scale_to_fit_width, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT); add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT); - + wxMenu* jobs_menu = new wxMenu; add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM); @@ -637,19 +701,23 @@ private: add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); wxMenu* tools = new wxMenu; - add_item (tools, _("Hints...\tCtrl-H"), ID_tools_hints, 0); + add_item (tools, _("Video waveform..."), ID_tools_video_waveform, NEEDS_FILM); + add_item (tools, _("Hints..."), ID_tools_hints, 0); add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0); add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0); - + tools->AppendSeparator (); + add_item (tools, _("Restore default preferences"), ID_tools_restore_default_preferences, ALWAYS); + wxMenu* help = new wxMenu; -#ifdef __WXOSX__ +#ifdef __WXOSX__ add_item (help, _("About DCP-o-matic"), wxID_ABOUT, ALWAYS); -#else +#else add_item (help, _("About"), wxID_ABOUT, ALWAYS); -#endif - +#endif + add_item (help, _("Report a problem..."), ID_help_report_a_problem, NEEDS_FILM); + m->Append (_file_menu, _("&File")); -#ifndef __WXOSX__ +#ifndef __WXOSX__ m->Append (edit, _("&Edit")); #endif m->Append (content, _("&Content")); @@ -669,15 +737,15 @@ private: } delete _history_separator; _history_separator = 0; - + int pos = _history_position; - + vector history = Config::instance()->history (); - + if (!history.empty ()) { _history_separator = _file_menu->InsertSeparator (pos++); } - + for (size_t i = 0; i < history.size(); ++i) { SafeStringStream s; if (i < 9) { @@ -689,9 +757,10 @@ private: _history_items = history.size (); } - + FilmEditor* _film_editor; FilmViewer* _film_viewer; + VideoWaveformDialog* _video_waveform_dialog; HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; wxPreferencesEditor* _config_dialog; @@ -715,36 +784,57 @@ static const wxCmdLineEntryDesc command_line_description[] = { */ class App : public wxApp { +public: + App () + : wxApp () + , _frame (0) + {} + +private: + bool OnInit () try { + wxInitAllImageHandlers (); + + wxSplashScreen* splash = 0; + if (!Config::have_existing ()) { + wxBitmap bitmap; + boost::filesystem::path p = shared_path () / "splash.png"; + if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) { + splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1); + wxYield (); + } + } + SetAppName (_("DCP-o-matic")); - + if (!wxApp::OnInit()) { return false; } - -#ifdef DCPOMATIC_LINUX + +#ifdef DCPOMATIC_LINUX unsetenv ("UBUNTU_MENUPROXY"); #endif -#ifdef __WXOSX__ +#ifdef __WXOSX__ ProcessSerialNumber serial; GetCurrentProcess (&serial); TransformProcessType (&serial, kProcessTransformToForegroundApplication); -#endif +#endif - wxInitAllImageHandlers (); + cout << "set up path encoding.\n"; + dcpomatic_setup_path_encoding (); /* Enable i18n; this will create a Config object to look for a force-configured language. This Config object will be wrong, however, because dcpomatic_setup - hasn't yet been called and there aren't any scalers, filters etc. + hasn't yet been called and there aren't any filters etc. set up yet. */ dcpomatic_setup_i18n (); - /* Set things up, including scalers / filters etc. + /* Set things up, including filters etc. which will now be internationalised correctly. */ dcpomatic_setup (); @@ -754,9 +844,12 @@ class App : public wxApp */ Config::drop (); - _frame = new Frame (_("DCP-o-matic")); + _frame = new DOMFrame (_("DCP-o-matic")); SetTopWindow (_frame); _frame->Maximize (); + if (splash) { + splash->Destroy (); + } _frame->Show (); if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) { @@ -774,7 +867,7 @@ class App : public wxApp } } - ui_signaller = new wxUISignaller (this); + signal_manager = new wxSignalManager (this); Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); Bind (wxEVT_TIMER, boost::bind (&App::check, this)); @@ -823,24 +916,26 @@ class App : public wxApp { try { throw; + } catch (FileError& e) { + error_dialog (0, wxString::Format (_("An exception occurred: %s (%s).\n\n" + REPORT_PROBLEM), e.what(), e.file().string().c_str ())); } catch (exception& e) { - error_dialog (0, wxString::Format (_("An exception occurred (%s). Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."), e.what ())); + error_dialog (0, wxString::Format (_("An exception occurred: %s.\n\n"), e.what ()) + " " + REPORT_PROBLEM); } catch (...) { - error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com).")); + error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); } /* This will terminate the program */ return false; } - + void OnUnhandledException () { - error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com).")); + error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); } void idle () { - ui_signaller->ui_idle (); + signal_manager->ui_idle (); } void check () @@ -854,33 +949,23 @@ class App : public wxApp void update_checker_state_changed () { - switch (UpdateChecker::instance()->state ()) { - case UpdateChecker::YES: - { - string test; - if (Config::instance()->check_for_test_updates ()) { - test = UpdateChecker::instance()->test (); - } - UpdateDialog* dialog = new UpdateDialog (_frame, UpdateChecker::instance()->stable (), test); + UpdateChecker* uc = UpdateChecker::instance (); + if (uc->state() == UpdateChecker::YES && (uc->stable() || uc->test())) { + UpdateDialog* dialog = new UpdateDialog (_frame, uc->stable (), uc->test ()); dialog->ShowModal (); dialog->Destroy (); - break; - } - case UpdateChecker::NO: + } else if (uc->state() == UpdateChecker::FAILED) { if (!UpdateChecker::instance()->last_emit_was_first ()) { - error_dialog (_frame, _("There are no new versions of DCP-o-matic available.")); + error_dialog (_frame, _("The DCP-o-matic download server could not be contacted.")); } - break; - case UpdateChecker::FAILED: + } else { if (!UpdateChecker::instance()->last_emit_was_first ()) { - error_dialog (_frame, _("The DCP-o-matic download server could not be contacted.")); + error_dialog (_frame, _("There are no new versions of DCP-o-matic available.")); } - default: - break; } } - Frame* _frame; + DOMFrame* _frame; shared_ptr _timer; string _film_to_load; string _film_to_create;