X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_properties_dialog.cc;h=7dcc6f8f1060ce4c5636bf7195facb0f2d6db903;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hp=8bb0a6b1f2fd6489e71204a6528164e10f02e88c;hpb=2da8a38e3cc9bebfe324a682d8e4da2e8856676a;p=dcpomatic.git

diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index 8bb0a6b1f..7dcc6f8f1 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-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,7 +20,7 @@
 
 #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"
@@ -34,40 +34,54 @@ using std::map;
 using boost::shared_ptr;
 using boost::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<string, list<UserProperty> > grouped;
-	BOOST_FOREACH (UserProperty i, content->user_properties()) {
+	map<UserProperty::Category, list<UserProperty> > grouped;
+	BOOST_FOREACH (UserProperty i, content->user_properties(film)) {
 		if (grouped.find(i.category) == grouped.end()) {
 			grouped[i.category] = list<UserProperty> ();
 		}
 		grouped[i.category].push_back (i);
 	}
 
-	maybe_add_group (grouped, wx_to_std (_("General")));
-	maybe_add_group (grouped, wx_to_std (_("Video")));
-	maybe_add_group (grouped, wx_to_std (_("Audio")));
-	maybe_add_group (grouped, wx_to_std (_("Length")));
+	maybe_add_group (grouped, UserProperty::GENERAL);
+	maybe_add_group (grouped, UserProperty::VIDEO);
+	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<string, list<UserProperty> > const & groups, string name)
+ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserProperty> > const & groups, UserProperty::Category category)
 {
-	map<string, list<UserProperty> >::const_iterator i = groups.find (name);
+	map<UserProperty::Category, list<UserProperty> >::const_iterator i = groups.find (category);
 	if (i == groups.end()) {
 		return;
 	}
 
-	wxStaticText* m = new wxStaticText (this, wxID_ANY, std_to_wx (i->first));
+	wxString category_name;
+	switch (i->first) {
+	case UserProperty::GENERAL:
+		category_name = _("General");
+		break;
+	case UserProperty::VIDEO:
+		category_name = _("Video");
+		break;
+	case UserProperty::AUDIO:
+		category_name = _("Audio");
+		break;
+	case UserProperty::LENGTH:
+		category_name = _("Length");
+		break;
+	}
+
+	wxStaticText* m = new StaticText (this, category_name);
 	wxFont font (*wxNORMAL_FONT);
 	font.SetWeight (wxFONTWEIGHT_BOLD);
 	m->SetFont (font);
@@ -79,6 +93,6 @@ ContentPropertiesDialog::maybe_add_group (map<string, list<UserProperty> > const
 
 	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)));
+		add (new StaticText (this, std_to_wx (j.value + " " + j.unit)));
 	}
 }