X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=d76a2735902d97923466f8ce1bac34b7ad391b1e;hp=82c5210d2e20fdaf2c4e2a06e5d7163698d6b356;hb=910ea473219f2e7c672ad437d458316deca67025;hpb=8bdc1edabc107c3ba0ec6c5f0b8f93ac00e4c631 diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 82c5210d2..d76a27359 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Carl Hetherington + Copyright (C) 2015-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -26,7 +26,10 @@ #include "kdm_timing_panel.h" #include "confirm_kdm_email_dialog.h" #include "wx_util.h" +#include "kdm_advanced_dialog.h" #include "name_format_editor.h" +#include "check_box.h" +#include "dcpomatic_button.h" #include #include #ifdef DCPOMATIC_USE_OWN_PICKER @@ -46,51 +49,40 @@ using boost::function; KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) : 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); add_label_to_sizer (table, this, _("KDM type"), true); + + wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL); _type = new wxChoice (this, wxID_ANY); _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); + _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::MULTIPLE_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)); } - table->Add (_type, 1, wxEXPAND); + type->Add (_type, 1, wxEXPAND); _type->SetSelection (0); + wxButton* advanced = new Button (this, _("Advanced...")); + type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL); + table->Add (type, 1, wxEXPAND); - { - int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT; - wxString t = _("Folder / ZIP name format"); -#ifdef __WXOSX__ - flags |= wxALIGN_RIGHT; - t += wxT (":"); -#endif - wxStaticText* m = new wxStaticText (this, wxID_ANY, t); - table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); - } - + add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | 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); - { - int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT; - wxString t = _("Filename format"); -#ifdef __WXOSX__ - flags |= wxALIGN_RIGHT; - t += wxT (":"); -#endif - wxStaticText* m = new wxStaticText (this, wxID_ANY, t); - table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); - } - + add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT); dcp::NameFormat::Map titles; - titles['f'] = "film name"; - titles['c'] = "cinema"; - titles['s'] = "screen"; - titles['b'] = "from date/time"; - titles['e'] = "to date/time"; + titles['f'] = wx_to_std (_("film name")); + titles['c'] = wx_to_std (_("cinema")); + titles['s'] = wx_to_std (_("screen")); + titles['b'] = wx_to_std (_("from date/time")); + titles['e'] = wx_to_std (_("to date/time")); dcp::NameFormat::Map ex; ex['f'] = "Bambi"; ex['c'] = "Lumière"; @@ -100,7 +92,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); table->Add (_filename_format->panel(), 1, wxEXPAND); - _write_to = new wxCheckBox (this, wxID_ANY, _("Write to")); + _write_to = new CheckBox (this, _("Write to")); table->Add (_write_to, 1, wxEXPAND); #ifdef DCPOMATIC_USE_OWN_PICKER @@ -128,14 +120,30 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) table->AddSpacer (0); table->Add (write_options); - _email = new wxCheckBox (this, wxID_ANY, _("Send by email")); + _email = new CheckBox (this, _("Send by email")); table->Add (_email, 1, wxEXPAND); table->AddSpacer (0); + switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) { + case Config::KDM_WRITE_FLAT: + _write_flat->SetValue (true); + break; + case Config::KDM_WRITE_FOLDER: + _write_folder->SetValue (true); + break; + case Config::KDM_WRITE_ZIP: + _write_zip->SetValue (true); + break; + } + _write_to->SetValue (true); - _write_to->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); - _email->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _write_to->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _email->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _write_flat->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); + _write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); + _write_zip->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); + advanced->Bind (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); SetSizer (table); } @@ -150,9 +158,32 @@ KDMOutputPanel::setup_sensitivity () _write_zip->Enable (write); } +void +KDMOutputPanel::advanced_clicked () +{ + KDMAdvancedDialog* 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 (); + _forensic_mark_audio_up_to = d->forensic_mark_audio_up_to (); + d->Destroy (); +} + +void +KDMOutputPanel::kdm_write_type_changed () +{ + if (_write_flat->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FLAT); + } else if (_write_folder->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FOLDER); + } else if (_write_zip->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_ZIP); + } +} + pair, int> KDMOutputPanel::make ( - list screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite, shared_ptr log + list > screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite ) { list const cinema_kdms = CinemaKDMs::collect (screen_kdms); @@ -211,8 +242,8 @@ KDMOutputPanel::make ( try { dcp::NameFormat::Map name_values; name_values['f'] = name; - name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(); - name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(); + name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(false, false); + name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(false, false); if (_write_to->GetValue()) { if (_write_flat->GetValue()) { @@ -251,8 +282,7 @@ KDMOutputPanel::make ( _container_name_format->get(), _filename_format->get(), name_values, - name, - log + name ) ); } @@ -260,7 +290,7 @@ KDMOutputPanel::make ( } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { - error_dialog (this, e.what ()); + error_dialog (this, std_to_wx(e.what())); } catch (...) { error_dialog (this, _("An unknown exception occurred.")); }