Add DCPOMATIC_SUBHEADING_TOP_PAD.

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

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index d3bbf02c998e164ec4f317a00db7c80a04d9718c..79f78b2327a24751f2b86be43e76a2e6285582ae 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -18,48 +18,55 @@
 
 */
 
+
+#include "confirm_kdm_email_dialog.h"
+#include "dcpomatic_button.h"
+#include "kdm_cpl_panel.h"
 #include "kdm_dialog.h"
-#include "wx_util.h"
-#include "screens_panel.h"
-#include "kdm_timing_panel.h"
 #include "kdm_output_panel.h"
-#include "kdm_cpl_panel.h"
-#include "confirm_kdm_email_dialog.h"
+#include "kdm_timing_panel.h"
+#include "screens_panel.h"
 #include "static_text.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
+#include "lib/cinema.h"
+#include "lib/config.h"
 #include "lib/film.h"
-#include "lib/screen.h"
-#include "lib/kdm_with_metadata.h"
 #include "lib/job_manager.h"
-#include "lib/config.h"
-#include "lib/cinema.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/screen.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
-#include <wx/treectrl.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-#include <iostream>
+#include <wx/treectrl.h>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::string;
 using std::exception;
-using std::map;
 using std::list;
-using std::pair;
-using std::cout;
-using std::vector;
 using std::make_pair;
+using std::map;
+using std::pair;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::bind;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
 KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        : wxDialog (parent, wxID_ANY, _("Make KDMs"))
        , _film (film)
 {
        /* Main sizers */
-       wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL);
-       wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
-       wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
+       auto horizontal = new wxBoxSizer (wxHORIZONTAL);
+       auto left = new wxBoxSizer (wxVERTICAL);
+       auto right = new wxBoxSizer (wxVERTICAL);
 
        horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 4);
        horizontal->Add (right, 1, wxEXPAND);
@@ -69,9 +76,9 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
        /* Sub-heading: Screens */
-       wxStaticText* h = new StaticText (this, _("Screens"));
+       auto h = new StaticText (this, _("Screens"));
        h->SetFont (subheading_font);
-       left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+       left->Add (h, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
        _screens = new ScreensPanel (this);
        left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 
@@ -79,17 +86,17 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
        h = new StaticText (this, S_("KDM|Timing"));
        h->SetFont (subheading_font);
-       right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+       right->Add (h);
        _timing = new KDMTimingPanel (this);
        right->Add (_timing);
 
        /* Sub-heading: CPL */
        h = new StaticText (this, _("CPL"));
        h->SetFont (subheading_font);
-       right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+       right->Add (h);
 
        vector<CPLSummary> cpls;
-       BOOST_FOREACH (CPLSummary const & i, film->cpls()) {
+       for (auto const& i: film->cpls()) {
                if (i.encrypted) {
                        cpls.push_back (i);
                }
@@ -101,8 +108,8 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        /* Sub-heading: Output */
        h = new StaticText (this, _("Output"));
        h->SetFont (subheading_font);
-       right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
-       _output = new KDMOutputPanel (this, film->interop ());
+       right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD);
+       _output = new KDMOutputPanel (this);
        right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
 
        _make = new Button (this, _("Make KDMs"));
@@ -110,7 +117,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 
        /* Make an overall sizer to get a nice border */
 
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+       auto overall_sizer = new wxBoxSizer (wxVERTICAL);
        overall_sizer->Add (horizontal, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
 
        /* Bind */
@@ -126,6 +133,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        overall_sizer->SetSizeHints (this);
 }
 
+
 void
 KDMDialog::setup_sensitivity ()
 {
@@ -134,6 +142,7 @@ KDMDialog::setup_sensitivity ()
        _make->Enable (!_screens->screens().empty() && _timing->valid() && _cpl->has_selected());
 }
 
+
 bool
 KDMDialog::confirm_overwrite (boost::filesystem::path path)
 {
@@ -143,10 +152,11 @@ KDMDialog::confirm_overwrite (boost::filesystem::path path)
                );
 }
 
+
 void
 KDMDialog::make_clicked ()
 {
-       shared_ptr<const Film> film = _film.lock ();
+       auto film = _film.lock ();
        DCPOMATIC_ASSERT (film);
 
        list<KDMWithMetadataPtr> kdms;
@@ -161,8 +171,8 @@ KDMDialog::make_clicked ()
                        for_audio = _output->forensic_mark_audio_up_to();
                }
 
-               BOOST_FOREACH (shared_ptr<dcpomatic::Screen> i, _screens->screens()) {
-                       KDMWithMetadataPtr p = kdm_for_screen (film, _cpl->cpl(), i, _timing->from(), _timing->until(), _output->formulation(), !_output->forensic_mark_video(), for_audio);
+               for (auto i: _screens->screens()) {
+                       auto p = kdm_for_screen (film, _cpl->cpl(), i, _timing->from(), _timing->until(), _output->formulation(), !_output->forensic_mark_video(), for_audio);
                        if (p) {
                                kdms.push_back (p);
                        }
@@ -179,7 +189,7 @@ KDMDialog::make_clicked ()
                return;
        }
 
-       pair<shared_ptr<Job>, int> result = _output->make (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1));
+       auto result = _output->make (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1));
        if (result.first) {
                JobManager::instance()->add (result.first);
        }