From: Carl Hetherington <cth@carlh.net>
Date: Sat, 18 Dec 2021 11:05:40 +0000 (+0100)
Subject: Add more filenames to content properties (#2120).
X-Git-Tag: v2.16.11~37
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=9a9ce1aec97db89b00bc216edf7cee5f3d48670e

Add more filenames to content properties (#2120).
---

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 4167031c2..3c3942aa1 100644
--- 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 bc835edaf..da4243cb4 100644
--- 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)));
 	}
 }