Missing Destroy() call.

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

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 8c7f4007ba3576fec18b79dc341c40c8842f1fa9..369d8a25f082f0ba2ef576328ee8bcea61a7d985 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "kdm_output_panel.h"
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
@@ -43,49 +44,57 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
 DCPOMATIC_ENABLE_WARNINGS
 
-using std::pair;
-using std::string;
-using std::list;
+
 using std::exception;
+using std::function;
+using std::list;
 using std::make_pair;
+using std::make_shared;
+using std::pair;
 using std::shared_ptr;
-using boost::function;
+using std::string;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 
 
-KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
+KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
        : wxPanel (parent, wxID_ANY)
        , _forensic_mark_video (true)
        , _forensic_mark_audio (true)
        , _forensic_mark_audio_up_to (12)
 {
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
+       auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
        table->AddGrowableCol (1);
 
        add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 
-       wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
+       auto type = new wxBoxSizer (wxHORIZONTAL);
        _type = new wxChoice (this, wxID_ANY);
        _type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1));
+       _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
+       _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC));
        _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1));
        _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST));
-       if (!interop) {
-               _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
-               _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC));
-       }
-       type->Add (_type, 1, wxEXPAND);
+       type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
        _type->SetSelection (0);
-       wxButton* advanced = new Button (this, _("Advanced..."));
+       auto advanced = new Button (this, _("Advanced..."));
        type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-       table->Add (type, 1, wxEXPAND);
+       table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
 
-       add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
+       add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
        _container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), "");
        table->Add (_container_name_format->panel(), 1, wxEXPAND);
 
-       add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
+       auto format = create_label (this, _("Filename format"), true);
+       auto align = new wxBoxSizer (wxHORIZONTAL);
+#ifdef DCPOMATIC_OSX
+       align->Add (format, 0, wxTOP, 2);
+       table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2);
+#else
+       align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP - 2);
+       table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
+#endif
        dcp::NameFormat::Map titles;
        titles['f'] = wx_to_std (_("film name"));
        titles['c'] = wx_to_std (_("cinema"));
@@ -110,7 +119,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif
 
-       boost::optional<boost::filesystem::path> path = Config::instance()->default_kdm_directory ();
+       auto path = Config::instance()->default_kdm_directory();
        if (path) {
                _folder->SetPath (std_to_wx (path->string ()));
        } else {
@@ -119,7 +128,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
        table->Add (_folder, 1, wxEXPAND);
 
-       wxSizer* write_options = new wxBoxSizer(wxVERTICAL);
+       auto write_options = new wxBoxSizer(wxVERTICAL);
        _write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
        write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
        _write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs"));
@@ -170,7 +179,7 @@ KDMOutputPanel::setup_sensitivity ()
 void
 KDMOutputPanel::advanced_clicked ()
 {
-       KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to);
+       auto d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to);
        d->ShowModal ();
        _forensic_mark_video = d->forensic_mark_video ();
        _forensic_mark_audio = d->forensic_mark_audio ();
@@ -195,7 +204,7 @@ KDMOutputPanel::make (
        list<KDMWithMetadataPtr> kdms, string name, function<bool (boost::filesystem::path)> confirm_overwrite
        )
 {
-       list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (kdms);
+       auto const cinema_kdms = collect (kdms);
 
        /* Decide whether to proceed */
 
@@ -231,10 +240,11 @@ KDMOutputPanel::make (
                        }
 
                        if (!emails.empty ()) {
-                               ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails);
+                               auto d = new ConfirmKDMEmailDialog (this, emails);
                                if (d->ShowModal() == wxID_CANCEL) {
                                        proceed = false;
                                }
+                               d->Destroy ();
                        }
                }
        }
@@ -278,13 +288,11 @@ KDMOutputPanel::make (
                }
 
                if (_email->GetValue ()) {
-                       job.reset (
-                               new SendKDMEmailJob (
-                                       cinema_kdms,
-                                       _container_name_format->get(),
-                                       _filename_format->get(),
-                                       name
-                                       )
+                       job = make_shared<SendKDMEmailJob>(
+                               cinema_kdms,
+                               _container_name_format->get(),
+                               _filename_format->get(),
+                               name
                                );
                }