X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=b002a765c18d82b8b675302c785598ac80ded1ed;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=6eb14c42593b00b302658ee054dce233ff486069;hpb=1d73cca7a3adfc4d64a2529e3f6e8c7b6d6cc38d;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 6eb14c425..b002a765c 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -48,8 +48,12 @@ using std::string;
 using std::list;
 using std::exception;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
 KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 	: wxPanel (parent, wxID_ANY)
@@ -60,7 +64,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
 	table->AddGrowableCol (1);
 
-	add_label_to_sizer (table, this, _("KDM type"), true);
+	add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 
 	wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
 	_type = new wxChoice (this, wxID_ANY);
@@ -74,7 +78,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 	type->Add (_type, 1, wxEXPAND);
 	_type->SetSelection (0);
 	wxButton* advanced = new Button (this, _("Advanced..."));
-	type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL);
+	type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	table->Add (type, 1, wxEXPAND);
 
 	add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
@@ -205,7 +209,7 @@ KDMOutputPanel::make (
 		}
 
 		bool cinemas_with_no_email = false;
-		BOOST_FOREACH (list<KDMWithMetadataPtr> i, cinema_kdms) {
+		for (auto i: cinema_kdms) {
 			if (i.front()->emails().empty()) {
 				cinemas_with_no_email = true;
 			}
@@ -220,8 +224,8 @@ KDMOutputPanel::make (
 
 		if (proceed && Config::instance()->confirm_kdm_email ()) {
 			list<string> emails;
-			BOOST_FOREACH (list<KDMWithMetadataPtr> const& i, cinema_kdms) {
-				BOOST_FOREACH (string j, i.front()->emails()) {
+			for (auto const& i: cinema_kdms) {
+				for (auto j: i.front()->emails()) {
 					emails.push_back (j);
 				}
 			}