From fd57412fab5f6eac395353c3dedefeaa58ba6f43 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 11 Feb 2014 15:52:44 +0000 Subject: Bump version --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index e51740c33..ad664c631 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-11 Carl Hetherington + + * Version 1.64.12 released. + 2014-02-11 Carl Hetherington * Be more careful when catching exceptions from KDM creation. -- cgit v1.2.3 From bb74749bfbc3708695ebafab258d8d299fa1a8b0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 12 Feb 2014 13:50:58 +0000 Subject: Add dcpomatic_batch to OS X .app. --- ChangeLog | 4 ++++ platform/osx/make_dmg.sh | 1 + 2 files changed, 5 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index ad664c631..69eec2c0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-12 Carl Hetherington + + * Add dcpomatic_batch to OS X .app. + 2014-02-11 Carl Hetherington * Version 1.64.12 released. diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 7a4d81a2b..7e9390e2c 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -41,6 +41,7 @@ function universal_copy { universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic $WORK/$macos universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_cli $WORK/$macos universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_server_cli $WORK/$macos +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_batch $WORK/$macos universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic.dylib $WORK/$libs universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic-wx.dylib $WORK/$libs universal_copy $ROOT lib/libcxml.dylib $WORK/$libs -- cgit v1.2.3 From 0f0c54de9fe67782037fd4e3d115b8e7732fe9ed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 12 Feb 2014 14:31:40 +0000 Subject: Remember last directory in dcpomatic_batch film picker. Requested-by: Brad Miller --- ChangeLog | 3 +++ src/tools/dcpomatic_batch.cc | 8 ++++++++ 2 files changed, 11 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 69eec2c0c..a66eb71d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-02-12 Carl Hetherington + * Make the batch converter remember its last directory + for the film picker (#318). + * Add dcpomatic_batch to OS X .app. 2014-02-11 Carl Hetherington diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 41cb23e73..58fbaec98 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -168,6 +168,10 @@ private: void add_film () { wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); + if (_last_parent) { + c->SetPath (std_to_wx (_last_parent.get().string ())); + } + int r; while (1) { r = c->ShowModal (); @@ -190,8 +194,12 @@ private: } } + _last_parent = boost::filesystem::path (wx_to_std (c->GetPath ())).parent_path (); + c->Destroy (); } + + boost::optional _last_parent; }; static const wxCmdLineEntryDesc command_line_description[] = { -- cgit v1.2.3