projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update dialog layout fixes.
[dcpomatic.git]
/
src
/
wx
/
content_properties_dialog.cc
diff --git
a/src/wx/content_properties_dialog.cc
b/src/wx/content_properties_dialog.cc
index 2f4e1a48bcadf6f0bbf242e717b30a6313d9b6c2..bc835edafc305358d15d3eda63e9cb4c23e4115b 100644
(file)
--- 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.
This file is part of DCP-o-matic.
@@
-18,26
+18,29
@@
*/
*/
+
#include "content_properties_dialog.h"
#include "wx_util.h"
#include "content_properties_dialog.h"
#include "wx_util.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 "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 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)
{
: 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> ();
}
if (grouped.find(i.category) == grouped.end()) {
grouped[i.category] = list<UserProperty> ();
}
@@
-50,16
+53,17
@@
ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<C
maybe_add_group (grouped, UserProperty::LENGTH);
/* Nasty hack to stop the bottom property being cut off on Windows / OS X */
maybe_add_group (grouped, UserProperty::LENGTH);
/* Nasty hack to stop the bottom property being cut off on Windows / OS X */
- add (wxString
(), false);
- add (wxString
(), false);
+ add (wxString(), false);
+ add (wxString(), false);
layout ();
}
layout ();
}
+
void
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;
}
if (i == groups.end()) {
return;
}
@@
-80,7
+84,7
@@
ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserP
break;
}
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);
wxFont font (*wxNORMAL_FONT);
font.SetWeight (wxFONTWEIGHT_BOLD);
m->SetFont (font);
@@
-90,8
+94,8
@@
ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserP
add (m, false);
add_spacer ();
add (m, false);
add_spacer ();
-
BOOST_FOREACH (UserProperty j,
i->second) {
+
for (auto j:
i->second) {
add (std_to_wx (j.key), true);
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)));
}
}
}
}