X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=4505cff84cfea5b8e7fb91cc554310dedda39f2e;hp=e29d41db7dd5d9c3175694c16f480fc2dba3e5b0;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4 diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index e29d41db7..4505cff84 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -22,13 +22,15 @@ * @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" -#include "wx/config_dialog.h" +#include "wx/full_config_dialog.h" #include "wx/wx_util.h" -#include "wx/new_film_dialog.h" +#include "wx/film_name_location_dialog.h" #include "wx/wx_signal_manager.h" +#include "wx/recreate_chain_dialog.h" #include "wx/about_dialog.h" #include "wx/kdm_dialog.h" #include "wx/self_dkdm_dialog.h" @@ -38,7 +40,17 @@ #include "wx/content_panel.h" #include "wx/report_problem_dialog.h" #include "wx/video_waveform_dialog.h" +#include "wx/save_template_dialog.h" +#include "wx/templates_dialog.h" +#include "wx/nag_dialog.h" +#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" @@ -46,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" @@ -59,7 +72,16 @@ #include "lib/cinema_kdms.h" #include "lib/dcpomatic_socket.h" #include "lib/hints.h" +#include "lib/dcp_content.h" +#include "lib/ffmpeg_encoder.h" +#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 #include #include @@ -73,8 +95,11 @@ #endif #include #include +#include +#include #include #include +/* This is OK as it's only used with DCPOMATIC_WINDOWS */ #include #ifdef check @@ -94,11 +119,15 @@ using std::exception; 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 FilmChangedDialog : public boost::noncopyable +class FilmChangedClosingDialog : public boost::noncopyable { public: - FilmChangedDialog (string name) + explicit FilmChangedClosingDialog (string name) { _dialog = new wxMessageDialog ( 0, @@ -114,7 +143,7 @@ public: ); } - ~FilmChangedDialog () + ~FilmChangedClosingDialog () { _dialog->Destroy (); } @@ -128,11 +157,48 @@ private: wxMessageDialog* _dialog; }; -#define ALWAYS 0x0 -#define NEEDS_FILM 0x1 -#define NOT_DURING_DCP_CREATION 0x2 -#define NEEDS_CPL 0x4 -#define NEEDS_SELECTED_VIDEO_CONTENT 0x8 +class FilmChangedDuplicatingDialog : public boost::noncopyable +{ +public: + explicit FilmChangedDuplicatingDialog (string name) + { + _dialog = new wxMessageDialog ( + 0, + wxString::Format (_("Save changes to film \"%s\" before duplicating?"), 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 | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION + ); + + _dialog->SetYesNoCancelLabels ( + _("Save film and duplicate"), _("Duplicate without saving film"), _("Don't duplicate") + ); + } + + ~FilmChangedDuplicatingDialog () + { + _dialog->Destroy (); + } + + int run () + { + return _dialog->ShowModal (); + } + +private: + wxMessageDialog* _dialog; +}; + +#define ALWAYS 0x0 +#define NEEDS_FILM 0x1 +#define NOT_DURING_DCP_CREATION 0x2 +#define NEEDS_CPL 0x4 +#define NEEDS_SINGLE_SELECTED_CONTENT 0x8 +#define NEEDS_SELECTED_CONTENT 0x10 +#define NEEDS_SELECTED_VIDEO_CONTENT 0x20 +#define NEEDS_CLIPBOARD 0x40 +#define NEEDS_ENCRYPTION 0x80 map menu_items; @@ -140,36 +206,53 @@ enum { ID_file_new = 1, ID_file_open, ID_file_save, + ID_file_save_as_template, + ID_file_duplicate, + ID_file_duplicate_and_open, ID_file_history, /* Allow spare IDs after _history for the recent files list */ - ID_content_scale_to_fit_width = 100, + ID_file_close = 100, + ID_edit_copy, + ID_edit_paste, + ID_content_scale_to_fit_width, ID_content_scale_to_fit_height, ID_jobs_make_dcp, ID_jobs_make_dcp_batch, ID_jobs_make_kdms, ID_jobs_make_self_dkdm, + ID_jobs_export, ID_jobs_send_dcp_to_tms, ID_jobs_show_dcp, - ID_tools_video_waveform, + ID_jobs_open_dcp_in_player, + ID_view_closed_captions, + ID_view_video_waveform, ID_tools_hints, 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) */ ID_add_file, - ID_remove + ID_remove, + ID_start_stop, + ID_timeline, + ID_back_frame, + ID_forward_frame }; class DOMFrame : public wxFrame { public: - DOMFrame (wxString const & title) + explicit DOMFrame (wxString const & title) : wxFrame (NULL, -1, title) , _video_waveform_dialog (0) , _hints_dialog (0) , _servers_list_dialog (0) , _config_dialog (0) + , _kdm_dialog (0) + , _templates_dialog (0) , _file_menu (0) , _history_items (0) , _history_position (0) @@ -200,30 +283,45 @@ public: setup_menu (bar); SetMenuBar (bar); - _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); - config_changed (); - - 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_make_dcp_batch, this), ID_jobs_make_dcp_batch); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_self_dkdm, this), ID_jobs_make_self_dkdm); - 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); +#ifdef DCPOMATIC_WINDOWS + SetIcon (wxIcon (std_to_wx ("id"))); +#endif + + _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1)); + config_changed (Config::OTHER); + + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_new, this), ID_file_new); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_open, this), ID_file_open); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_save, this), ID_file_save); + 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); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_paste, this), ID_edit_paste); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this), ID_jobs_make_dcp); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp_batch, this), ID_jobs_make_dcp_batch); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_self_dkdm, this), ID_jobs_make_self_dkdm); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this), ID_jobs_export); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_show_dcp, this), ID_jobs_show_dcp); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_open_dcp_in_player, this), ID_jobs_open_dcp_in_player); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_closed_captions, this), ID_view_closed_captions); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_video_waveform, this), ID_view_video_waveform); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_hints, this), ID_tools_hints); + 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); Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1)); @@ -232,39 +330,68 @@ 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); + 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 (); _film_editor->FileChanged.connect (bind (&DOMFrame::file_changed, this, _1)); + _film_editor->content_panel()->SelectionChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this)); file_changed (""); JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this)); overall_panel->SetSizer (main_sizer); - wxAcceleratorEntry accel[2]; + UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); + + FocusManager::instance()->SetFocus.connect (boost::bind (&DOMFrame::remove_accelerators, this)); + FocusManager::instance()->KillFocus.connect (boost::bind (&DOMFrame::add_accelerators, this)); + add_accelerators (); + } + + void add_accelerators () + { +#ifdef __WXOSX__ + int accelerators = 7; +#else + int accelerators = 6; +#endif + wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators]; accel[0].Set (wxACCEL_CTRL, static_cast('A'), ID_add_file); accel[1].Set (wxACCEL_NORMAL, WXK_DELETE, ID_remove); + accel[2].Set (wxACCEL_NORMAL, WXK_SPACE, ID_start_stop); + accel[3].Set (wxACCEL_CTRL, static_cast('T'), ID_timeline); + 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'), 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); - wxAcceleratorTable accel_table (2, accel); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::start_stop_pressed, this), ID_start_stop); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::timeline_pressed, this), ID_timeline); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame); + wxAcceleratorTable accel_table (accelerators, accel); SetAcceleratorTable (accel_table); + delete[] accel; + } - /* Instantly save any config changes when using the DCP-o-matic GUI */ - Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ())); - - UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); + void remove_accelerators () + { + SetAcceleratorTable (wxAcceleratorTable ()); } void remove_clicked (wxCommandEvent& ev) @@ -274,12 +401,16 @@ public: } } - void new_film (boost::filesystem::path path) + void new_film (boost::filesystem::path path, optional template_name) { shared_ptr film (new Film (path)); - film->write_metadata (); + if (template_name) { + film->use_template (template_name.get()); + } film->set_name (path.filename().generic_string()); + film->write_metadata (); set_film (film); + dcpomatic_log = film->log (); } void load_film (boost::filesystem::path file) @@ -301,11 +432,13 @@ public: } set_film (film); + + JobManager::instance()->add(shared_ptr(new CheckContentChangeJob(film))); } catch (std::exception& e) { wxString p = std_to_wx (file.string ()); wxCharBuffer b = p.ToUTF8 (); - error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data())); + error_dialog (this, wxString::Format (_("Could not open film at %s"), p.data()), std_to_wx (e.what())); } void set_film (shared_ptr film) @@ -313,8 +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 (); - Config::instance()->add_to_history (_film->directory ()); + if (_film && _film->directory()) { + Config::instance()->add_to_history (_film->directory().get()); + } + 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 { @@ -323,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")); @@ -335,32 +491,31 @@ private: void file_new () { - NewFilmDialog* d = new NewFilmDialog (this); + FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("New Film"), true); int const r = d->ShowModal (); - if (r == wxID_OK) { - - if (boost::filesystem::is_directory (d->get_path()) && !boost::filesystem::is_empty(d->get_path())) { - if (!confirm_dialog ( - this, - std_to_wx ( - String::compose (wx_to_std (_("The directory %1 already exists and is not empty. " - "Are you sure you want to use it?")), - d->get_path().string().c_str()) - ) - )) { - return; + if (r == wxID_OK && d->check_path() && maybe_save_then_delete_film()) { + try { + new_film (d->path(), d->template_name()); + } catch (boost::filesystem::filesystem_error& e) { +#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]; + } } - } else if (boost::filesystem::is_regular_file (d->get_path())) { - error_dialog ( - this, - String::compose (wx_to_std (_("%1 already exists as a file, so you cannot use it for a new film.")), d->get_path().c_str()) - ); - return; - } - - if (maybe_save_then_delete_film ()) { - new_film (d->get_path ()); + 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 } } @@ -386,7 +541,7 @@ private: } } - if (r == wxID_OK && maybe_save_then_delete_film()) { + if (r == wxID_OK && maybe_save_then_delete_film()) { load_film (wx_to_std (c->GetPath ())); } @@ -398,11 +553,77 @@ private: _film->write_metadata (); } + void file_save_as_template () + { + SaveTemplateDialog* d = new SaveTemplateDialog (this); + int const r = d->ShowModal (); + if (r == wxID_OK) { + Config::instance()->save_template (_film, d->name ()); + } + d->Destroy (); + } + + void file_duplicate () + { + FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); + int const r = d->ShowModal (); + + if (r == wxID_OK && d->check_path() && maybe_save_film()) { + shared_ptr film (new Film (d->path())); + film->copy_from (_film); + film->set_name (d->path().filename().generic_string()); + film->write_metadata (); + } + + d->Destroy (); + } + + void file_duplicate_and_open () + { + FilmNameLocationDialog* d = new FilmNameLocationDialog (this, _("Duplicate Film"), false); + int const r = d->ShowModal (); + + if (r == wxID_OK && d->check_path() && maybe_save_film()) { + shared_ptr film (new Film (d->path())); + film->copy_from (_film); + film->set_name (d->path().filename().generic_string()); + film->write_metadata (); + set_film (film); + } + + 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 (); int n = event.GetId() - ID_file_history; - if (n >= 0 && n < static_cast (history.size ()) && maybe_save_then_delete_film()) { + if (n >= 0 && n < static_cast (history.size ()) && maybe_save_then_delete_film()) { load_film (history[n]); } } @@ -413,10 +634,47 @@ private: Close (false); } + void edit_copy () + { + ContentList const sel = _film_editor->content_panel()->selected(); + DCPOMATIC_ASSERT (sel.size() == 1); + _clipboard = sel.front()->clone(); + } + + void edit_paste () + { + DCPOMATIC_ASSERT (_clipboard); + + 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) { + DCPOMATIC_ASSERT (_clipboard->video); + i->video->take_settings_from (_clipboard->video); + } + if (d->audio() && i->audio) { + DCPOMATIC_ASSERT (_clipboard->audio); + i->audio->take_settings_from (_clipboard->audio); + } + + 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; + } + } + } + } + d->Destroy (); + } + void edit_preferences () { if (!_config_dialog) { - _config_dialog = create_config_dialog (); + _config_dialog = create_full_config_dialog (); } _config_dialog->Show (this); } @@ -447,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 (); @@ -465,6 +723,26 @@ private: } } + if (_film->encrypted ()) { + NagDialog::maybe_nag ( + this, + Config::NAG_ENCRYPTED_METADATA, + _("You are making an encrypted DCP. It will not be possible to make KDMs for this DCP unless you have copies of " + "the metadata.xml file within the film and the metadata files within the DCP.\n\n" + "You should ensure that these files are BACKED UP " + "if you want to make KDMs for this film.") + ); + } + + /* Remove any existing DCP if the user agrees */ + boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name(), false); + if (boost::filesystem::exists (dcp_dir)) { + if (!confirm_dialog (this, wxString::Format (_("Do you want to overwrite the existing DCP %s?"), std_to_wx(dcp_dir.string()).data()))) { + return; + } + boost::filesystem::remove_all (dcp_dir); + } + 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. @@ -472,9 +750,9 @@ private: _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())); + error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what())); } catch (std::exception& e) { - error_dialog (this, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data())); + error_dialog (this, wxString::Format (_("Could not make DCP.")), std_to_wx(e.what())); } } @@ -484,97 +762,82 @@ private: return; } - KDMDialog* d = new KDMDialog (this, _film); - if (d->ShowModal () != wxID_OK) { - d->Destroy (); - return; - } - - try { - list screen_kdms = _film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation()); - - NameFormat::Map name_values; - name_values["film_name"] = _film->name(); - name_values["from"] = dcp::LocalTime(d->from()).date() + " " + dcp::LocalTime(d->from()).time_of_day(); - name_values["to"] = dcp::LocalTime(d->until()).date() + " " + dcp::LocalTime(d->until()).time_of_day(); - - if (d->write_to ()) { - ScreenKDM::write_files ( - screen_kdms, - d->directory(), - d->name_format(), - name_values - ); - } else { - JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob ( - CinemaKDMs::collect (screen_kdms), - d->name_format(), - name_values, - _film->dcp_name(), - _film->log() - )) - ); - } - } catch (dcp::NotEncryptedError& e) { - error_dialog (this, _("CPL's content is not encrypted.")); - } catch (exception& e) { - error_dialog (this, e.what ()); - } catch (...) { - error_dialog (this, _("An unknown exception occurred.")); + if (_kdm_dialog) { + _kdm_dialog->Destroy (); + _kdm_dialog = 0; } - d->Destroy (); + _kdm_dialog = new KDMDialog (this, _film); + _kdm_dialog->Show (); } - void jobs_make_dcp_batch () + /** @return false if we succeeded, true if not */ + bool send_to_other_tool (int port, function start, string message) { - if (!_film) { - return; - } - - if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) { - HintsDialog* hints = new HintsDialog (this, _film, false); - int const r = hints->ShowModal(); - hints->Destroy (); - if (r == wxID_CANCEL) { - return; - } - } - - _film->write_metadata (); - /* i = 0; try to connect via socket - i = 1; try again, and then try to start the batch converter + i = 1; try again, and then try to start the tool i = 2 onwards; try again. */ for (int i = 0; i < 8; ++i) { try { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service); - boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert (Config::instance()->server_port_base() + 2)); + boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert (port)); boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); Socket socket (5); socket.connect (*endpoint_iterator); - string s = _film->directory().string (); - socket.write (s.length() + 1); - socket.write ((uint8_t *) s.c_str(), s.length() + 1); + DCPOMATIC_ASSERT (_film->directory ()); + socket.write (message.length() + 1); + socket.write ((uint8_t *) message.c_str(), message.length() + 1); /* OK\0 */ uint8_t ok[3]; socket.read (ok, 3); - return; + return false; } catch (exception& e) { } if (i == 1) { - start_batch_converter (wx_to_std (wxStandardPaths::Get().GetExecutablePath())); + start (wx_to_std (wxStandardPaths::Get().GetExecutablePath())); } dcpomatic_sleep (1); } - error_dialog (this, _("Could not find batch converter.")); + return true; + } + + void jobs_make_dcp_batch () + { + if (!_film) { + return; + } + + if (Config::instance()->show_hints_before_make_dcp()) { + HintsDialog* hints = new HintsDialog (this, _film, false); + int const r = hints->ShowModal(); + hints->Destroy (); + if (r == wxID_CANCEL) { + return; + } + } + + _film->write_metadata (); + + if (send_to_other_tool (BATCH_JOB_PORT, bind (&start_batch_converter, _1), _film->directory()->string())) { + error_dialog (this, _("Could not find batch converter.")); + } + } + + void jobs_open_dcp_in_player () + { + if (!_film) { + return; + } + + if (send_to_other_tool (PLAYER_PLAY_PORT, bind (&start_player, _1), _film->dir(_film->dcp_name(false)).string())) { + error_dialog (this, _("Could not find player.")); + } } void jobs_make_self_dkdm () @@ -589,15 +852,28 @@ private: return; } + NagDialog::maybe_nag ( + this, + Config::NAG_DKDM_CONFIG, + wxString::Format ( + _("You are making a DKDM which is encrypted by a private key held in" + "\n\n%s\n\nIt is VITALLY IMPORTANT " + "that you BACK UP THIS FILE since if it is lost " + "your DKDMs (and the DCPs they protect) will become useless."), std_to_wx(Config::config_file().string()).data() + ) + ); + optional kdm; 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"), - dcp::MODIFIED_TRANSITIONAL_1 + dcp::MODIFIED_TRANSITIONAL_1, + true, + 0 ); } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); @@ -609,9 +885,9 @@ private: if (kdm) { if (d->internal ()) { - vector dkdms = Config::instance()->dkdms (); - dkdms.push_back (kdm.get()); - Config::instance()->set_dkdms (dkdms); + shared_ptr dkdms = Config::instance()->dkdms (); + dkdms->add (shared_ptr (new DKDM (kdm.get()))); + Config::instance()->changed (); } else { boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); kdm->as_xml (path); @@ -621,11 +897,26 @@ private: d->Destroy (); } + void jobs_export () + { + 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(), d->split_reels(), d->x264_crf()) + ) + ); + JobManager::instance()->add (job); + } + d->Destroy (); + } + void content_scale_to_fit_width () { 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); } } @@ -633,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); } } @@ -644,6 +935,7 @@ private: void jobs_show_dcp () { + DCPOMATIC_ASSERT (_film->directory ()); #ifdef DCPOMATIC_WINDOWS wstringstream args; args << "/select," << _film->dir (_film->dcp_name(false)); @@ -653,33 +945,38 @@ private: #ifdef DCPOMATIC_LINUX int r = system ("which nautilus"); if (WEXITSTATUS (r) == 0) { - r = system (string ("nautilus " + _film->directory().string()).c_str ()); + r = system (String::compose("nautilus \"%1\"", _film->directory()->string()).c_str()); if (WEXITSTATUS (r)) { - error_dialog (this, _("Could not show DCP (could not run nautilus)")); + error_dialog (this, _("Could not show DCP."), _("Could not run nautilus")); } } else { int r = system ("which konqueror"); if (WEXITSTATUS (r) == 0) { - r = system (string ("konqueror " + _film->directory().string()).c_str ()); + r = system (String::compose ("konqueror \"%1\"", _film->directory()->string()).c_str()); if (WEXITSTATUS (r)) { - error_dialog (this, _("Could not show DCP (could not run konqueror)")); + error_dialog (this, _("Could not show DCP"), _("Could not run konqueror")); } } } #endif #ifdef DCPOMATIC_OSX - int r = system (string ("open -R " + _film->dir (_film->dcp_name (false)).string ()).c_str ()); + int r = system (String::compose ("open -R \"%1\"", _film->dir (_film->dcp_name(false)).string()).c_str()); if (WEXITSTATUS (r)) { error_dialog (this, _("Could not show DCP")); } #endif } - void tools_video_waveform () + void view_closed_captions () + { + _film_viewer->show_closed_captions (); + } + + void view_video_waveform () { if (!_video_waveform_dialog) { - _video_waveform_dialog = new VideoWaveformDialog (this, _film_viewer); + _video_waveform_dialog = new VideoWaveformDialog (this, _film, _film_viewer); } _video_waveform_dialog->Show (); @@ -703,12 +1000,41 @@ private: _servers_list_dialog->Show (); } + void tools_manage_templates () + { + if (!_templates_dialog) { + _templates_dialog = new TemplatesDialog (this); + } + + _templates_dialog->Show (); + } + void tools_check_for_updates () { UpdateChecker::instance()->run (); _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); @@ -752,7 +1078,7 @@ private: if (_film && _film->dirty ()) { - FilmChangedDialog* dialog = new FilmChangedDialog (_film->name ()); + FilmChangedClosingDialog* dialog = new FilmChangedClosingDialog (_film->name ()); int const r = dialog->run (); delete dialog; @@ -789,6 +1115,8 @@ private: } bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished (); bool const have_cpl = _film && !_film->cpls().empty (); + bool const have_single_selected_content = _film_editor->content_panel()->selected().size() == 1; + bool const have_selected_content = !_film_editor->content_panel()->selected().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) { @@ -807,10 +1135,26 @@ private: enabled = false; } + if ((j->second & NEEDS_SELECTED_CONTENT) && !have_selected_content) { + enabled = false; + } + + if ((j->second & NEEDS_SINGLE_SELECTED_CONTENT) && !have_single_selected_content) { + enabled = false; + } + if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) { enabled = false; } + if ((j->second & NEEDS_CLIPBOARD) && !_clipboard) { + enabled = false; + } + + if ((j->second & NEEDS_ENCRYPTION) && (!_film || !_film->encrypted())) { + enabled = false; + } + j->first->Enable (enabled); } } @@ -818,29 +1162,39 @@ private: /** @return true if the operation that called this method * should continue, false to abort it. */ - bool maybe_save_then_delete_film () + template + bool maybe_save_film () { if (!_film) { return true; } if (_film->dirty ()) { - FilmChangedDialog d (_film->name ()); + T d (_film->name ()); switch (d.run ()) { case wxID_NO: - break; + return true; case wxID_YES: _film->write_metadata (); - break; + return true; case wxID_CANCEL: return false; } } - _film.reset (); return true; } + template + bool maybe_save_then_delete_film () + { + bool const r = maybe_save_film (); + if (r) { + _film.reset (); + } + return r; + } + void add_item (wxMenu* menu, wxString text, int id, int sens) { wxMenuItem* item = menu->Append (id, text); @@ -854,9 +1208,16 @@ 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, _("Save as &template..."), ID_file_save_as_template, NEEDS_FILM); + add_item (_file_menu, _("Duplicate..."), ID_file_duplicate, NEEDS_FILM); + add_item (_file_menu, _("Duplicate and open..."), ID_file_duplicate_and_open, NEEDS_FILM); _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 @@ -867,10 +1228,13 @@ private: add_item (_file_menu, _("&Quit"), wxID_EXIT, ALWAYS); #endif + wxMenu* edit = new wxMenu; + add_item (edit, _("Copy settings\tCtrl-C"), ID_edit_copy, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SINGLE_SELECTED_CONTENT); + add_item (edit, _("Paste settings...\tCtrl-V"), ID_edit_paste, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_SELECTED_CONTENT | NEEDS_CLIPBOARD); + #ifdef __WXOSX__ add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #else - wxMenu* edit = new wxMenu; add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #endif @@ -881,16 +1245,26 @@ private: 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 DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION); + jobs_menu->AppendSeparator (); add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM); - add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM); + add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM | NEEDS_ENCRYPTION); + jobs_menu->AppendSeparator (); + add_item (jobs_menu, _("Export...\tCtrl-E"), ID_jobs_export, NEEDS_FILM); + jobs_menu->AppendSeparator (); add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); + add_item (jobs_menu, _("Open DCP in &player"), ID_jobs_open_dcp_in_player, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); + + wxMenu* view = new wxMenu; + add_item (view, _("Closed captions..."), ID_view_closed_captions, NEEDS_FILM); + add_item (view, _("Video waveform..."), ID_view_video_waveform, NEEDS_FILM); wxMenu* tools = new wxMenu; - 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, _("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); @@ -903,17 +1277,43 @@ private: add_item (help, _("Report a problem..."), ID_help_report_a_problem, NEEDS_FILM); m->Append (_file_menu, _("&File")); -#ifndef __WXOSX__ m->Append (edit, _("&Edit")); -#endif m->Append (content, _("&Content")); m->Append (jobs_menu, _("&Jobs")); + m->Append (view, _("&View")); m->Append (tools, _("&Tools")); m->Append (help, _("&Help")); } - void config_changed () + void config_changed (Config::Property what) { + /* Instantly save any config changes when using the DCP-o-matic GUI */ + if (what == Config::CINEMAS) { + try { + Config::instance()->write_cinemas(); + } catch (exception& e) { + error_dialog ( + this, + wxString::Format ( + _("Could not write to cinemas file at %s. Your changes have not been saved."), + std_to_wx (Config::instance()->cinemas_file().string()).data() + ) + ); + } + } else { + try { + Config::instance()->write_config(); + } catch (exception& e) { + error_dialog ( + this, + wxString::Format ( + _("Could not write to config file at %s. Your changes have not been saved."), + std_to_wx (Config::instance()->cinemas_file().string()).data() + ) + ); + } + } + for (int i = 0; i < _history_items; ++i) { delete _file_menu->Remove (ID_file_history + i); } @@ -933,15 +1333,18 @@ private: } for (size_t i = 0; i < history.size(); ++i) { - locked_stringstream s; + string s; if (i < 9) { - s << "&" << (i + 1) << " "; + s = String::compose ("&%1 %2", i + 1, history[i].string()); + } else { + s = history[i].string(); } - s << history[i].string(); - _file_menu->Insert (pos++, ID_file_history + i, std_to_wx (s.str ())); + _file_menu->Insert (pos++, ID_file_history + i, std_to_wx (s)); } _history_items = history.size (); + + dcpomatic_log->set_types (Config::instance()->log_types()); } void update_checker_state_changed () @@ -972,12 +1375,39 @@ private: _update_news_requested = false; } + void start_stop_pressed () + { + if (_film_viewer->playing()) { + _film_viewer->stop(); + } else { + _film_viewer->start(); + } + } + + void timeline_pressed () + { + _film_editor->content_panel()->timeline_clicked (); + } + + void back_frame () + { + _film_viewer->seek_by (-_film_viewer->one_video_frame(), true); + } + + void 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; wxPreferencesEditor* _config_dialog; + KDMDialog* _kdm_dialog; + TemplatesDialog* _templates_dialog; wxMenu* _file_menu; shared_ptr _film; int _history_items; @@ -985,11 +1415,13 @@ private: wxMenuItem* _history_separator; boost::signals2::scoped_connection _config_changed_connection; bool _update_news_requested; + shared_ptr _clipboard; }; static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_OPTION, "c", "content", "add content file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_OPTION, "c", "content", "add content file / directory", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_OPTION, "d", "dcp", "add content DCP", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 } }; @@ -1008,103 +1440,112 @@ public: private: bool OnInit () - try { - wxInitAllImageHandlers (); - - Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); - wxSplashScreen* splash = 0; try { - if (!Config::have_existing ("config.xml")) { - 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 (); - } - } - } catch (boost::filesystem::filesystem_error& e) { - /* Maybe we couldn't find the splash image; never mind */ - } + wxInitAllImageHandlers (); - SetAppName (_("DCP-o-matic")); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - if (!wxApp::OnInit()) { - return false; - } + splash = maybe_show_splash (); + + SetAppName (_("DCP-o-matic")); + + 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 (); - _frame = new DOMFrame (_("DCP-o-matic")); - SetTopWindow (_frame); - _frame->Maximize (); - if (splash) { - splash->Destroy (); - } - _frame->Show (); + Config::BadSignerChain.connect (boost::bind (&App::config_bad_signer_chain, this)); - 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, e.what()))); + _frame = new DOMFrame (_("DCP-o-matic")); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + splash = 0; } - } - if (!_film_to_create.empty ()) { - _frame->new_film (_film_to_create); - if (!_content_to_add.empty ()) { - _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add)); + 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); + } + + _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 (!_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: %s", e.what ())); - return true; - } void OnInitCmdLine (wxCmdLineParser& parser) { @@ -1127,6 +1568,11 @@ private: _content_to_add = wx_to_std (content); } + wxString dcp; + if (parser.Found (wxT ("dcp"), &dcp)) { + _dcp_to_add = wx_to_std (dcp); + } + return true; } @@ -1188,11 +1634,29 @@ private: message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); } + void config_warning (string m) + { + message_dialog (_frame, std_to_wx (m)); + } + + bool config_bad_signer_chain () + { + if (Config::instance()->nagged(Config::NAG_BAD_SIGNER_CHAIN)) { + return false; + } + + RecreateChainDialog* d = new RecreateChainDialog (_frame); + int const r = d->ShowModal (); + d->Destroy (); + return r == wxID_OK; + } + DOMFrame* _frame; shared_ptr _timer; string _film_to_load; string _film_to_create; string _content_to_add; + string _dcp_to_add; }; IMPLEMENT_APP (App)