projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use DirDialog and fix initial path (#2348).
[dcpomatic.git]
/
src
/
wx
/
content_menu.cc
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index 006660e110df9901c39e8eec8cf7d50a6211bfde..73591eaed0bc0e43b2e0fd1f68272aad80c4ca96 100644
(file)
--- a/
src/wx/content_menu.cc
+++ b/
src/wx/content_menu.cc
@@
-23,6
+23,7
@@
#include "content_advanced_dialog.h"
#include "content_menu.h"
#include "content_properties_dialog.h"
#include "content_advanced_dialog.h"
#include "content_menu.h"
#include "content_properties_dialog.h"
+#include "dir_dialog.h"
#include "film_viewer.h"
#include "repeat_dialog.h"
#include "timeline_video_content_view.h"
#include "film_viewer.h"
#include "repeat_dialog.h"
#include "timeline_video_content_view.h"
@@
-39,6
+40,7
@@
#include "lib/exceptions.h"
#include "lib/ffmpeg_content.h"
#include "lib/film.h"
#include "lib/exceptions.h"
#include "lib/ffmpeg_content.h"
#include "lib/film.h"
+#include "lib/film_util.h"
#include "lib/find_missing.h"
#include "lib/guess_crop.h"
#include "lib/image_content.h"
#include "lib/find_missing.h"
#include "lib/guess_crop.h"
#include "lib/image_content.h"
@@
-452,10
+454,12
@@
ContentMenu::ov ()
auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
DCPOMATIC_ASSERT (dcp);
auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
DCPOMATIC_ASSERT (dcp);
- wxDirDialog dialog(_parent, _("Select OV"));
+ auto film = _film.lock();
+ DCPOMATIC_ASSERT(film);
+ DirDialog dialog(_parent, _("Select OV"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(film));
- if (dialog.
ShowModal() == wxID_OK
) {
- dcp->add_ov(
wx_to_std(dialog.GetPath()
));
+ if (dialog.
show()
) {
+ dcp->add_ov(
dialog.path(
));
auto film = _film.lock();
DCPOMATIC_ASSERT (film);
JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
auto film = _film.lock();
DCPOMATIC_ASSERT (film);
JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));