From e862ba83fbcc18510c40bbf9cddf9c471003a433 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 Oct 2014 21:44:07 +0100 Subject: Fix Playlist::move_later. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index ed089ba54..ea49d8a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-10-23 Carl Hetherington + + * Fix mix-placement of content when using the "Down" + button to move it. + 2014-10-22 Carl Hetherington * Version 1.76.3 released. -- cgit v1.2.3 From b2814c05c8d61c4c2c7e453223484473ea10513b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 Oct 2014 21:58:26 +0100 Subject: ChangeLog update. --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index ea49d8a56..025f11c16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-10-23 Carl Hetherington + * Move the "keep video in sequence" button into + the timeline dialogue. + * Fix mix-placement of content when using the "Down" button to move it. -- cgit v1.2.3 From 539ed8f0f6d1ee3d8c939f64ffd05f7c87df29ce Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 Oct 2014 22:00:12 +0100 Subject: Rename 'Add folder' button to 'Add image sequence' and add some tooltips. --- ChangeLog | 3 +++ src/wx/film_editor.cc | 24 ++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 025f11c16..b9afc684f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-10-23 Carl Hetherington + * Rename 'Add folder' to 'Add image sequence' + and add some tooltips. + * Move the "keep video in sequence" button into the timeline dialogue. diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 275a7ab81..4b3898859 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -276,18 +276,30 @@ FilmEditor::make_content_panel () _content->SetColumnWidth (0, 512); wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); + _content_add_file = new wxButton (_content_panel, wxID_ANY, _("Add file(s)...")); - b->Add (_content_add_file, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add folder...")); + _content_add_file->SetToolTip (_("Add video, image or sound files to the film.")); + b->Add (_content_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + + _content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add image\nsequence...")); + _content_add_folder->SetToolTip (_("Add a directory of image files which will be used as a moving image sequence.")); b->Add (_content_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove")); - b->Add (_content_remove, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_remove->SetToolTip (_("Remove the selected piece of content from the film.")); + b->Add (_content_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up")); - b->Add (_content_earlier, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_earlier->SetToolTip (_("Move the selected piece of content earlier in the film.")); + b->Add (_content_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_later = new wxButton (_content_panel, wxID_ANY, _("Down")); - b->Add (_content_later, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_later->SetToolTip (_("Move the selected piece of content later in the film.")); + b->Add (_content_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline...")); - b->Add (_content_timeline, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_timeline->SetToolTip (_("Open the timeline for the film.")); + b->Add (_content_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); s->Add (b, 0, wxALL, 4); -- cgit v1.2.3 From 9848887b821cba1522ae252f6ca2d54db2ff9ce3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 Oct 2014 22:02:47 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index b9afc684f..123bd84de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-23 Carl Hetherington + + * Version 1.76.4 released. + 2014-10-23 Carl Hetherington * Rename 'Add folder' to 'Add image sequence' diff --git a/debian/changelog b/debian/changelog index 750be88ce..34a4544e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.76.3-1) UNRELEASED; urgency=low +dcpomatic (1.76.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -194,8 +194,9 @@ dcpomatic (1.76.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 22 Oct 2014 09:32:14 +0100 + -- Carl Hetherington Thu, 23 Oct 2014 22:02:47 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 80948816e..9d0f94777 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '1.76.3devel' +VERSION = '1.76.4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c6a3da7276ed576ae02c6f463e6a3b337e7965dd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 Oct 2014 22:03:21 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 123bd84de..9143d442f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-23 Carl Hetherington + + * Version 1.76.5 released. + 2014-10-23 Carl Hetherington * Version 1.76.4 released. diff --git a/debian/changelog b/debian/changelog index 34a4544e5..955d02971 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.76.4-1) UNRELEASED; urgency=low +dcpomatic (1.76.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -195,8 +195,9 @@ dcpomatic (1.76.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 23 Oct 2014 22:02:47 +0100 + -- Carl Hetherington Thu, 23 Oct 2014 22:03:21 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 78459b28f..6639724da 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '1.76.4devel' +VERSION = '1.76.5' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4b5ea5ce86163d943793f76c099205a733faa65e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 24 Oct 2014 01:19:26 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 9143d442f..026d30275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-24 Carl Hetherington + + * Version 1.76.6 released. + 2014-10-23 Carl Hetherington * Version 1.76.5 released. diff --git a/debian/changelog b/debian/changelog index 955d02971..6f3d19700 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.76.5-1) UNRELEASED; urgency=low +dcpomatic (1.76.6-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -196,8 +196,9 @@ dcpomatic (1.76.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 23 Oct 2014 22:03:21 +0100 + -- Carl Hetherington Fri, 24 Oct 2014 01:19:26 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 5306688d3..506ea7a00 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '1.76.5devel' +VERSION = '1.76.6' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3