X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=5ec503720ca91ce0f8875bb7470ae611adbe9982;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=96d3cd2513cf0c3ca966714282764b9d9ee35877;hpb=69a7c253174091d12b0efb37f2a4ac5e61dfaa3a;p=dcpomatic.git

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 96d3cd251..5ec503720 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,33 @@
 
 */
 
-#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 <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/listctrl.h>
@@ -50,15 +52,17 @@
 #include <boost/filesystem.hpp>
 #include <iostream>
 
-using std::list;
-using std::string;
+
 using std::cout;
-using std::vector;
-using std::max;
+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;
 using std::weak_ptr;
-using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
@@ -67,11 +71,7 @@ using namespace boost::placeholders;
 
 
 ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> 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)
@@ -135,6 +135,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 
 	_timing_panel = new TimingPanel (this, _film_viewer);
 	_notebook->AddPage (_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));
@@ -177,6 +178,7 @@ ContentPanel::selected ()
 	return sel;
 }
 
+
 ContentList
 ContentPanel::selected_video ()
 {
@@ -191,6 +193,7 @@ ContentPanel::selected_video ()
 	return vc;
 }
 
+
 ContentList
 ContentPanel::selected_audio ()
 {
@@ -205,6 +208,7 @@ ContentPanel::selected_audio ()
 	return ac;
 }
 
+
 ContentList
 ContentPanel::selected_text ()
 {
@@ -219,6 +223,7 @@ ContentPanel::selected_text ()
 	return sc;
 }
 
+
 FFmpegContentList
 ContentPanel::selected_ffmpeg ()
 {
@@ -234,6 +239,7 @@ ContentPanel::selected_ffmpeg ()
 	return sc;
 }
 
+
 void
 ContentPanel::film_changed (Film::Property p)
 {
@@ -251,6 +257,7 @@ ContentPanel::film_changed (Film::Property p)
 	}
 }
 
+
 void
 ContentPanel::item_deselected ()
 {
@@ -261,6 +268,7 @@ ContentPanel::item_deselected ()
 	signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this));
 }
 
+
 void
 ContentPanel::item_deselected_idle ()
 {
@@ -269,6 +277,7 @@ ContentPanel::item_deselected_idle ()
 	}
 }
 
+
 void
 ContentPanel::item_selected ()
 {
@@ -276,6 +285,7 @@ ContentPanel::item_selected ()
 	check_selection ();
 }
 
+
 void
 ContentPanel::check_selection ()
 {
@@ -349,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;
@@ -361,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;
@@ -374,6 +386,7 @@ ContentPanel::check_selection ()
 		if (have_text[i] && !_text_panel[i]) {
 			_text_panel[i] = new TextPanel (this, static_cast<TextType>(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;
@@ -401,6 +414,7 @@ ContentPanel::check_selection ()
 	SelectionChanged ();
 }
 
+
 void
 ContentPanel::add_file_clicked ()
 {
@@ -411,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.
 	*/
 	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
@@ -432,15 +448,20 @@ ContentPanel::add_file_clicked ()
 
 	wxArrayString paths;
 	d->GetPaths (paths);
-	list<boost::filesystem::path> path_list;
+	vector<boost::filesystem::path> 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 ()
 {
@@ -486,6 +507,7 @@ ContentPanel::add_folder_clicked ()
 	}
 }
 
+
 void
 ContentPanel::add_dcp_clicked ()
 {
@@ -499,12 +521,21 @@ ContentPanel::add_dcp_clicked ()
 	}
 
 	try {
-		_film->examine_and_add_content (shared_ptr<Content> (new DCPContent (path)));
+		_film->examine_and_add_content (make_shared<DCPContent>(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)
@@ -524,6 +555,7 @@ ContentPanel::remove_clicked (bool hotkey)
 	return false;
 }
 
+
 void
 ContentPanel::timeline_clicked ()
 {
@@ -541,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 ()
@@ -578,6 +612,7 @@ ContentPanel::setup_sensitivity ()
 	_timing_panel->Enable (_generally_sensitive);
 }
 
+
 void
 ContentPanel::set_film (shared_ptr<Film> film)
 {
@@ -597,6 +632,7 @@ ContentPanel::set_film (shared_ptr<Film> film)
 	setup_sensitivity ();
 }
 
+
 void
 ContentPanel::set_general_sensitivity (bool s)
 {
@@ -604,6 +640,7 @@ ContentPanel::set_general_sensitivity (bool s)
 	setup_sensitivity ();
 }
 
+
 void
 ContentPanel::earlier_clicked ()
 {
@@ -614,6 +651,7 @@ ContentPanel::earlier_clicked ()
 	}
 }
 
+
 void
 ContentPanel::later_clicked ()
 {
@@ -624,6 +662,7 @@ ContentPanel::later_clicked ()
 	}
 }
 
+
 void
 ContentPanel::set_selection (weak_ptr<Content> wc)
 {
@@ -637,6 +676,7 @@ ContentPanel::set_selection (weak_ptr<Content> wc)
 	}
 }
 
+
 void
 ContentPanel::set_selection (ContentList cl)
 {
@@ -681,6 +721,7 @@ ContentPanel::film_content_changed (int property)
 	}
 }
 
+
 void
 ContentPanel::setup ()
 {
@@ -749,6 +790,7 @@ ContentPanel::setup ()
 	setup_sensitivity ();
 }
 
+
 void
 ContentPanel::files_dropped (wxDropFilesEvent& event)
 {
@@ -757,23 +799,24 @@ ContentPanel::files_dropped (wxDropFilesEvent& event)
 	}
 
 	auto paths = event.GetFiles ();
-	list<boost::filesystem::path> path_list;
+	vector<boost::filesystem::path> 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<boost::filesystem::path> paths)
+ContentPanel::add_files (vector<boost::filesystem::path> 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 */
 
@@ -788,6 +831,7 @@ ContentPanel::add_files (list<boost::filesystem::path> paths)
 	}
 }
 
+
 list<ContentSubPanel*>
 ContentPanel::panels () const
 {