#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"
struct Item
{
wxString text;
+ weak_ptr<Content> content;
bool error;
};
return _items[item].error ? const_cast<wxListItemAttr*>(&_red) : nullptr;
}
+ weak_ptr<Content> content_at_index(long index)
+ {
+ if (index < 0 || index >= static_cast<long>(_items.size())) {
+ return {};
+ }
+ return _items[index].content;
+ }
+
private:
std::vector<Item> _items;
wxListItemAttr _red;
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);
}
}
}
+optional<boost::filesystem::path>
+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<boost::filesystem::path>();
+
+}
+
+
void
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<boost::filesystem::path> 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);
}
for (auto i: content) {
auto ic = dynamic_pointer_cast<ImageContent> (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);
void
ContentPanel::add_dcp_clicked ()
{
- auto const initial_path = Config::instance()->add_files_path();
-
- auto d = new wxDirDialog(_splitter, _("Choose a DCP 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 DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+ if (dialog.show()) {
+ add_dcp(dialog.path());
}
-
- boost::filesystem::path const path(wx_to_std(d->GetPath()));
- add_dcp(path);
}
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 ();
}
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 ();
}
}
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<Content*> (item.GetData ());
- }
+ auto selection = selected();
vector<ContentListCtrl::Item> items;
for (auto i: content) {
- int const t = _content->GetItemCount ();
bool const valid = i->paths_valid ();
auto dcp = dynamic_pointer_cast<DCPContent> (i);
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 ();
projects / dcpomatic.git / blobdiff