X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=71f32068a7e87836f47f905ccd75f2b183d8f158;hb=4e4968464eeef1956cb82392e1fc3b27a792ab89;hp=5bc006e12318a5fcc7af505633baa8907271aefa;hpb=940812b93bade4ac8fd41ee4fb29f3f799815b83;p=dcpomatic.git

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 5bc006e12..71f32068a 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -22,6 +22,7 @@
 #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"
@@ -29,6 +30,7 @@
 #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"
@@ -44,7 +46,6 @@
 #include "lib/image_content.h"
 #include "lib/log.h"
 #include "lib/playlist.h"
-#include "lib/scope_guard.h"
 #include "lib/string_text_file.h"
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
@@ -570,6 +571,17 @@ ContentPanel::check_selection ()
 }
 
 
+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 ()
 {
@@ -583,16 +595,15 @@ ContentPanel::add_file_clicked ()
 	/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
 	   non-Latin filenames or paths.
 	*/
-	auto dialog = new FileDialog(
+	auto dialog = make_wx<FileDialog>(
 		_splitter,
 		_("Choose a file or files"),
 		wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
 		wxFD_MULTIPLE | wxFD_CHANGE_DIR,
-		"AddFilesPath"
+		"AddFilesPath",
+		add_files_override_path()
 		);
 
-	ScopeGuard sg = [dialog]() { dialog->Destroy(); };
-
 	if (dialog->show()) {
 		add_files(dialog->paths());
 	}
@@ -602,17 +613,10 @@ ContentPanel::add_file_clicked ()
 void
 ContentPanel::add_folder_clicked ()
 {
-	auto const initial_path = Config::instance()->initial_path("AddFilesPath");
-
-	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;
+	auto d = make_wx<DirDialog>(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+	if (d->show()) {
+		add_folder(d->path());
 	}
-
-	boost::filesystem::path const path(wx_to_std(d->GetPath()));
-	add_folder(path);
 }
 
 
@@ -636,8 +640,7 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 	for (auto i: content) {
 		auto ic = dynamic_pointer_cast<ImageContent> (i);
 		if (ic) {
-			auto e = new ImageSequenceDialog (_splitter);
-			ScopeGuard sg = [e]() { e->Destroy(); };
+			auto e = make_wx<ImageSequenceDialog>(_splitter);
 
 			if (e->ShowModal() != wxID_OK) {
 				return;
@@ -653,17 +656,10 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 void
 ContentPanel::add_dcp_clicked ()
 {
-	auto const initial_path = Config::instance()->initial_path("AddFilesPath");
-
-	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;
+	auto d = make_wx<DirDialog>(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+	if (d->show()) {
+		add_dcp(d->path());
 	}
-
-	boost::filesystem::path const path(wx_to_std(d->GetPath()));
-	add_dcp(path);
 }