X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=0cbb62b54d3744154c079cae22f313d8cba3cb42;hp=b2b9f04c6bff4d36fa735102917a1240b50e4ec4;hb=d2cf60a908766b73c13e0eed06f89892090415c3;hpb=84107d835469974b514d6cab702a770e11a9cd75 diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index b2b9f04c6..0cbb62b54 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -22,12 +22,15 @@ #include "audio_panel.h" #include "content_panel.h" #include "dcpomatic_button.h" +#include "dir_dialog.h" +#include "file_dialog.h" #include "film_viewer.h" #include "image_sequence_dialog.h" #include "text_panel.h" #include "timeline_dialog.h" #include "timing_panel.h" #include "video_panel.h" +#include "wx_ptr.h" #include "wx_util.h" #include "lib/audio_content.h" #include "lib/case_insensitive_sorter.h" @@ -193,6 +196,7 @@ public: struct Item { wxString text; + weak_ptr content; bool error; }; @@ -215,6 +219,14 @@ public: return _items[item].error ? const_cast(&_red) : nullptr; } + weak_ptr content_at_index(long index) + { + if (index < 0 || index >= static_cast(_items.size())) { + return {}; + } + return _items[index].content; + } + private: std::vector _items; wxListItemAttr _red; @@ -318,9 +330,9 @@ ContentPanel::selected () break; } - auto cl = _film->content(); - if (s < int (cl.size())) { - sel.push_back (cl[s]); + auto weak = _content->content_at_index(s); + if (auto content = weak.lock()) { + sel.push_back(content); } } @@ -569,6 +581,17 @@ ContentPanel::check_selection () } +optional +ContentPanel::add_files_override_path() const +{ + DCPOMATIC_ASSERT(_film->directory()); + return Config::instance()->default_add_file_location() == Config::DefaultAddFileLocation::SAME_AS_PROJECT + ? _film->directory()->parent_path() + : boost::optional(); + +} + + void ContentPanel::add_file_clicked () { @@ -579,57 +602,31 @@ 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 ( + FileDialog dialog( _splitter, _("Choose a file or files"), - 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 + wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"), + wxFD_MULTIPLE | wxFD_CHANGE_DIR, + "AddFilesPath", + add_files_override_path() ); - int const r = d->ShowModal (); - - if (r != wxID_OK) { - d->Destroy (); - return; - } - - wxArrayString paths; - d->GetPaths (paths); - vector path_list; - for (unsigned int i = 0; i < paths.GetCount(); ++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()); + if (dialog.show()) { + add_files(dialog.paths()); } - - d->Destroy (); } void ContentPanel::add_folder_clicked () { - auto const initial_path = Config::instance()->add_files_path(); - - auto d = new wxDirDialog(_splitter, _("Choose a folder"), std_to_wx(initial_path ? initial_path->string() : home_directory().string()), wxDD_DIR_MUST_EXIST); - ScopeGuard sg = [d]() { d->Destroy(); }; - int r = d->ShowModal (); - if (r != wxID_OK) { - return; + DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path()); + if (dialog.show()) { + add_folder(dialog.path()); } - - boost::filesystem::path const path(wx_to_std(d->GetPath())); - add_folder(path); } @@ -653,16 +650,12 @@ ContentPanel::add_folder(boost::filesystem::path folder) for (auto i: content) { auto ic = dynamic_pointer_cast (i); if (ic) { - auto e = new ImageSequenceDialog (_splitter); - int const r = e->ShowModal(); - auto const frame_rate = e->frame_rate (); - e->Destroy (); + ImageSequenceDialog dialog(_splitter); - if (r != wxID_OK) { + if (dialog.ShowModal() != wxID_OK) { return; } - - ic->set_video_frame_rate(_film, frame_rate); + ic->set_video_frame_rate(_film, dialog.frame_rate()); } _film->examine_and_add_content (i); @@ -673,16 +666,10 @@ ContentPanel::add_folder(boost::filesystem::path folder) void ContentPanel::add_dcp_clicked () { - 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 (); - - if (r != wxID_OK) { - return; + DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path()); + if (dialog.show()) { + add_dcp(dialog.path()); } - - add_dcp(path); } @@ -732,12 +719,7 @@ ContentPanel::timeline_clicked () return; } - if (_timeline_dialog) { - _timeline_dialog->Destroy (); - _timeline_dialog = nullptr; - } - - _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); + _timeline_dialog.reset(this, _film, _film_viewer); _timeline_dialog->set_selection (selected()); _timeline_dialog->Show (); } @@ -845,14 +827,16 @@ ContentPanel::set_selection (weak_ptr wc) void ContentPanel::set_selection (ContentList cl) { - _no_check_selection = true; + { + _no_check_selection = true; + ScopeGuard sg = [this]() { _no_check_selection = false; }; - auto content = _film->content (); - for (size_t i = 0; i < content.size(); ++i) { - set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end()); + auto content = _film->content (); + for (size_t i = 0; i < content.size(); ++i) { + set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end()); + } } - _no_check_selection = false; check_selection (); } @@ -893,21 +877,11 @@ ContentPanel::setup () } auto content = _film->content (); - - Content* selected_content = nullptr; - auto const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (s != -1) { - wxListItem item; - item.SetId (s); - item.SetMask (wxLIST_MASK_DATA); - _content->GetItem (item); - selected_content = reinterpret_cast (item.GetData ()); - } + auto selection = selected(); vector items; for (auto i: content) { - int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); auto dcp = dynamic_pointer_cast (i); @@ -928,18 +902,15 @@ ContentPanel::setup () s = _("NEEDS OV: ") + s; } - items.push_back({s, !valid || needs_kdm || needs_assets}); - - if (i.get() == selected_content) { - set_selected_state(t, true); - } + items.push_back({s, i, !valid || needs_kdm || needs_assets}); } _content->set(items); - if (!selected_content && !content.empty ()) { - /* Select the item of content if none was selected before */ + if (selection.empty() && !content.empty()) { set_selected_state(0, true); + } else { + set_selection(selection); } setup_sensitivity ();