X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=843f392809d45e68f3aca113a7d3250f57f920e6;hb=c79c14e1ed3498094d0f82ea854ea43bea3728e1;hp=ea1d507661ec96594a7f4726eb9df9b977b90b1d;hpb=8726c70cc1b14dc996c18670cdcda0b4d670605e;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index ea1d50766..843f39280 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -36,6 +36,9 @@ #include "lib/dcp_content.h" #include "lib/case_insensitive_sorter.h" #include "lib/playlist.h" +#include "lib/config.h" +#include "lib/log.h" +#include "lib/compose.hpp" #include #include #include @@ -53,6 +56,8 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); + ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmViewer* viewer) : _timeline_dialog (0) , _parent (n) @@ -79,13 +84,17 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); _add_file = new wxButton (_panel, wxID_ANY, _("Add file(s)...")); - _add_file->SetToolTip (_("Add video, image or sound files to the film.")); + _add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film.")); b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _add_folder = new wxButton (_panel, wxID_ANY, _("Add folder...")); - _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a DCP.")); + _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files.")); b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _add_dcp = new wxButton (_panel, wxID_ANY, _("Add DCP...")); + _add_dcp->SetToolTip (_("Add a DCP.")); + b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _remove = new wxButton (_panel, wxID_ANY, _("Remove")); _remove->SetToolTip (_("Remove the selected piece of content from the film.")); b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); @@ -119,16 +128,17 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _timing_panel = new TimingPanel (this, _film_viewer); _panels.push_back (_timing_panel); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this)); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1)); + _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); + _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this)); + _content->Bind (wxEVT_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1)); _content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1)); - _add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_file_clicked, this)); - _add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_folder_clicked, this)); - _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this, false)); - _earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::earlier_clicked, this)); - _later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::later_clicked, this)); - _timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::timeline_clicked, this)); + _add_file->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_file_clicked, this)); + _add_folder->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_folder_clicked, this)); + _add_dcp->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_dcp_clicked, this)); + _remove->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::remove_clicked, this, false)); + _earlier->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::earlier_clicked, this)); + _later->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::later_clicked, this)); + _timeline->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this)); } ContentList @@ -249,7 +259,7 @@ ContentPanel::selection_changed () } } - if (go_to) { + if (go_to && Config::instance()->jump_to_selected ()) { _film_viewer->set_position (go_to.get ()); } @@ -264,7 +274,7 @@ ContentPanel::add_file_clicked () /* This method is also called when Ctrl-A is pressed, so check that our notebook page is visible. */ - if (_parent->GetCurrentPage() != _panel) { + if (_parent->GetCurrentPage() != _panel || !_film) { return; } @@ -310,7 +320,7 @@ ContentPanel::add_folder_clicked () return; } - shared_ptr content; + list > content; try { content = content_factory (_film, path); @@ -319,26 +329,47 @@ ContentPanel::add_folder_clicked () return; } - if (!content) { + if (content.empty ()) { error_dialog (_parent, _("No content found in this folder.")); return; } - shared_ptr ic = dynamic_pointer_cast (content); - if (ic) { - ImageSequenceDialog* e = new ImageSequenceDialog (_panel); - r = e->ShowModal (); - float const frame_rate = e->frame_rate (); - e->Destroy (); - - if (r != wxID_OK) { - return; + BOOST_FOREACH (shared_ptr i, content) { + shared_ptr ic = dynamic_pointer_cast (i); + if (ic) { + ImageSequenceDialog* e = new ImageSequenceDialog (_panel); + r = e->ShowModal (); + float const frame_rate = e->frame_rate (); + e->Destroy (); + + if (r != wxID_OK) { + return; + } + + ic->set_video_frame_rate (frame_rate); } - ic->set_video_frame_rate (frame_rate); + _film->examine_and_add_content (i); } +} - _film->examine_and_add_content (content); +void +ContentPanel::add_dcp_clicked () +{ + wxDirDialog* d = new wxDirDialog (_panel, _("Choose a DCP folder"), wxT (""), wxDD_DIR_MUST_EXIST); + int r = d->ShowModal (); + boost::filesystem::path const path (wx_to_std (d->GetPath ())); + d->Destroy (); + + if (r != wxID_OK) { + return; + } + + try { + _film->examine_and_add_content (shared_ptr (new DCPContent (_film, path))); + } catch (exception& e) { + error_dialog (_parent, e.what()); + } } /** @return true if this remove "click" should be ignored */ @@ -384,20 +415,21 @@ ContentPanel::setup_sensitivity () { _add_file->Enable (_generally_sensitive); _add_folder->Enable (_generally_sensitive); + _add_dcp->Enable (_generally_sensitive); ContentList selection = selected (); ContentList video_selection = selected_video (); ContentList audio_selection = selected_audio (); - _remove->Enable (!selection.empty() && _generally_sensitive); - _earlier->Enable (selection.size() == 1 && _generally_sensitive); - _later->Enable (selection.size() == 1 && _generally_sensitive); - _timeline->Enable (!_film->content().empty() && _generally_sensitive); + _remove->Enable (_generally_sensitive && !selection.empty()); + _earlier->Enable (_generally_sensitive && selection.size() == 1); + _later->Enable (_generally_sensitive && selection.size() == 1); + _timeline->Enable (_generally_sensitive && _film && !_film->content().empty()); - _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive); - _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive); - _subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive); - _timing_panel->Enable (selection.size() == 1 && _generally_sensitive); + _video_panel->Enable (_generally_sensitive && video_selection.size() > 0); + _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); + _subtitle_panel->Enable (_generally_sensitive && selection.size() == 1 && selection.front()->subtitle); + _timing_panel->Enable (_generally_sensitive); } void @@ -417,19 +449,7 @@ void ContentPanel::set_general_sensitivity (bool s) { _generally_sensitive = s; - - _content->Enable (s); - _add_file->Enable (s); - _add_folder->Enable (s); - _remove->Enable (s); - _earlier->Enable (s); - _later->Enable (s); - _timeline->Enable (s); - - /* Set the panels in the content notebook */ - BOOST_FOREACH (ContentSubPanel* i, _panels) { - i->Enable (s); - } + setup_sensitivity (); } void @@ -516,6 +536,12 @@ ContentPanel::setup () BOOST_FOREACH (shared_ptr i, content) { int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); + + /* Temporary debugging for Igor */ + BOOST_FOREACH (boost::filesystem::path j, i->paths()) { + LOG_GENERAL ("Check %1 %2 answer %3", j.string(), boost::filesystem::exists(j) ? "yes" : "no", valid ? "yes" : "no"); + } + shared_ptr dcp = dynamic_pointer_cast (i); bool const needs_kdm = dcp && dcp->needs_kdm (); bool const needs_assets = dcp && dcp->needs_assets (); @@ -553,6 +579,8 @@ ContentPanel::setup () /* Select the item of content if none was selected before */ _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } + + setup_sensitivity (); } void @@ -583,7 +611,13 @@ ContentPanel::add_files (list paths) /* XXX: check for lots of files here and do something */ - for (list::const_iterator i = paths.begin(); i != paths.end(); ++i) { - _film->examine_and_add_content (content_factory (_film, *i)); + try { + BOOST_FOREACH (boost::filesystem::path i, paths) { + BOOST_FOREACH (shared_ptr j, content_factory (_film, i)) { + _film->examine_and_add_content (j); + } + } + } catch (exception& e) { + error_dialog (_parent, e.what()); } }