Add more filenames to content properties (#2120).

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 4167031c2aeb54eeecaf9b16ea489bbe7c36c1ad..3c3942aa13c351bd18e9e595c503410d69b26e87 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -463,7 +463,24 @@ Content::active_video_frame_rate (shared_ptr<const Film> film) const
 void
 Content::add_properties (shared_ptr<const Film>, list<UserProperty>& p) const
 {
-       p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ()));
+       auto paths_to_show = std::min(number_of_paths(), size_t{8});
+       string paths = "";
+       for (auto i = size_t{0}; i < paths_to_show; ++i) {
+               paths += path(i).string();
+               if (i < (paths_to_show - 1)) {
+                       paths += "\n";
+               }
+       }
+       if (paths_to_show < number_of_paths()) {
+               paths += String::compose("... and %1 more", number_of_paths() - paths_to_show);
+       }
+       p.push_back (
+               UserProperty(
+                       UserProperty::GENERAL,
+                       paths_to_show > 1 ? _("Filenames") : _("Filename"),
+                       paths
+                       )
+               );
 
        if (_video_frame_rate) {
                if (video) {

diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index bc835edafc305358d15d3eda63e9cb4c23e4115b..da4243cb4fc6438db1921ccf3550e5770d132e2a 100644 (file)
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -95,7 +95,7 @@ ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserP
        add_spacer ();
 
        for (auto j: i->second) {
-               add (std_to_wx (j.key), true);
+               add_label_to_sizer (_table, this, std_to_wx(j.key), true, 0, wxALIGN_TOP);
                add (new StaticText (this, std_to_wx (j.value + " " + j.unit)));
        }
 }