X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_properties_dialog.cc;h=da4243cb4fc6438db1921ccf3550e5770d132e2a;hb=9a9ce1aec97db89b00bc216edf7cee5f3d48670e;hp=bd20d48e6e99c4326d2ff62e5c5c4d6e28b70aeb;hpb=31150ddd0fafac4426d11a758be9d77699b7377c;p=dcpomatic.git

diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index bd20d48e6..da4243cb4 100644
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,27 +18,29 @@
 
 */
 
+
 #include "content_properties_dialog.h"
 #include "wx_util.h"
-#include "lib/raw_convert.h"
+#include "static_text.h"
 #include "lib/content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
+
 
 using std::string;
 using std::list;
 using std::pair;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+
 
-ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content)
+ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<const Film> film, shared_ptr<Content> content)
 	: TableDialog (parent, _("Content Properties"), 2, 1, false)
 {
-	map<UserProperty::Category, list<UserProperty> > grouped;
-	BOOST_FOREACH (UserProperty i, content->user_properties()) {
+	map<UserProperty::Category, list<UserProperty>> grouped;
+	for (auto i: content->user_properties(film)) {
 		if (grouped.find(i.category) == grouped.end()) {
 			grouped[i.category] = list<UserProperty> ();
 		}
@@ -50,19 +52,18 @@ ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<C
 	maybe_add_group (grouped, UserProperty::AUDIO);
 	maybe_add_group (grouped, UserProperty::LENGTH);
 
-	layout ();
+	/* Nasty hack to stop the bottom property being cut off on Windows / OS X */
+	add (wxString(), false);
+	add (wxString(), false);
 
-	/* SetSizeHints() seems to get it slightly wrong (see #884),
-	   so hack in a bit more height.
-	*/
-	wxSize const s = GetMinSize ();
-	SetMinSize (wxSize (s.GetWidth(), s.GetHeight() + 32));
+	layout ();
 }
 
+
 void
-ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserProperty> > const & groups, UserProperty::Category category)
+ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserProperty>> const & groups, UserProperty::Category category)
 {
-	map<UserProperty::Category, list<UserProperty> >::const_iterator i = groups.find (category);
+	auto i = groups.find (category);
 	if (i == groups.end()) {
 		return;
 	}
@@ -83,7 +84,7 @@ ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserP
 		break;
 	}
 
-	wxStaticText* m = new wxStaticText (this, wxID_ANY, category_name);
+	auto m = new StaticText (this, category_name);
 	wxFont font (*wxNORMAL_FONT);
 	font.SetWeight (wxFONTWEIGHT_BOLD);
 	m->SetFont (font);
@@ -93,8 +94,8 @@ ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserP
 	add (m, false);
 	add_spacer ();
 
-	BOOST_FOREACH (UserProperty j, i->second) {
-		add (std_to_wx (j.key), true);
-		add (new wxStaticText (this, wxID_ANY, std_to_wx (j.value + " " + j.unit)));
+	for (auto j: i->second) {
+		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)));
 	}
 }