X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=83085db5aa57f05920ad1496aac7d75dab71e6f9;hb=1cd2c956234dac14c0cd22883bf0575b3c7faf8f;hp=d1859b894e1c34a8f391ed7dc0c19b9daedf2ade;hpb=da908d815787cd0272c8bdeef40e1a4d2f6a29f8;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index d1859b894..83085db5a 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -34,7 +34,10 @@ #include "lib/compose.hpp" #include "lib/config.h" #include "lib/content_factory.h" +#include "lib/cross.h" #include "lib/dcp_content.h" +#include "lib/dcp_subtitle_content.h" +#include "lib/dcp_subtitle_decoder.h" #include "lib/dcpomatic_log.h" #include "lib/ffmpeg_content.h" #include "lib/image_content.h" @@ -44,20 +47,20 @@ #include "lib/string_text_file_content.h" #include "lib/text_content.h" #include "lib/video_content.h" -#include -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include +#include +#include +#include +LIBDCP_ENABLE_WARNINGS #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::vector; @@ -77,14 +80,10 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptr(TextType::COUNT); ++i) { - _text_panel[i] = 0; - } - _splitter = new LimitedSplitter (n); _top_panel = new wxPanel (_splitter); - _menu = new ContentMenu (_splitter); + _menu = new ContentMenu (_splitter, _film_viewer); { auto s = new wxBoxSizer (wxHORIZONTAL); @@ -104,11 +103,11 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrSetToolTip (_("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); + b->Add (_add_folder, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _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); + b->Add (_add_dcp, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _remove = new Button (_top_panel, _("Remove")); _remove->SetToolTip (_("Remove the selected piece of content from the film.")); @@ -134,6 +133,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)); @@ -298,20 +298,27 @@ ContentPanel::check_selection () } optional go_to; - 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())); + for (auto content: selected()) { + if (content->paths_valid()) { + auto position = content->position(); + if (auto text_content = dynamic_pointer_cast(content)) { + /* Rather special case; if we select a text subtitle file jump to its + first subtitle. + */ + StringTextFile ts(text_content); + if (auto first = ts.first()) { + position += DCPTime(first.get(), _film->active_frame_rate_change(content->position())); + } + } else if (auto dcp_content = dynamic_pointer_cast(content)) { + /* Do the same for DCP subtitles */ + DCPSubtitleDecoder ts(_film, dcp_content); + if (auto first = ts.first()) { + position += DCPTime(first.get(), _film->active_frame_rate_change(content->position())); + } + } + if (!go_to || position < go_to.get()) { + go_to = position; } - } - if (!go_to || p < go_to.get()) { - go_to = p; } } @@ -339,7 +346,7 @@ ContentPanel::check_selection () bool have_video = false; bool have_audio = false; - bool have_text[static_cast(TextType::COUNT)] = { false, false }; + EnumIndexedVector have_text; for (auto i: selected()) { if (i->video) { have_video = true; @@ -357,6 +364,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; @@ -369,6 +377,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; @@ -382,9 +391,10 @@ ContentPanel::check_selection () 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; + _text_panel[i] = nullptr; } if (have_text[i]) { ++off; @@ -420,13 +430,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. */ 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 @@ -441,12 +453,16 @@ 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 (); } @@ -463,7 +479,7 @@ ContentPanel::add_folder_clicked () return; } - list > content; + vector> content; try { content = content_factory (path); @@ -516,7 +532,7 @@ ContentPanel::add_dcp_clicked () _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." + "Choose the DCP folder inside the DCP-o-matic project folder if that's what you want to import." ) ); } catch (exception& e) { @@ -530,7 +546,7 @@ bool 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. + is visible and that the content list is focused. */ if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) { return true; @@ -593,9 +609,9 @@ ContentPanel::setup_sensitivity () if (_audio_panel) { _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); } - 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()); + for (auto text: _text_panel) { + if (text) { + text->Enable(_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty()); } } _timing_panel->Enable (_generally_sensitive); @@ -657,11 +673,7 @@ ContentPanel::set_selection (weak_ptr wc) { 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); - } else { - _content->SetItemState (i, 0, wxLIST_STATE_SELECTED); - } + set_selected_state(i, content[i] == wc.lock()); } } @@ -673,11 +685,7 @@ ContentPanel::set_selection (ContentList cl) 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); - } else { - _content->SetItemState (i, 0, wxLIST_STATE_SELECTED); - } + set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end()); } _no_check_selection = false; @@ -763,7 +771,7 @@ ContentPanel::setup () _content->InsertItem (item); if (i.get() == selected_content) { - _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + set_selected_state(t, true); } if (!valid || needs_kdm || needs_assets) { @@ -773,7 +781,7 @@ ContentPanel::setup () if (!selected_content && !content.empty ()) { /* Select the item of content if none was selected before */ - _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + set_selected_state(0, true); } setup_sensitivity (); @@ -788,9 +796,9 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) } auto paths = event.GetFiles (); - list path_list; + 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); @@ -798,14 +806,14 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) 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 */ @@ -831,9 +839,9 @@ ContentPanel::panels () const if (_audio_panel) { p.push_back (_audio_panel); } - for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - if (_text_panel[i]) { - p.push_back (_text_panel[i]); + for (auto text: _text_panel) { + if (text) { + p.push_back(text); } } p.push_back (_timing_panel); @@ -841,6 +849,14 @@ ContentPanel::panels () const } +void +ContentPanel::set_selected_state(int item, bool state) +{ + _content->SetItemState(item, state ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED); + _content->SetItemState(item, state ? wxLIST_STATE_FOCUSED : 0, wxLIST_STATE_FOCUSED); +} + + LimitedSplitter::LimitedSplitter (wxWindow* parent) : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE) , _first_shown (false)