Replace aligned bool with enum Alignment.

[dcpomatic.git] / src / wx / kdm_cpl_panel.cc

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index 241b3880ce9e179aceac6adc35a87cb6a79dd238..f45fc529164f7ef760ebc39979335a13d067982f 100644 (file)
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,7 +27,6 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
-#include <boost/foreach.hpp>
 
 using std::vector;
 
@@ -35,15 +34,15 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
        : wxPanel (parent, wxID_ANY)
        , _cpls (cpls)
 {
-       wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
+       auto vertical = new wxBoxSizer (wxVERTICAL);
 
        /* CPL choice */
-       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (s, this, _("CPL"), true);
+       auto s = new wxBoxSizer (wxHORIZONTAL);
+       add_label_to_sizer (s, this, _("CPL"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
        _cpl = new wxChoice (this, wxID_ANY);
        s->Add (_cpl, 1, wxEXPAND);
        _cpl_browse = new Button (this, _("Browse..."));
-       s->Add (_cpl_browse, 0, wxALIGN_CENTER_VERTICAL);
+       s->Add (_cpl_browse, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
        vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
 
        /* CPL details */
@@ -72,7 +71,7 @@ KDMCPLPanel::update_cpl_choice ()
 {
        _cpl->Clear ();
 
-       BOOST_FOREACH (CPLSummary const & i, _cpls) {
+       for (auto const& i: _cpls) {
                _cpl->Append (std_to_wx(i.cpl_id));
 
                if (_cpls.size() > 0) {
@@ -93,7 +92,7 @@ KDMCPLPanel::update_cpl_summary ()
 
        _dcp_directory->SetLabel (std_to_wx (_cpls[n].dcp_directory));
        _cpl_id->SetLabel (std_to_wx (_cpls[n].cpl_id));
-       _cpl_annotation_text->SetLabel (std_to_wx (_cpls[n].cpl_annotation_text));
+       _cpl_annotation_text->SetLabel (std_to_wx(_cpls[n].cpl_annotation_text.get_value_or("")));
 }
 
 void
@@ -116,10 +115,10 @@ KDMCPLPanel::cpl_browse_clicked ()
                cpl_document.read_file (cpl_file);
 
                bool encrypted = false;
-               BOOST_FOREACH (cxml::ConstNodePtr i, cpl_document.node_children("ReelList")) {
-                       BOOST_FOREACH (cxml::ConstNodePtr j, i->node_children("Reel")) {
-                               BOOST_FOREACH (cxml::ConstNodePtr k, j->node_children("AssetList")) {
-                                       BOOST_FOREACH (cxml::ConstNodePtr l, k->node_children()) {
+               for (auto i: cpl_document.node_children("ReelList")) {
+                       for (auto j: i->node_children("Reel")) {
+                               for (auto k: j->node_children("AssetList")) {
+                                       for (auto l: k->node_children()) {
                                                if (!l->node_children("KeyId").empty()) {
                                                        encrypted = true;
                                                }