Hand-apply 1b68e4de5260a08e7f06a1b802cfc7eb41cd4be8 from master.

diff --git a/ChangeLog b/ChangeLog
index a528dd82798038073ce7c48337d6cb3d1a581cac..5d0338bc2d4070abc45bf7397fbbc767d92f822e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-12  Carl Hetherington  <cth@carlh.net>
 
+       * Hand-apply 83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb from master;
+       ellipsize filters strings if it is long.
+
        * Hand-apply 24ae3a8f0a68529b50c34079e643caf6b9327523 from master;
        use the number of mapped audio channels for the DCP name, not the
        number of DCP channels (#479).

diff --git a/TO_PORT b/TO_PORT
index e58362d868a72ca5648825469fb3c28437c78260..fd587ce41a7b1314a0b0c2e0e98a075fd79b1866 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,3 +1,2 @@
-83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb
 c0e0b90d987af2586323d4a67bd67330256da51d
 69866d9ba972d21375081c313ac245535ac55be9

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index cdd2eb5def377470577b77b9032cba5e0d825853..67c369de2ddf9db63ebdb919a9d8decc8c26461e 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -262,10 +262,13 @@ VideoPanel::film_content_changed (int property)
                }
        } else if (property == FFmpegContentProperty::FILTERS) {
                if (fcs) {
-                       string const p = Filter::ffmpeg_string (fcs->filters ());
+                       string p = Filter::ffmpeg_string (fcs->filters ());
                        if (p.empty ()) {
                                _filters->SetLabel (_("None"));
                        } else {
+                               if (p.length() > 25) {
+                                       p = p.substr (0, 25) + "...";
+                               }
                                _filters->SetLabel (std_to_wx (p));
                        }
                }