X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=83539403d7ed704b5f63403664ecfef4c3cd8da2;hp=1d748be5ff2d820becaaf50189f0470199fcd1a1;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=fdb1cacf58115881bd4d3e8cca8ba389f26400df diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 1d748be5f..83539403d 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -22,13 +22,14 @@ #include "wx_util.h" #include "video_panel.h" #include "audio_panel.h" -#include "subtitle_panel.h" +#include "text_panel.h" #include "timing_panel.h" #include "timeline_dialog.h" #include "image_sequence_dialog.h" #include "film_viewer.h" +#include "dcpomatic_button.h" #include "lib/audio_content.h" -#include "lib/subtitle_content.h" +#include "lib/text_content.h" #include "lib/video_content.h" #include "lib/ffmpeg_content.h" #include "lib/content_factory.h" @@ -37,40 +38,59 @@ #include "lib/case_insensitive_sorter.h" #include "lib/playlist.h" #include "lib/config.h" +#include "lib/log.h" +#include "lib/compose.hpp" +#include "lib/string_text_file_content.h" +#include "lib/string_text_file.h" +#include "lib/dcpomatic_log.h" #include #include #include +#include #include -#include #include using std::list; using std::string; using std::cout; using std::vector; +using std::max; using std::exception; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif -ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmViewer* viewer) - : _timeline_dialog (0) + +ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptr viewer) + : _video_panel (0) + , _audio_panel (0) + , _timeline_dialog (0) , _parent (n) + , _last_selected_tab (0) , _film (film) , _film_viewer (viewer) , _generally_sensitive (true) + , _ignore_deselect (false) + , _no_check_selection (false) { - _panel = new wxPanel (n); - _sizer = new wxBoxSizer (wxVERTICAL); - _panel->SetSizer (_sizer); + for (int i = 0; i < TEXT_COUNT; ++i) { + _text_panel[i] = 0; + } - _menu = new ContentMenu (_panel); + _splitter = new LimitedSplitter (n); + _top_panel = new wxPanel (_splitter); + + _menu = new ContentMenu (_splitter); { wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _content = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); + _content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); _content->DragAcceptFiles (true); s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); @@ -79,53 +99,45 @@ 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 = new Button (_top_panel, _("Add file(s)...")); _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 = new Button (_top_panel, _("Add folder...")); _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 = new Button (_top_panel, _("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 = new Button (_top_panel, _("Remove")); _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, _("Earlier")); + _earlier = new Button (_top_panel, _("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, _("Later")); + _later = new Button (_top_panel, _("Later")); _later->SetToolTip (_("Move the selected piece of content later in the film.")); b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _timeline = new wxButton (_panel, wxID_ANY, _("Timeline...")); + _timeline = new Button (_top_panel, _("Timeline...")); _timeline->SetToolTip (_("Open the timeline for the film.")); b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); s->Add (b, 0, wxALL, 4); - - _sizer->Add (s, 0, wxEXPAND | wxALL, 6); + _top_panel->SetSizer (s); } - _notebook = new wxNotebook (_panel, wxID_ANY); - _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6); + _notebook = new wxNotebook (_splitter, wxID_ANY); - _video_panel = new VideoPanel (this); - _panels.push_back (_video_panel); - _audio_panel = new AudioPanel (this); - _panels.push_back (_audio_panel); - _subtitle_panel = new SubtitlePanel (this); - _panels.push_back (_subtitle_panel); _timing_panel = new TimingPanel (this, _film_viewer); - _panels.push_back (_timing_panel); + _notebook->AddPage (_timing_panel, _("Timing"), false); - _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_SELECTED, boost::bind (&ContentPanel::item_selected, this)); + _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, 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_BUTTON, boost::bind (&ContentPanel::add_file_clicked, this)); @@ -137,6 +149,14 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _timeline->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this)); } + +void +ContentPanel::first_shown () +{ + _splitter->first_shown (_top_panel, _notebook); +} + + ContentList ContentPanel::selected () { @@ -148,8 +168,9 @@ ContentPanel::selected () break; } - if (s < int (_film->content().size ())) { - sel.push_back (_film->content()[s]); + ContentList cl = _film->content(); + if (s < int (cl.size())) { + sel.push_back (cl[s]); } } @@ -161,7 +182,7 @@ ContentPanel::selected_video () { ContentList vc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->video) { vc.push_back (i); } @@ -175,7 +196,7 @@ ContentPanel::selected_audio () { ContentList ac; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->audio) { ac.push_back (i); } @@ -185,12 +206,12 @@ ContentPanel::selected_audio () } ContentList -ContentPanel::selected_subtitle () +ContentPanel::selected_text () { ContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { - if (i->subtitle) { + for (auto i: selected()) { + if (!i->text.empty()) { sc.push_back (i); } } @@ -203,7 +224,7 @@ ContentPanel::selected_ffmpeg () { FFmpegContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { shared_ptr t = dynamic_pointer_cast (i); if (t) { sc.push_back (t); @@ -225,43 +246,159 @@ ContentPanel::film_changed (Film::Property p) break; } - BOOST_FOREACH (ContentSubPanel* i, _panels) { + for (auto i: panels()) { i->film_changed (p); } } void -ContentPanel::selection_changed () +ContentPanel::item_deselected () { - if (_last_selected == selected()) { - /* This was triggered by a re-build of the view but the selection - did not really change. - */ - return; + /* Maybe this is just a re-click on the same item; if not, _ignore_deselect will stay + false and item_deselected_foo will handle the deselection. + */ + _ignore_deselect = false; + signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this)); +} + +void +ContentPanel::item_deselected_idle () +{ + if (!_ignore_deselect) { + check_selection (); } +} + +void +ContentPanel::item_selected () +{ + _ignore_deselect = true; + check_selection (); +} - _last_selected = selected (); +void +ContentPanel::check_selection () +{ + if (_no_check_selection) { + return; + } setup_sensitivity (); - BOOST_FOREACH (ContentSubPanel* i, _panels) { + for (auto i: panels()) { i->content_selection_changed (); } optional go_to; - BOOST_FOREACH (shared_ptr i, selected ()) { - if (!go_to || i->position() < go_to.get()) { - go_to = i->position (); + for (auto i: selected()) { + DCPTime p; + p = i->position(); + if (dynamic_pointer_cast(i) && i->paths_valid()) { + /* Rather special case; if we select a text subtitle file jump to its + first subtitle. + */ + StringTextFile ts (dynamic_pointer_cast(i)); + if (ts.first()) { + p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position())); + } + } + if (!go_to || p < go_to.get()) { + go_to = p; } } - if (go_to && Config::instance()->jump_to_selected ()) { - _film_viewer->set_position (go_to.get ()); + if (go_to && Config::instance()->jump_to_selected() && signal_manager) { + shared_ptr fv = _film_viewer.lock (); + DCPOMATIC_ASSERT (fv); + signal_manager->when_idle(boost::bind(&FilmViewer::seek, fv.get(), go_to.get().ceil(_film->video_frame_rate()), true)); } if (_timeline_dialog) { - _timeline_dialog->set_selection (selected ()); + _timeline_dialog->set_selection (selected()); + } + + /* Make required tabs visible */ + + if (_notebook->GetPageCount() > 1) { + /* There's more than one tab in the notebook so the current selection could be meaningful + to the user; store it so that we can try to restore it later. + */ + _last_selected_tab = 0; + if (_notebook->GetSelection() != wxNOT_FOUND) { + _last_selected_tab = _notebook->GetPage(_notebook->GetSelection()); + } } + + bool have_video = false; + bool have_audio = false; + bool have_text[TEXT_COUNT] = { false, false }; + for (auto i: selected()) { + if (i->video) { + have_video = true; + } + if (i->audio) { + have_audio = true; + } + for (auto j: i->text) { + have_text[j->original_type()] = true; + } + } + + int off = 0; + + if (have_video && !_video_panel) { + _video_panel = new VideoPanel (this); + _notebook->InsertPage (off, _video_panel, _video_panel->name()); + } else if (!have_video && _video_panel) { + _notebook->DeletePage (off); + _video_panel = 0; + } + + if (have_video) { + ++off; + } + + if (have_audio && !_audio_panel) { + _audio_panel = new AudioPanel (this); + _notebook->InsertPage (off, _audio_panel, _audio_panel->name()); + } else if (!have_audio && _audio_panel) { + _notebook->DeletePage (off); + _audio_panel = 0; + } + + if (have_audio) { + ++off; + } + + for (int i = 0; i < TEXT_COUNT; ++i) { + if (have_text[i] && !_text_panel[i]) { + _text_panel[i] = new TextPanel (this, static_cast(i)); + _notebook->InsertPage (off, _text_panel[i], _text_panel[i]->name()); + } else if (!have_text[i] && _text_panel[i]) { + _notebook->DeletePage (off); + _text_panel[i] = 0; + } + if (have_text[i]) { + ++off; + } + } + + /* Set up the tab selection */ + + bool done = false; + for (size_t i = 0; i < _notebook->GetPageCount(); ++i) { + if (_notebook->GetPage(i) == _last_selected_tab) { + _notebook->SetSelection (i); + done = true; + } + } + + if (!done && _notebook->GetPageCount() > 0) { + _notebook->SetSelection (0); + } + + setup_sensitivity (); + SelectionChanged (); } void @@ -270,7 +407,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() != _splitter || !_film) { return; } @@ -278,7 +415,7 @@ ContentPanel::add_file_clicked () non-Latin filenames or paths. */ wxFileDialog* d = new wxFileDialog ( - _panel, + _splitter, _("Choose a file or files"), wxT (""), wxT (""), @@ -307,7 +444,7 @@ ContentPanel::add_file_clicked () void ContentPanel::add_folder_clicked () { - wxDirDialog* d = new wxDirDialog (_panel, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); + wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST); int r = d->ShowModal (); boost::filesystem::path const path (wx_to_std (d->GetPath ())); d->Destroy (); @@ -319,7 +456,7 @@ ContentPanel::add_folder_clicked () list > content; try { - content = content_factory (_film, path); + content = content_factory (path); } catch (exception& e) { error_dialog (_parent, e.what()); return; @@ -330,10 +467,10 @@ ContentPanel::add_folder_clicked () return; } - BOOST_FOREACH (shared_ptr i, content) { + for (auto i: content) { shared_ptr ic = dynamic_pointer_cast (i); if (ic) { - ImageSequenceDialog* e = new ImageSequenceDialog (_panel); + ImageSequenceDialog* e = new ImageSequenceDialog (_splitter); r = e->ShowModal (); float const frame_rate = e->frame_rate (); e->Destroy (); @@ -352,7 +489,7 @@ ContentPanel::add_folder_clicked () void ContentPanel::add_dcp_clicked () { - wxDirDialog* d = new wxDirDialog (_panel, _("Choose a DCP folder"), wxT (""), wxDD_DIR_MUST_EXIST); + wxDirDialog* d = new wxDirDialog (_splitter, _("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 (); @@ -362,7 +499,7 @@ ContentPanel::add_dcp_clicked () } try { - _film->examine_and_add_content (shared_ptr (new DCPContent (_film, path))); + _film->examine_and_add_content (shared_ptr (new DCPContent (path))); } catch (exception& e) { error_dialog (_parent, e.what()); } @@ -375,27 +512,32 @@ ContentPanel::remove_clicked (bool hotkey) /* If the method was called because Delete was pressed check that our notebook page is visible and that the content list is focussed. */ - if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) { + if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) { return true; } - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected ()) { _film->remove_content (i); } - selection_changed (); + check_selection (); return false; } void ContentPanel::timeline_clicked () { + if (!_film) { + return; + } + if (_timeline_dialog) { _timeline_dialog->Destroy (); _timeline_dialog = 0; } - _timeline_dialog = new TimelineDialog (this, _film); + _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); + _timeline_dialog->set_selection (selected()); _timeline_dialog->Show (); } @@ -417,27 +559,41 @@ ContentPanel::setup_sensitivity () 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 (_generally_sensitive); + if (_video_panel) { + _video_panel->Enable (_generally_sensitive && video_selection.size() > 0); + } + if (_audio_panel) { + _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); + } + for (int i = 0; i < TEXT_COUNT; ++i) { + if (_text_panel[i]) { + _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty()); + } + } + _timing_panel->Enable (_generally_sensitive); } void ContentPanel::set_film (shared_ptr film) { - _audio_panel->set_film (film); + if (_audio_panel) { + _audio_panel->set_film (film); + } _film = film; film_changed (Film::CONTENT); film_changed (Film::AUDIO_CHANNELS); - selection_changed (); + + if (_film) { + check_selection (); + } + setup_sensitivity (); } @@ -445,20 +601,7 @@ void ContentPanel::set_general_sensitivity (bool s) { _generally_sensitive = s; - - _content->Enable (s); - _add_file->Enable (s); - _add_folder->Enable (s); - _add_dcp->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 @@ -467,7 +610,7 @@ ContentPanel::earlier_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_earlier (sel.front ()); - selection_changed (); + check_selection (); } } @@ -477,7 +620,7 @@ ContentPanel::later_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_later (sel.front ()); - selection_changed (); + check_selection (); } } @@ -497,6 +640,8 @@ ContentPanel::set_selection (weak_ptr wc) void ContentPanel::set_selection (ContentList cl) { + _no_check_selection = true; + ContentList content = _film->content (); for (size_t i = 0; i < content.size(); ++i) { if (find(cl.begin(), cl.end(), content[i]) != cl.end()) { @@ -505,6 +650,9 @@ ContentPanel::set_selection (ContentList cl) _content->SetItemState (i, 0, wxLIST_STATE_SELECTED); } } + + _no_check_selection = false; + check_selection (); } void @@ -520,7 +668,7 @@ ContentPanel::film_content_changed (int property) setup (); } - BOOST_FOREACH (ContentSubPanel* i, _panels) { + for (auto i: panels()) { i->film_content_changed (property); } } @@ -528,6 +676,12 @@ ContentPanel::film_content_changed (int property) void ContentPanel::setup () { + if (!_film) { + _content->DeleteAllItems (); + setup_sensitivity (); + return; + } + ContentList content = _film->content (); Content* selected_content = 0; @@ -542,9 +696,10 @@ ContentPanel::setup () _content->DeleteAllItems (); - BOOST_FOREACH (shared_ptr i, content) { + for (auto i: content) { int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); + shared_ptr dcp = dynamic_pointer_cast (i); bool const needs_kdm = dcp && dcp->needs_kdm (); bool const needs_assets = dcp && dcp->needs_assets (); @@ -582,6 +737,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 @@ -612,9 +769,78 @@ ContentPanel::add_files (list paths) /* XXX: check for lots of files here and do something */ - BOOST_FOREACH (boost::filesystem::path i, paths) { - BOOST_FOREACH (shared_ptr j, content_factory (_film, i)) { - _film->examine_and_add_content (j); + try { + for (auto i: paths) { + for (auto j: content_factory(i)) { + _film->examine_and_add_content (j); + } + } + } catch (exception& e) { + error_dialog (_parent, e.what()); + } +} + +list +ContentPanel::panels () const +{ + list p; + if (_video_panel) { + p.push_back (_video_panel); + } + if (_audio_panel) { + p.push_back (_audio_panel); + } + for (int i = 0; i < TEXT_COUNT; ++i) { + if (_text_panel[i]) { + p.push_back (_text_panel[i]); } } + p.push_back (_timing_panel); + return p; +} + + +LimitedSplitter::LimitedSplitter (wxWindow* parent) + : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE) + , _first_shown (false) + , _top_panel_minimum_size (350) +{ + /* This value doesn't really mean much but we just want to stop double-click on the + divider from shrinking the bottom panel (#1601). + */ + SetMinimumPaneSize (64); + + Bind (wxEVT_SIZE, boost::bind(&LimitedSplitter::sized, this, _1)); +} + + +void +LimitedSplitter::first_shown (wxWindow* top, wxWindow* bottom) +{ + int const sn = wxDisplay::GetFromWindow(this); + if (sn >= 0) { + wxRect const screen = wxDisplay(sn).GetClientArea(); + /* This is a hack to try and make the content notebook a sensible size; large on big displays but small + enough on small displays to leave space for the content area. + */ + SplitHorizontally (top, bottom, screen.height > 800 ? -600 : -_top_panel_minimum_size); + } else { + /* Fallback for when GetFromWindow fails for reasons that aren't clear */ + SplitHorizontally (top, bottom, -600); + } + _first_shown = true; +} + + +void +LimitedSplitter::sized (wxSizeEvent& ev) +{ + if (_first_shown && GetSize().GetHeight() > _top_panel_minimum_size && GetSashPosition() < _top_panel_minimum_size) { + /* The window is now fairly big but the top panel is small; this happens when the DCP-o-matic window + * is shrunk and then made larger again. Try to set a sensible top panel size in this case (#1839). + */ + SetSashPosition (_top_panel_minimum_size); + } + + ev.Skip (); }