Happy new year.

[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 88ead96e2c713ecb87965cf00632612fdc749c19..a36c82024dfdf01740a14ae5ac7f7a73e8e2bd38 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -38,6 +38,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        add_label_to_sizer (table, this, _("KDM type"), true);
        _type = new wxChoice (this, wxID_ANY);
        _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1));
+       _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::MODIFIED_TRANSITIONAL_TEST));
        if (!interop) {
                _type->Append ("DCI Any", ((void *) dcp::DCI_ANY));
                _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC));
@@ -80,7 +81,12 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif
 
-       _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
+       boost::optional<boost::filesystem::path> path = Config::instance()->default_kdm_directory ();
+       if (path) {
+               _folder->SetPath (std_to_wx (path->string ()));
+       } else {
+               _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
+       }
 
        table->Add (_folder, 1, wxEXPAND);
 
@@ -90,8 +96,8 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
        _write_to->SetValue (true);
 
-       _write_to->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMOutputPanel::setup_sensitivity, this));
-       _email->Bind    (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMOutputPanel::setup_sensitivity, this));
+       _write_to->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this));
+       _email->Bind    (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this));
 
        SetSizer (table);
 }