X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=1d9f010bfda2d5808b55c60862cbf5a14fa8768b;hb=73407f943ba25e2a0df2c98b3a9a938132876e9f;hp=a68998232f6b02bb582c03328f80f7d07badb4bb;hpb=fa1103a905a6781ff207f51b293156a23b093edd;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index a68998232..1d9f010bf 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -46,6 +47,7 @@ using std::list; using std::string; using std::cout; using std::vector; +using std::exception; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; @@ -88,11 +90,11 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _remove->SetToolTip (_("Remove the selected piece of content from the film.")); b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _earlier = new wxButton (_panel, wxID_ANY, _("Up")); + _earlier = new wxButton (_panel, wxID_ANY, _("Earlier")); _earlier->SetToolTip (_("Move the selected piece of content earlier in the film.")); b->Add (_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _later = new wxButton (_panel, wxID_ANY, _("Down")); + _later = new wxButton (_panel, wxID_ANY, _("Later")); _later->SetToolTip (_("Move the selected piece of content later in the film.")); b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); @@ -123,7 +125,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _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)); + _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)); @@ -148,45 +150,42 @@ ContentPanel::selected () return sel; } -VideoContentList +ContentList ContentPanel::selected_video () { - VideoContentList vc; + ContentList vc; BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); - if (t) { - vc.push_back (t); + if (i->video) { + vc.push_back (i); } } return vc; } -AudioContentList +ContentList ContentPanel::selected_audio () { - AudioContentList ac; + ContentList ac; BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); - if (t) { - ac.push_back (t); + if (i->audio) { + ac.push_back (i); } } return ac; } -SubtitleContentList +ContentList ContentPanel::selected_subtitle () { - SubtitleContentList sc; + ContentList sc; BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); - if (t) { - sc.push_back (t); + if (i->subtitle) { + sc.push_back (i); } } @@ -228,6 +227,15 @@ ContentPanel::film_changed (Film::Property p) void ContentPanel::selection_changed () { + if (_last_selected == selected()) { + /* This was triggered by a re-build of the view but the selection + did not really change. + */ + return; + } + + _last_selected = selected (); + setup_sensitivity (); BOOST_FOREACH (ContentSubPanel* i, _panels) { @@ -302,7 +310,15 @@ ContentPanel::add_folder_clicked () return; } - shared_ptr content = content_factory (_film, path); + shared_ptr content; + + try { + content = content_factory (_film, path); + } catch (exception& e) { + error_dialog (_parent, e.what()); + return; + } + if (!content) { error_dialog (_parent, _("No content found in this folder.")); return; @@ -325,14 +341,15 @@ ContentPanel::add_folder_clicked () _film->examine_and_add_content (content); } -void -ContentPanel::remove_clicked () +/** @return true if this remove "click" should be ignored */ +bool +ContentPanel::remove_clicked (bool hotkey) { - /* This method is also called when Delete is pressed, so check that our notebook page + /* If the method was called because Delete was pressed check that our notebook page is visible and that the content list is focussed. */ - if (_parent->GetCurrentPage() != _panel || !_content->HasFocus()) { - return; + if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) { + return true; } BOOST_FOREACH (shared_ptr i, selected ()) { @@ -340,6 +357,7 @@ ContentPanel::remove_clicked () } selection_changed (); + return false; } void @@ -368,8 +386,8 @@ ContentPanel::setup_sensitivity () _add_folder->Enable (_generally_sensitive); ContentList selection = selected (); - VideoContentList video_selection = selected_video (); - AudioContentList audio_selection = selected_audio (); + ContentList video_selection = selected_video (); + ContentList audio_selection = selected_audio (); _remove->Enable (!selection.empty() && _generally_sensitive); _earlier->Enable (selection.size() == 1 && _generally_sensitive); @@ -378,18 +396,21 @@ ContentPanel::setup_sensitivity () _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive); _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive); - _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast (selection.front()) && _generally_sensitive); + _subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive); _timing_panel->Enable (selection.size() == 1 && _generally_sensitive); } void ContentPanel::set_film (shared_ptr film) { + _audio_panel->set_film (film); + _film = film; film_changed (Film::CONTENT); film_changed (Film::AUDIO_CHANNELS); selection_changed (); + setup_sensitivity (); } void @@ -477,7 +498,8 @@ ContentPanel::setup () int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); shared_ptr dcp = dynamic_pointer_cast (i); - bool const needs_kdm = dcp && !dcp->can_be_played (); + bool const needs_kdm = dcp && dcp->needs_kdm (); + bool const needs_assets = dcp && dcp->needs_assets (); string s = i->summary (); @@ -489,6 +511,10 @@ ContentPanel::setup () s = _("NEEDS KDM: ") + s; } + if (needs_assets) { + s = _("NEEDS OV: ") + s; + } + wxListItem item; item.SetId (t); item.SetText (std_to_wx (s)); @@ -499,7 +525,7 @@ ContentPanel::setup () _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } - if (!valid || needs_kdm) { + if (!valid || needs_kdm || needs_assets) { _content->SetItemTextColour (t, *wxRED); } }