X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=5ec503720ca91ce0f8875bb7470ae611adbe9982;hb=f802565830bed9ec9e7ad6c16ccaa7b0700625d9;hp=ef770484c3928ba01d85c719bd9cd5c120629a54;hpb=563fc75855b9649cf135cf137cc1b0c43ebc8286;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index ef770484c..5ec503720 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,83 +18,67 @@ */ -#include "content_panel.h" -#include "wx_util.h" -#include "video_panel.h" + #include "audio_panel.h" +#include "content_panel.h" +#include "dcpomatic_button.h" +#include "film_viewer.h" +#include "image_sequence_dialog.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 "timing_panel.h" +#include "video_panel.h" +#include "wx_util.h" #include "lib/audio_content.h" -#include "lib/text_content.h" -#include "lib/video_content.h" -#include "lib/ffmpeg_content.h" -#include "lib/content_factory.h" -#include "lib/image_content.h" -#include "lib/dcp_content.h" #include "lib/case_insensitive_sorter.h" -#include "lib/playlist.h" +#include "lib/compose.hpp" #include "lib/config.h" +#include "lib/content_factory.h" +#include "lib/cross.h" +#include "lib/dcp_content.h" +#include "lib/dcpomatic_log.h" +#include "lib/ffmpeg_content.h" +#include "lib/image_content.h" #include "lib/log.h" -#include "lib/compose.hpp" -#include "lib/string_text_file_content.h" +#include "lib/playlist.h" #include "lib/string_text_file.h" -#include "lib/dcpomatic_log.h" +#include "lib/string_text_file_content.h" +#include "lib/text_content.h" +#include "lib/video_content.h" #include #include #include #include #include -#include #include + +using std::cout; +using std::dynamic_pointer_cast; +using std::exception; using std::list; +using std::make_shared; +using std::max; +using std::shared_ptr; 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::weak_ptr; using boost::optional; using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif -class LimitedSplitter : public wxSplitterWindow -{ -public: - LimitedSplitter (wxWindow* parent) - : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE) - { - /* 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); - } - - bool OnSashPositionChange (int new_position) - { - /* Try to stop the top bit of the splitter getting so small that buttons disappear */ - return new_position > 220; - } -}; 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) + : _parent (n) , _film (film) , _film_viewer (viewer) , _generally_sensitive (true) , _ignore_deselect (false) , _no_check_selection (false) { - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { _text_panel[i] = 0; } @@ -104,7 +88,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrDragAcceptFiles (true); @@ -113,7 +97,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrInsertColumn (0, wxT("")); _content->SetColumnWidth (0, 512); - wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); + auto b = new wxBoxSizer (wxVERTICAL); _add_file = new Button (_top_panel, _("Add file(s)...")); _add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film.")); @@ -151,6 +135,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrAddPage (_timing_panel, _("Timing"), false); + _timing_panel->create (); _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::item_selected, this)); _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, this)); @@ -169,17 +154,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptr= 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. - */ - _splitter->SplitHorizontally (_top_panel, _notebook, screen.height > 800 ? -600 : -150); - } else { - /* Fallback for when GetFromWindow fails for reasons that aren't clear */ - _splitter->SplitHorizontally (_top_panel, _notebook, -600); - } + _splitter->first_shown (_top_panel, _notebook); } @@ -194,7 +169,7 @@ ContentPanel::selected () break; } - ContentList cl = _film->content(); + auto cl = _film->content(); if (s < int (cl.size())) { sel.push_back (cl[s]); } @@ -203,12 +178,13 @@ ContentPanel::selected () return sel; } + ContentList ContentPanel::selected_video () { ContentList vc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->video) { vc.push_back (i); } @@ -217,12 +193,13 @@ ContentPanel::selected_video () return vc; } + ContentList ContentPanel::selected_audio () { ContentList ac; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->audio) { ac.push_back (i); } @@ -231,12 +208,13 @@ ContentPanel::selected_audio () return ac; } + ContentList ContentPanel::selected_text () { ContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (!i->text.empty()) { sc.push_back (i); } @@ -245,13 +223,14 @@ ContentPanel::selected_text () return sc; } + FFmpegContentList ContentPanel::selected_ffmpeg () { FFmpegContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); + for (auto i: selected()) { + auto t = dynamic_pointer_cast (i); if (t) { sc.push_back (t); } @@ -260,23 +239,25 @@ ContentPanel::selected_ffmpeg () return sc; } + void ContentPanel::film_changed (Film::Property p) { switch (p) { - case Film::CONTENT: - case Film::CONTENT_ORDER: + case Film::Property::CONTENT: + case Film::Property::CONTENT_ORDER: setup (); break; default: break; } - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->film_changed (p); } } + void ContentPanel::item_deselected () { @@ -287,6 +268,7 @@ ContentPanel::item_deselected () signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this)); } + void ContentPanel::item_deselected_idle () { @@ -295,6 +277,7 @@ ContentPanel::item_deselected_idle () } } + void ContentPanel::item_selected () { @@ -302,6 +285,7 @@ ContentPanel::item_selected () check_selection (); } + void ContentPanel::check_selection () { @@ -311,12 +295,12 @@ ContentPanel::check_selection () setup_sensitivity (); - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->content_selection_changed (); } optional go_to; - BOOST_FOREACH (shared_ptr i, selected()) { + for (auto i: selected()) { DCPTime p; p = i->position(); if (dynamic_pointer_cast(i) && i->paths_valid()) { @@ -334,7 +318,7 @@ ContentPanel::check_selection () } if (go_to && Config::instance()->jump_to_selected() && signal_manager) { - shared_ptr fv = _film_viewer.lock (); + auto 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)); } @@ -357,16 +341,16 @@ ContentPanel::check_selection () bool have_video = false; bool have_audio = false; - bool have_text[TEXT_COUNT] = { false, false }; - BOOST_FOREACH (shared_ptr i, selected()) { + bool have_text[static_cast(TextType::COUNT)] = { false, false }; + for (auto i: selected()) { if (i->video) { have_video = true; } if (i->audio) { have_audio = true; } - BOOST_FOREACH (shared_ptr j, i->text) { - have_text[j->original_type()] = true; + for (auto j: i->text) { + have_text[static_cast(j->original_type())] = true; } } @@ -375,6 +359,7 @@ ContentPanel::check_selection () if (have_video && !_video_panel) { _video_panel = new VideoPanel (this); _notebook->InsertPage (off, _video_panel, _video_panel->name()); + _video_panel->create (); } else if (!have_video && _video_panel) { _notebook->DeletePage (off); _video_panel = 0; @@ -387,6 +372,7 @@ ContentPanel::check_selection () if (have_audio && !_audio_panel) { _audio_panel = new AudioPanel (this); _notebook->InsertPage (off, _audio_panel, _audio_panel->name()); + _audio_panel->create (); } else if (!have_audio && _audio_panel) { _notebook->DeletePage (off); _audio_panel = 0; @@ -396,10 +382,11 @@ ContentPanel::check_selection () ++off; } - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::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()); + _text_panel[i]->create (); } else if (!have_text[i] && _text_panel[i]) { _notebook->DeletePage (off); _text_panel[i] = 0; @@ -411,7 +398,7 @@ ContentPanel::check_selection () /* Set up the tab selection */ - bool done = false; + auto done = false; for (size_t i = 0; i < _notebook->GetPageCount(); ++i) { if (_notebook->GetPage(i) == _last_selected_tab) { _notebook->SetSelection (i); @@ -427,6 +414,7 @@ ContentPanel::check_selection () SelectionChanged (); } + void ContentPanel::add_file_clicked () { @@ -437,13 +425,15 @@ ContentPanel::add_file_clicked () return; } + auto path = Config::instance()->add_files_path(); + /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using non-Latin filenames or paths. */ - wxFileDialog* d = new wxFileDialog ( + auto d = new wxFileDialog ( _splitter, _("Choose a file or files"), - wxT (""), + std_to_wx(path ? path->string() : home_directory().string()), wxT (""), wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"), wxFD_MULTIPLE | wxFD_CHANGE_DIR @@ -458,19 +448,24 @@ ContentPanel::add_file_clicked () wxArrayString paths; d->GetPaths (paths); - list path_list; + vector path_list; for (unsigned int i = 0; i < paths.GetCount(); ++i) { - path_list.push_back (wx_to_std (paths[i])); + path_list.push_back (wx_to_std(paths[i])); } add_files (path_list); + if (!path_list.empty()) { + Config::instance()->set_add_files_path(path_list[0].parent_path()); + } + d->Destroy (); } + void ContentPanel::add_folder_clicked () { - wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST); + auto 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 (); @@ -493,12 +488,12 @@ ContentPanel::add_folder_clicked () return; } - BOOST_FOREACH (shared_ptr i, content) { - shared_ptr ic = dynamic_pointer_cast (i); + for (auto i: content) { + auto ic = dynamic_pointer_cast (i); if (ic) { - ImageSequenceDialog* e = new ImageSequenceDialog (_splitter); + auto e = new ImageSequenceDialog (_splitter); r = e->ShowModal (); - float const frame_rate = e->frame_rate (); + auto const frame_rate = e->frame_rate (); e->Destroy (); if (r != wxID_OK) { @@ -512,10 +507,11 @@ ContentPanel::add_folder_clicked () } } + void ContentPanel::add_dcp_clicked () { - wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST); + auto 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 (); @@ -525,12 +521,21 @@ ContentPanel::add_dcp_clicked () } try { - _film->examine_and_add_content (shared_ptr (new DCPContent (path))); + _film->examine_and_add_content (make_shared(path)); + } catch (ProjectFolderError &) { + error_dialog ( + _parent, + _( + "This looks like a DCP-o-matic project folder, which cannot be added to a different project. " + "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to import." + ) + ); } catch (exception& e) { error_dialog (_parent, e.what()); } } + /** @return true if this remove "click" should be ignored */ bool ContentPanel::remove_clicked (bool hotkey) @@ -542,7 +547,7 @@ ContentPanel::remove_clicked (bool hotkey) return true; } - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected ()) { _film->remove_content (i); } @@ -550,6 +555,7 @@ ContentPanel::remove_clicked (bool hotkey) return false; } + void ContentPanel::timeline_clicked () { @@ -559,7 +565,7 @@ ContentPanel::timeline_clicked () if (_timeline_dialog) { _timeline_dialog->Destroy (); - _timeline_dialog = 0; + _timeline_dialog = nullptr; } _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); @@ -567,12 +573,14 @@ ContentPanel::timeline_clicked () _timeline_dialog->Show (); } + void ContentPanel::right_click (wxListEvent& ev) { _menu->popup (_film, selected (), TimelineContentViewList (), ev.GetPoint ()); } + /** Set up broad sensitivity based on the type of content that is selected */ void ContentPanel::setup_sensitivity () @@ -581,9 +589,9 @@ ContentPanel::setup_sensitivity () _add_folder->Enable (_generally_sensitive); _add_dcp->Enable (_generally_sensitive); - ContentList selection = selected (); - ContentList video_selection = selected_video (); - ContentList audio_selection = selected_audio (); + auto selection = selected (); + auto video_selection = selected_video (); + auto audio_selection = selected_audio (); _remove->Enable (_generally_sensitive && !selection.empty()); _earlier->Enable (_generally_sensitive && selection.size() == 1); @@ -596,7 +604,7 @@ ContentPanel::setup_sensitivity () if (_audio_panel) { _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); } - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { if (_text_panel[i]) { _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty()); } @@ -604,6 +612,7 @@ ContentPanel::setup_sensitivity () _timing_panel->Enable (_generally_sensitive); } + void ContentPanel::set_film (shared_ptr film) { @@ -613,8 +622,8 @@ ContentPanel::set_film (shared_ptr film) _film = film; - film_changed (Film::CONTENT); - film_changed (Film::AUDIO_CHANNELS); + film_changed (Film::Property::CONTENT); + film_changed (Film::Property::AUDIO_CHANNELS); if (_film) { check_selection (); @@ -623,6 +632,7 @@ ContentPanel::set_film (shared_ptr film) setup_sensitivity (); } + void ContentPanel::set_general_sensitivity (bool s) { @@ -630,30 +640,33 @@ ContentPanel::set_general_sensitivity (bool s) setup_sensitivity (); } + void ContentPanel::earlier_clicked () { - ContentList sel = selected (); + auto sel = selected (); if (sel.size() == 1) { _film->move_content_earlier (sel.front ()); check_selection (); } } + void ContentPanel::later_clicked () { - ContentList sel = selected (); + auto sel = selected (); if (sel.size() == 1) { _film->move_content_later (sel.front ()); check_selection (); } } + void ContentPanel::set_selection (weak_ptr wc) { - ContentList content = _film->content (); + auto content = _film->content (); for (size_t i = 0; i < content.size(); ++i) { if (content[i] == wc.lock ()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); @@ -663,12 +676,13 @@ ContentPanel::set_selection (weak_ptr wc) } } + void ContentPanel::set_selection (ContentList cl) { _no_check_selection = true; - ContentList content = _film->content (); + auto content = _film->content (); for (size_t i = 0; i < content.size(); ++i) { if (find(cl.begin(), cl.end(), content[i]) != cl.end()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); @@ -681,6 +695,14 @@ ContentPanel::set_selection (ContentList cl) check_selection (); } + +void +ContentPanel::select_all () +{ + set_selection (_film->content()); +} + + void ContentPanel::film_content_changed (int property) { @@ -694,11 +716,12 @@ ContentPanel::film_content_changed (int property) setup (); } - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->film_content_changed (property); } } + void ContentPanel::setup () { @@ -708,10 +731,10 @@ ContentPanel::setup () return; } - ContentList content = _film->content (); + auto content = _film->content (); - Content* selected_content = 0; - int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + Content* selected_content = nullptr; + auto const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (s != -1) { wxListItem item; item.SetId (s); @@ -722,15 +745,15 @@ 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); + auto dcp = dynamic_pointer_cast (i); bool const needs_kdm = dcp && dcp->needs_kdm (); bool const needs_assets = dcp && dcp->needs_assets (); - wxString s = std_to_wx (i->summary ()); + auto s = std_to_wx (i->summary ()); if (!valid) { s = _("MISSING: ") + s; @@ -767,6 +790,7 @@ ContentPanel::setup () setup_sensitivity (); } + void ContentPanel::files_dropped (wxDropFilesEvent& event) { @@ -774,30 +798,31 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) return; } - wxString* paths = event.GetFiles (); - list path_list; + auto paths = event.GetFiles (); + vector path_list; for (int i = 0; i < event.GetNumberOfFiles(); i++) { - path_list.push_back (wx_to_std (paths[i])); + path_list.push_back (wx_to_std(paths[i])); } add_files (path_list); } + void -ContentPanel::add_files (list paths) +ContentPanel::add_files (vector paths) { /* It has been reported that the paths returned from e.g. wxFileDialog are not always sorted; I can't reproduce that, but sort them anyway. Don't use ImageFilenameSorter as a normal alphabetical sort is expected here. */ - paths.sort (CaseInsensitiveSorter ()); + std::sort (paths.begin(), paths.end(), CaseInsensitiveSorter()); /* XXX: check for lots of files here and do something */ try { - BOOST_FOREACH (boost::filesystem::path i, paths) { - BOOST_FOREACH (shared_ptr j, content_factory(i)) { + for (auto i: paths) { + for (auto j: content_factory(i)) { _film->examine_and_add_content (j); } } @@ -806,6 +831,7 @@ ContentPanel::add_files (list paths) } } + list ContentPanel::panels () const { @@ -816,7 +842,7 @@ ContentPanel::panels () const if (_audio_panel) { p.push_back (_audio_panel); } - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { if (_text_panel[i]) { p.push_back (_text_panel[i]); } @@ -824,3 +850,49 @@ ContentPanel::panels () const 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 (); +}