X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=ad1dcde90b647d7336e831421122f7e092f71aa2;hb=ed227b4fdba9b4fc7f06f6db4830219f14bad358;hp=7392c830c7be939d8560201ad8597c2e40cbf036;hpb=23583dfb56181c76126e652042e9d1940367aa27;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 7392c830c..ad1dcde90 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -22,7 +22,8 @@ * @brief The main DCP-o-matic GUI. */ -#include "wx/control_film_viewer.h" +#include "wx/standard_controls.h" +#include "wx/film_viewer.h" #include "wx/film_editor.h" #include "wx/job_manager_view.h" #include "wx/full_config_dialog.h" @@ -46,7 +47,10 @@ #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" @@ -54,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" @@ -74,6 +79,7 @@ #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 @@ -90,6 +96,7 @@ #include #include #include +#include #include #include /* This is OK as it's only used with DCPOMATIC_WINDOWS */ @@ -113,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 @@ -220,6 +229,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) */ @@ -306,6 +316,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); @@ -317,12 +328,14 @@ public: */ wxPanel* overall_panel = new wxPanel (this, wxID_ANY); - _film_viewer = new ControlFilmViewer (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); @@ -395,6 +408,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) @@ -430,6 +444,7 @@ 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; @@ -473,7 +488,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 } } @@ -800,7 +832,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"), @@ -849,7 +881,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); } } @@ -857,7 +889,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); } } @@ -948,6 +980,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); @@ -1174,6 +1226,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); @@ -1298,16 +1351,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; - ControlFilmViewer* _film_viewer; + boost::shared_ptr _film_viewer; + StandardControls* _controls; VideoWaveformDialog* _video_waveform_dialog; HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; @@ -1420,12 +1474,12 @@ private: 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)) { + 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 (_frame->film(), _dcp_to_add))); + _frame->film()->examine_and_add_content(shared_ptr(new DCPContent(_dcp_to_add))); } }