diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-12-18 12:05:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-05-02 00:13:13 +0200 |
| commit | 9a9ce1aec97db89b00bc216edf7cee5f3d48670e (patch) | |
| tree | 1a89fe50d36026885eb1bc2e7bd4a7a504651e4f | |
| parent | 0afe79d5c913f4c85a8de4ae448a8e54b8249dff (diff) | |
Add more filenames to content properties (#2120).
| -rw-r--r-- | src/lib/content.cc | 19 | ||||
| -rw-r--r-- | src/wx/content_properties_dialog.cc | 2 |
2 files changed, 19 insertions, 2 deletions
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))); } } |