X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=d1a00c02122ba354fdfdd4ea03146df1fc53b302;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=d1315ac34a08265f543b49feff1c42ac970a4eb4;hpb=696ff1c534d59483bed3db06705b554f615a7b85;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index d1315ac34..d1a00c021 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; @@ -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 - is visible. + /* 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) { - 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,7 +396,7 @@ 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); } @@ -461,37 +479,14 @@ ContentPanel::setup () { ContentList content = _film->content (); - /* First, check to see if anything has changed and bail if not; this avoids - flickering on OS X. - */ - - vector existing; - for (int i = 0; i < _content->GetItemCount(); ++i) { - existing.push_back (wx_to_std (_content->GetItemText (i))); - } - - vector proposed; - BOOST_FOREACH (shared_ptr i, content) { - bool const valid = i->paths_valid (); - - string s = i->summary (); - if (!valid) { - s = _("MISSING: ") + s; - } - - proposed.push_back (s); - } - - if (existing == proposed) { - return; - } - - /* Something has changed: set up the control */ - - string selected_summary; + Content* selected_content = 0; int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (s != -1) { - selected_summary = wx_to_std (_content->GetItemText (s)); + wxListItem item; + item.SetId (s); + item.SetMask (wxLIST_MASK_DATA); + _content->GetItem (item); + selected_content = reinterpret_cast (item.GetData ()); } _content->DeleteAllItems (); @@ -512,9 +507,13 @@ ContentPanel::setup () s = _("NEEDS KDM: ") + s; } - _content->InsertItem (t, std_to_wx (s)); + wxListItem item; + item.SetId (t); + item.SetText (std_to_wx (s)); + item.SetData (i.get ()); + _content->InsertItem (item); - if (i->summary() == selected_summary) { + if (i.get() == selected_content) { _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -523,7 +522,7 @@ ContentPanel::setup () } } - if (selected_summary.empty () && !content.empty ()) { + if (!selected_content && !content.empty ()) { /* Select the item of content if none was selected before */ _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); }