X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=36de84906e4556c96e5f75e1f6f6e70501413f5d;hb=ddc1535c80dc494c13434478cfc1e1037548b053;hp=5b296b3002f971268fdcfaf25de5bce818f2d205;hpb=142f688c0ebb6938ef2d7f2b7e7c859d12af7e23;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 5b296b300..36de84906 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -31,6 +31,8 @@ #include "wx/file_dialog_wrapper.h" #include "wx/new_dkdm_folder_dialog.h" #include "wx/editable_list.h" +#include "wx/static_text.h" +#include "wx/dcpomatic_button.h" #include "lib/config.h" #include "lib/util.h" #include "lib/screen.h" @@ -79,7 +81,7 @@ enum { class DOMFrame : public wxFrame { public: - DOMFrame (wxString const & title) + explicit DOMFrame (wxString const & title) : wxFrame (0, -1, title) , _config_dialog (0) , _job_view (0) @@ -129,20 +131,20 @@ public: wxFont subheading_font (*wxNORMAL_FONT); subheading_font.SetWeight (wxFONTWEIGHT_BOLD); - wxStaticText* h = new wxStaticText (overall_panel, wxID_ANY, _("Screens")); + wxStaticText* h = new StaticText (overall_panel, _("Screens")); h->SetFont (subheading_font); left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (overall_panel); left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix - h = new wxStaticText (overall_panel, wxID_ANY, S_("KDM|Timing")); + h = new StaticText (overall_panel, S_("KDM|Timing")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (overall_panel); right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); - h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM")); + h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); wxBoxSizer* dkdm_sizer = new wxBoxSizer (wxHORIZONTAL); @@ -151,25 +153,25 @@ public: ); dkdm_sizer->Add (_dkdm, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL); - _add_dkdm = new wxButton (overall_panel, wxID_ANY, _("Add...")); + _add_dkdm = new Button (overall_panel, _("Add...")); dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); - _add_dkdm_folder = new wxButton (overall_panel, wxID_ANY, _("Add folder...")); + _add_dkdm_folder = new Button (overall_panel, _("Add folder...")); dkdm_buttons->Add (_add_dkdm_folder, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); - _remove_dkdm = new wxButton (overall_panel, wxID_ANY, _("Remove")); + _remove_dkdm = new Button (overall_panel, _("Remove")); dkdm_buttons->Add (_remove_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); right->Add (dkdm_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); add_dkdm_view (Config::instance()->dkdms()); - h = new wxStaticText (overall_panel, wxID_ANY, _("Output")); + h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); /* XXX: hard-coded non-interop here */ _output = new KDMOutputPanel (overall_panel, false); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); - _create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs")); + _create = new Button (overall_panel, _("Create KDMs")); right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); @@ -332,14 +334,15 @@ private: ScreenKDM ( i, kdm.encrypt ( - signer, i->recipient.get(), i->trusted_devices, _output->formulation(), true, 0 + signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), + !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional() : 0 ) ) ); } pair, int> result = _output->make ( - screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr () + screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1) ); if (result.first) { @@ -548,69 +551,75 @@ public: private: bool OnInit () - try { - wxInitAllImageHandlers (); + wxSplashScreen* splash = 0; - Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); - Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + try { + wxInitAllImageHandlers (); - wxSplashScreen* splash = maybe_show_splash (); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - SetAppName (_("DCP-o-matic KDM Creator")); + splash = maybe_show_splash (); - if (!wxApp::OnInit()) { - return false; - } + SetAppName (_("DCP-o-matic KDM Creator")); + + if (!wxApp::OnInit()) { + return false; + } #ifdef DCPOMATIC_LINUX - unsetenv ("UBUNTU_MENUPROXY"); + unsetenv ("UBUNTU_MENUPROXY"); #endif #ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); + ProcessSerialNumber serial; + GetCurrentProcess (&serial); + TransformProcessType (&serial, kProcessTransformToForegroundApplication); #endif - dcpomatic_setup_path_encoding (); - - /* Enable i18n; this will create a Config object - to look for a force-configured language. This Config - object will be wrong, however, because dcpomatic_setup - hasn't yet been called and there aren't any filters etc. - set up yet. - */ - dcpomatic_setup_i18n (); - - /* Set things up, including filters etc. - which will now be internationalised correctly. - */ - dcpomatic_setup (); - - /* Force the configuration to be re-loaded correctly next - time it is needed. - */ - Config::drop (); + dcpomatic_setup_path_encoding (); + + /* Enable i18n; this will create a Config object + to look for a force-configured language. This Config + object will be wrong, however, because dcpomatic_setup + hasn't yet been called and there aren't any filters etc. + set up yet. + */ + dcpomatic_setup_i18n (); + + /* Set things up, including filters etc. + which will now be internationalised correctly. + */ + dcpomatic_setup (); + + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); + + _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + splash = 0; + } + _frame->Show (); - _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); - SetTopWindow (_frame); - _frame->Maximize (); - if (splash) { - splash->Destroy (); + signal_manager = new wxSignalManager (this); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); + } + catch (exception& e) + { + if (splash) { + splash->Destroy (); + } + error_dialog (0, _("DCP-o-matic could not start"), std_to_wx(e.what())); } - _frame->Show (); - - signal_manager = new wxSignalManager (this); - Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); return true; } - catch (exception& e) - { - error_dialog (0, _("DCP-o-matic could not start"), std_to_wx(e.what())); - return true; - } /* An unhandled exception has occurred inside the main event loop */ bool OnExceptionInMainLoop ()