X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=4505cff84cfea5b8e7fb91cc554310dedda39f2e;hp=a2b55691ed6557f9517097a9a7eebf09a9b9a311;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index a2b55691e..4505cff84 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -22,6 +22,7 @@ * @brief The main DCP-o-matic GUI. */ +#include "wx/standard_controls.h" #include "wx/film_viewer.h" #include "wx/film_editor.h" #include "wx/job_manager_view.h" @@ -45,7 +46,11 @@ #include "wx/export_dialog.h" #include "wx/paste_dialog.h" #include "wx/focus_manager.h" +#include "wx/initial_setup_dialog.h" +#include "wx/send_i18n_dialog.h" +#include "wx/i18n_hook.h" #include "lib/film.h" +#include "lib/emailer.h" #include "lib/config.h" #include "lib/util.h" #include "lib/video_content.h" @@ -53,6 +58,7 @@ #include "lib/version.h" #include "lib/signal_manager.h" #include "lib/log.h" +#include "lib/screen.h" #include "lib/job_manager.h" #include "lib/exceptions.h" #include "lib/cinema.h" @@ -71,7 +77,9 @@ #include "lib/transcode_job.h" #include "lib/dkdm_wrapper.h" #include "lib/audio_content.h" +#include "lib/check_content_change_job.h" #include "lib/text_content.h" +#include "lib/dcpomatic_log.h" #include #include #include @@ -88,6 +96,7 @@ #include #include #include +#include #include #include /* This is OK as it's only used with DCPOMATIC_WINDOWS */ @@ -111,6 +120,8 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::function; +using boost::is_any_of; +using boost::algorithm::find; using dcp::raw_convert; class FilmChangedClosingDialog : public boost::noncopyable @@ -200,7 +211,8 @@ enum { ID_file_duplicate_and_open, ID_file_history, /* Allow spare IDs after _history for the recent files list */ - ID_edit_copy = 100, + ID_file_close = 100, + ID_edit_copy, ID_edit_paste, ID_content_scale_to_fit_width, ID_content_scale_to_fit_height, @@ -218,6 +230,7 @@ enum { ID_tools_encoding_servers, ID_tools_manage_templates, ID_tools_check_for_updates, + ID_tools_send_translations, ID_tools_restore_default_preferences, ID_help_report_a_problem, /* IDs for shortcuts (with no associated menu item) */ @@ -283,6 +296,7 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_save_as_template, this), ID_file_save_as_template); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_duplicate, this), ID_file_duplicate); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_duplicate_and_open, this), ID_file_duplicate_and_open); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_close, this), ID_file_close); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this), ID_edit_copy); @@ -304,6 +318,7 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_manage_templates, this), ID_tools_manage_templates); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_send_translations, this), ID_tools_send_translations); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_restore_default_preferences, this), ID_tools_restore_default_preferences); Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT); Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); @@ -315,17 +330,19 @@ public: */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - _film_viewer = new FilmViewer (overall_panel); + _film_viewer.reset (new FilmViewer (overall_panel)); + _controls = new StandardControls (overall_panel, _film_viewer, true); _film_editor = new FilmEditor (overall_panel, _film_viewer); JobManagerView* job_manager_view = new JobManagerView (overall_panel, false); wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL); - right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6); + right_sizer->Add (_film_viewer->panel(), 2, wxEXPAND | wxALL, 6); + right_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6); right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6); wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL); - main_sizer->Add (_film_editor, 1, wxEXPAND | wxALL, 6); - main_sizer->Add (right_sizer, 2, wxEXPAND | wxALL, 6); + main_sizer->Add (_film_editor, 0, wxEXPAND | wxALL, 6); + main_sizer->Add (right_sizer, 1, wxEXPAND | wxALL, 6); set_menu_sensitivity (); @@ -359,7 +376,7 @@ public: accel[4].Set (wxACCEL_NORMAL, WXK_LEFT, ID_back_frame); accel[5].Set (wxACCEL_NORMAL, WXK_RIGHT, ID_forward_frame); #ifdef __WXOSX__ - accel[6].Set (wxACCEL_CTRL, static_cast('W'), wxID_EXIT); + accel[6].Set (wxACCEL_CTRL, static_cast('W'), ID_file_close); #endif Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file); Bind (wxEVT_MENU, boost::bind (&DOMFrame::remove_clicked, this, _1), ID_remove); @@ -393,6 +410,7 @@ public: film->set_name (path.filename().generic_string()); film->write_metadata (); set_film (film); + dcpomatic_log = film->log (); } void load_film (boost::filesystem::path file) @@ -414,6 +432,8 @@ public: } set_film (film); + + JobManager::instance()->add(shared_ptr(new CheckContentChangeJob(film))); } catch (std::exception& e) { wxString p = std_to_wx (file.string ()); @@ -426,15 +446,19 @@ public: _film = film; _film_viewer->set_film (_film); _film_editor->set_film (_film); + _controls->set_film (_film); if (_video_waveform_dialog) { _video_waveform_dialog->Destroy (); _video_waveform_dialog = 0; } set_menu_sensitivity (); - if (_film->directory()) { + if (_film && _film->directory()) { Config::instance()->add_to_history (_film->directory().get()); } - _film->Changed.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this)); + if (_film) { + _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1)); + _film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1)); + } } shared_ptr film () const { @@ -443,6 +467,18 @@ public: private: + void film_message (string m) + { + message_dialog (this, std_to_wx(m)); + } + + void film_change (ChangeType type) + { + if (type == CHANGE_TYPE_DONE) { + set_menu_sensitivity (); + } + } + void file_changed (boost::filesystem::path f) { string s = wx_to_std (_("DCP-o-matic")); @@ -462,7 +498,24 @@ private: try { new_film (d->path(), d->template_name()); } catch (boost::filesystem::filesystem_error& e) { - error_dialog (this, _("Could not create folder to store film"), std_to_wx(e.what())); +#ifdef DCPOMATIC_WINDOWS + string bad_chars = "<>:\"/|?*"; + string const filename = d->path().string(); + string found_bad_chars; + for (size_t i = 0; i < bad_chars.length(); ++i) { + if (filename.find(bad_chars[i]) != string::npos && found_bad_chars.find(bad_chars[i]) == string::npos) { + found_bad_chars += bad_chars[i]; + } + } + wxString message = _("Could not create folder to store film."); + if (!found_bad_chars.empty()) { + message += " "; + message += wxString::Format (_("Try removing the %s characters from your folder name."), std_to_wx(found_bad_chars).data()); + } + error_dialog (this, message, std_to_wx(e.what())); +#else + error_dialog (this, _("Could not create folder to store film."), std_to_wx(e.what())); +#endif } } @@ -541,6 +594,31 @@ private: d->Destroy (); } + void file_close () + { + if (_film && _film->dirty ()) { + + FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ()); + int const r = dialog->run (); + delete dialog; + + switch (r) { + case wxID_NO: + /* Don't save and carry on to close */ + break; + case wxID_YES: + /* Save and carry on to close */ + _film->write_metadata (); + break; + case wxID_CANCEL: + /* Stop */ + return; + } + } + + set_film (shared_ptr()); + } + void file_history (wxCommandEvent& event) { vector history = Config::instance()->history (); @@ -567,7 +645,7 @@ private: { DCPOMATIC_ASSERT (_clipboard); - PasteDialog* d = new PasteDialog (this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->caption.empty()); + PasteDialog* d = new PasteDialog (this, static_cast(_clipboard->video), static_cast(_clipboard->audio), !_clipboard->text.empty()); if (d->ShowModal() == wxID_OK) { BOOST_FOREACH (shared_ptr i, _film_editor->content_panel()->selected()) { if (d->video() && i->video) { @@ -579,10 +657,10 @@ private: i->audio->take_settings_from (_clipboard->audio); } - if (d->caption()) { - list >::iterator j = i->caption.begin (); - list >::const_iterator k = _clipboard->caption.begin (); - while (j != i->caption.end() && k != _clipboard->caption.end()) { + if (d->text()) { + list >::iterator j = i->text.begin (); + list >::const_iterator k = _clipboard->text.begin (); + while (j != i->text.end() && k != _clipboard->text.end()) { (*j)->take_settings_from (*k); ++j; ++k; @@ -627,16 +705,16 @@ private: 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); + 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); + 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; } } - if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) { + if (Config::instance()->show_hints_before_make_dcp()) { HintsDialog* hints = new HintsDialog (this, _film, false); int const r = hints->ShowModal(); hints->Destroy (); @@ -735,7 +813,7 @@ private: return; } - if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) { + if (Config::instance()->show_hints_before_make_dcp()) { HintsDialog* hints = new HintsDialog (this, _film, false); int const r = hints->ShowModal(); hints->Destroy (); @@ -789,7 +867,7 @@ private: try { kdm = _film->make_kdm ( Config::instance()->decryption_chain()->leaf(), - vector (), + vector(), d->cpl (), dcp::LocalTime ("2012-01-01T01:00:00+00:00"), dcp::LocalTime ("2112-01-01T01:00:00+00:00"), @@ -824,7 +902,11 @@ private: ExportDialog* d = new ExportDialog (this); if (d->ShowModal() == wxID_OK) { shared_ptr job (new TranscodeJob (_film)); - job->set_encoder (shared_ptr (new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo()))); + job->set_encoder ( + shared_ptr ( + new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf()) + ) + ); JobManager::instance()->add (job); } d->Destroy (); @@ -834,7 +916,7 @@ private: { ContentList vc = _film_editor->content_panel()->selected_video (); for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) { - (*i)->video->scale_and_crop_to_fit_width (); + (*i)->video->scale_and_crop_to_fit_width (_film); } } @@ -842,7 +924,7 @@ private: { ContentList vc = _film_editor->content_panel()->selected_video (); for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) { - (*i)->video->scale_and_crop_to_fit_height (); + (*i)->video->scale_and_crop_to_fit_height (_film); } } @@ -933,6 +1015,26 @@ private: _update_news_requested = true; } + void tools_send_translations () + { + SendI18NDialog* d = new SendI18NDialog (this); + if (d->ShowModal() == wxID_OK) { + string body; + body += d->name() + "\n"; + body += d->language() + "\n"; + map translations = I18NHook::translations (); + for (map::const_iterator i = translations.begin(); i != translations.end(); ++i) { + body += i->first + "\n" + i->second + "\n"; + } + list to; + to.push_back ("carl@dcpomatic.com"); + Emailer emailer (d->email(), to, "DCP-o-matic translations", body); + emailer.send ("main.carlh.net", 2525); + } + + d->Destroy (); + } + void help_about () { AboutDialog* d = new AboutDialog (this); @@ -1113,6 +1215,9 @@ private: _history_position = _file_menu->GetMenuItems().GetCount(); + _file_menu->AppendSeparator (); + add_item (_file_menu, _("&Close\tCtrl-W"), ID_file_close, NEEDS_FILM); + #ifndef __WXOSX__ _file_menu->AppendSeparator (); #endif @@ -1159,6 +1264,7 @@ private: add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0); add_item (tools, _("Manage templates..."), ID_tools_manage_templates, 0); add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0); + add_item (tools, _("Send translations..."), ID_tools_send_translations, 0); tools->AppendSeparator (); add_item (tools, _("Restore default preferences"), ID_tools_restore_default_preferences, ALWAYS); @@ -1237,6 +1343,8 @@ private: } _history_items = history.size (); + + dcpomatic_log->set_types (Config::instance()->log_types()); } void update_checker_state_changed () @@ -1283,16 +1391,17 @@ private: void back_frame () { - _film_viewer->back_frame (); + _film_viewer->seek_by (-_film_viewer->one_video_frame(), true); } void forward_frame () { - _film_viewer->forward_frame (); + _film_viewer->seek_by (_film_viewer->one_video_frame(), true); } FilmEditor* _film_editor; - FilmViewer* _film_viewer; + boost::shared_ptr _film_viewer; + StandardControls* _controls; VideoWaveformDialog* _video_waveform_dialog; HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; @@ -1331,99 +1440,112 @@ public: private: bool OnInit () - try { - wxInitAllImageHandlers (); + wxSplashScreen* splash = 0; + try { + wxInitAllImageHandlers (); - Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); - Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - wxSplashScreen* splash = maybe_show_splash (); + splash = maybe_show_splash (); - SetAppName (_("DCP-o-matic")); + SetAppName (_("DCP-o-matic")); - if (!wxApp::OnInit()) { - return false; - } + if (!wxApp::OnInit()) { + return false; + } #ifdef DCPOMATIC_LINUX - unsetenv ("UBUNTU_MENUPROXY"); + unsetenv ("UBUNTU_MENUPROXY"); #endif #ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); + ProcessSerialNumber serial; + GetCurrentProcess (&serial); + TransformProcessType (&serial, kProcessTransformToForegroundApplication); #endif - dcpomatic_setup_path_encoding (); + 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 filters etc. - set up yet. - */ - dcpomatic_setup_i18n (); + /* 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 filters etc. + set up yet. + */ + dcpomatic_setup_i18n (); - /* Set things up, including filters etc. - which will now be internationalised correctly. - */ - dcpomatic_setup (); + /* Set things up, including filters etc. + which will now be internationalised correctly. + */ + dcpomatic_setup (); - /* Force the configuration to be re-loaded correctly next - time it is needed. - */ - Config::drop (); + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); - Config::BadSignerChain.connect (boost::bind (&App::config_bad_signer_chain, this)); + Config::BadSignerChain.connect (boost::bind (&App::config_bad_signer_chain, this)); - _frame = new DOMFrame (_("DCP-o-matic")); - SetTopWindow (_frame); - _frame->Maximize (); - if (splash) { - splash->Destroy (); - } - _frame->Show (); + _frame = new DOMFrame (_("DCP-o-matic")); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + splash = 0; + } - if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) { - try { - _frame->load_film (_film_to_load); - } catch (exception& e) { - error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what())); + if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) { + InitialSetupDialog* d = new InitialSetupDialog (); + d->ShowModal (); + d->Destroy (); + Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true); } - } - if (!_film_to_create.empty ()) { - _frame->new_film (_film_to_create, optional ()); - if (!_content_to_add.empty ()) { - BOOST_FOREACH (shared_ptr i, content_factory (_frame->film(), _content_to_add)) { - _frame->film()->examine_and_add_content (i); + _frame->Show (); + + if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) { + try { + _frame->load_film (_film_to_load); + } catch (exception& e) { + error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what())); } } - if (!_dcp_to_add.empty ()) { - _frame->film()->examine_and_add_content (shared_ptr (new DCPContent (_frame->film(), _dcp_to_add))); + + if (!_film_to_create.empty ()) { + _frame->new_film (_film_to_create, optional ()); + if (!_content_to_add.empty ()) { + BOOST_FOREACH (shared_ptr i, content_factory(_content_to_add)) { + _frame->film()->examine_and_add_content (i); + } + } + if (!_dcp_to_add.empty ()) { + _frame->film()->examine_and_add_content(shared_ptr(new DCPContent(_dcp_to_add))); + } } - } - signal_manager = new wxSignalManager (this); - Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); + signal_manager = new wxSignalManager (this); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); - Bind (wxEVT_TIMER, boost::bind (&App::check, this)); - _timer.reset (new wxTimer (this)); - _timer->Start (1000); + Bind (wxEVT_TIMER, boost::bind (&App::check, this)); + _timer.reset (new wxTimer (this)); + _timer->Start (1000); - if (Config::instance()->check_for_updates ()) { - UpdateChecker::instance()->run (); + if (Config::instance()->check_for_updates ()) { + UpdateChecker::instance()->run (); + } + } + catch (exception& e) + { + if (splash) { + splash->Destroy (); + } + error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); } return true; } - catch (exception& e) - { - error_dialog (0, wxString::Format ("DCP-o-matic could not start."), std_to_wx(e.what())); - return true; - } void OnInitCmdLine (wxCmdLineParser& parser) {