X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=63e5ca6b14834e85dc1acbed2aac0a2845cace52;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=f3146428216ce3d90e2a88076dc282f689768224;hpb=b74bc6135a6a690bf5674638a8bea56e5580fd08;p=dcpomatic.git diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index f31464282..63e5ca6b1 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -38,6 +38,7 @@ #include "wx/content_panel.h" #include "wx/report_problem_dialog.h" #include "wx/video_waveform_dialog.h" +#include "wx/save_template_dialog.h" #include "lib/film.h" #include "lib/config.h" #include "lib/util.h" @@ -60,6 +61,7 @@ #include "lib/dcpomatic_socket.h" #include "lib/hints.h" #include +#include #include #include #include @@ -75,6 +77,7 @@ #include #include #include +/* This is OK as it's only used with DCPOMATIC_WINDOWS */ #include #ifdef check @@ -94,6 +97,7 @@ using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using dcp::raw_convert; class FilmChangedDialog : public boost::noncopyable { @@ -140,6 +144,7 @@ enum { ID_file_new = 1, ID_file_open, ID_file_save, + ID_file_save_as_template, ID_file_history, /* Allow spare IDs after _history for the recent files list */ ID_content_scale_to_fit_width = 100, @@ -170,6 +175,7 @@ public: , _hints_dialog (0) , _servers_list_dialog (0) , _config_dialog (0) + , _kdm_dialog (0) , _file_menu (0) , _history_items (0) , _history_position (0) @@ -206,6 +212,7 @@ public: 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_save_as_template, this), ID_file_save_as_template); 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); @@ -274,9 +281,12 @@ public: } } - void new_film (boost::filesystem::path path) + void new_film (boost::filesystem::path path, optional template_name) { shared_ptr film (new Film (path)); + if (template_name) { + film->use_template (template_name.get()); + } film->write_metadata (); film->set_name (path.filename().generic_string()); set_film (film); @@ -313,8 +323,12 @@ public: _film = film; _film_viewer->set_film (_film); _film_editor->set_film (_film); + delete _video_waveform_dialog; + _video_waveform_dialog = 0; set_menu_sensitivity (); - Config::instance()->add_to_history (_film->directory ()); + if (_film->directory()) { + Config::instance()->add_to_history (_film->directory().get()); + } } shared_ptr film () const { @@ -340,27 +354,27 @@ private: if (r == wxID_OK) { - if (boost::filesystem::is_directory (d->get_path()) && !boost::filesystem::is_empty(d->get_path())) { + if (boost::filesystem::is_directory (d->path()) && !boost::filesystem::is_empty(d->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()) + d->path().string().c_str()) ) )) { return; } - } else if (boost::filesystem::is_regular_file (d->get_path())) { + } else if (boost::filesystem::is_regular_file (d->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()) + String::compose (wx_to_std (_("%1 already exists as a file, so you cannot use it for a new film.")), d->path().c_str()) ); return; } if (maybe_save_then_delete_film ()) { - new_film (d->get_path ()); + new_film (d->path(), d->template_name()); } } @@ -398,6 +412,22 @@ private: _film->write_metadata (); } + void file_save_as_template () + { + SaveTemplateDialog* d = new SaveTemplateDialog (this); + int const r = d->ShowModal (); + if (r == wxID_OK) { + bool ok = true; + if (Config::instance()->existing_template (d->name ())) { + ok = confirm_dialog (d, _("There is already a template with this name. Do you want to overwrite it?")); + } + if (ok) { + Config::instance()->save_template (_film, d->name ()); + } + } + d->Destroy (); + } + void file_history (wxCommandEvent& event) { vector history = Config::instance()->history (); @@ -484,41 +514,13 @@ 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()); - if (d->write_to ()) { - ScreenKDM::write_files ( - _film->name(), - screen_kdms, - d->directory() - ); - } else { - JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob ( - _film->name(), - _film->dcp_name(), - d->from(), - d->until(), - CinemaKDMs::collect (screen_kdms), - _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 (this); } void jobs_make_dcp_batch () @@ -550,7 +552,8 @@ private: boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); Socket socket (5); socket.connect (*endpoint_iterator); - string s = _film->directory().string (); + DCPOMATIC_ASSERT (_film->directory ()); + string s = _film->directory()->string (); socket.write (s.length() + 1); socket.write ((uint8_t *) s.c_str(), s.length() + 1); /* OK\0 */ @@ -638,6 +641,7 @@ private: void jobs_show_dcp () { + DCPOMATIC_ASSERT (_film->directory ()); #ifdef DCPOMATIC_WINDOWS wstringstream args; args << "/select," << _film->dir (_film->dcp_name(false)); @@ -647,14 +651,14 @@ 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 ("nautilus " + _film->directory()->string()).c_str ()); if (WEXITSTATUS (r)) { 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 ("konqueror " + _film->directory()->string()).c_str ()); if (WEXITSTATUS (r)) { error_dialog (this, _("Could not show DCP (could not run konqueror)")); } @@ -673,7 +677,7 @@ private: void tools_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 (); @@ -848,6 +852,8 @@ 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); _history_position = _file_menu->GetMenuItems().GetCount(); @@ -927,12 +933,13 @@ private: } for (size_t i = 0; i < history.size(); ++i) { - SafeStringStream 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 (); @@ -972,6 +979,7 @@ private: HintsDialog* _hints_dialog; ServersListDialog* _servers_list_dialog; wxPreferencesEditor* _config_dialog; + KDMDialog* _kdm_dialog; wxMenu* _file_menu; shared_ptr _film; int _history_items; @@ -1006,6 +1014,8 @@ private: { wxInitAllImageHandlers (); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + wxSplashScreen* splash = 0; try { if (!Config::have_existing ("config.xml")) { @@ -1073,7 +1083,7 @@ private: } if (!_film_to_create.empty ()) { - _frame->new_film (_film_to_create); + _frame->new_film (_film_to_create, optional ()); if (!_content_to_add.empty ()) { _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add)); } @@ -1175,6 +1185,11 @@ private: } } + void config_failed_to_load () + { + message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); + } + DOMFrame* _frame; shared_ptr _timer; string _film_to_load;