/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using std::list;
using std::string;
using std::vector;
+using std::pair;
using boost::shared_ptr;
using boost::bind;
+using boost::optional;
+using boost::ref;
enum {
ID_help_report_a_problem = 1,
{
}
+
+ optional<dcp::EncryptedKDM> get ()
+ {
+ try {
+ return dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (_dialog->GetPath ()), MAX_KDM_SIZE));
+ } catch (cxml::Error& e) {
+ error_dialog (_parent, wxString::Format ("This file does not look like a KDM (%s)", std_to_wx (e.what()).data()));
+ }
+
+ return optional<dcp::EncryptedKDM> ();
+ }
};
static string
setup_menu (bar);
SetMenuBar (bar);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem);
/* Use a panel as the only child of the Frame so that we avoid
the dark-grey background on Windows.
wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
- wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
+ wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL);
+ wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
+ wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
+
+ horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 2);
+ horizontal->Add (right, 1, wxEXPAND);
wxFont subheading_font (*wxNORMAL_FONT);
subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
wxStaticText* h = new wxStaticText (overall_panel, wxID_ANY, _("Screens"));
h->SetFont (subheading_font);
- vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL);
+ left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
_screens = new ScreensPanel (overall_panel);
- vertical->Add (_screens, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
+ 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->SetFont (subheading_font);
+ right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
_timing = new KDMTimingPanel (overall_panel);
- vertical->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
+ right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM"));
h->SetFont (subheading_font);
- vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+ right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
vector<string> columns;
columns.push_back (wx_to_std (_("CPL")));
_dkdm = new EditableList<dcp::EncryptedKDM, KDMFileDialogWrapper> (
- overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&always_valid), bind (&column, _1), false
+ overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&column, _1), false
);
- vertical->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
+ right->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
h = new wxStaticText (overall_panel, wxID_ANY, _("Output"));
h->SetFont (subheading_font);
- vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+ 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);
- vertical->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
+ right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
_create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs"));
- vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
+ right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
- main_sizer->Add (vertical, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
+ main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
overall_panel->SetSizer (main_sizer);
/* Instantly save any config changes when using a DCP-o-matic GUI */
Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ()));
_screens->ScreensChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this));
- _create->Bind (wxEVT_COMMAND_BUTTON_CLICKED, bind (&DOMFrame::create_kdms, this));
+ _create->Bind (wxEVT_BUTTON, bind (&DOMFrame::create_kdms, this));
_dkdm->SelectionChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this));
setup_sensitivity ();
m->Append (help, _("&Help"));
}
+ bool confirm_overwrite (boost::filesystem::path path)
+ {
+ return confirm_dialog (
+ this,
+ wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data())
+ );
+ }
+
void create_kdms ()
{
try {
screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
}
- if (_output->write_to()) {
- ScreenKDM::write_files (decrypted.content_title_text(), screen_kdms, _output->directory());
- /* XXX: proper plural form support in wxWidgets? */
- wxString s = screen_kdms.size() == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s");
- message_dialog (
- this,
- wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
- );
- } else {
- string film_name = decrypted.annotation_text().get_value_or ("");
- if (film_name.empty ()) {
- film_name = decrypted.content_title_text ();
- }
- shared_ptr<Job> job (new SendKDMEmailJob (
- film_name,
- decrypted.content_title_text(),
- _timing->from(), _timing->until(),
- CinemaKDMs::collect (screen_kdms),
- shared_ptr<Log> ()
- ));
-
- JobManager::instance()->add (job);
+ pair<shared_ptr<Job>, int> result = _output->make (
+ screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr<Log> ()
+ );
+
+ if (result.first) {
+ JobManager::instance()->add (result.first);
if (_job_view) {
_job_view->Destroy ();
_job_view = 0;
}
- _job_view = new JobViewDialog (this, _("Send KDM emails"), job);
+ _job_view = new JobViewDialog (this, _("Send KDM emails"), result.first);
_job_view->ShowModal ();
}
+
+ if (result.second > 0) {
+ /* XXX: proper plural form support in wxWidgets? */
+ wxString s = result.second == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s");
+ message_dialog (
+ this,
+ wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data())
+ );
+ }
} catch (dcp::NotEncryptedError& e) {
error_dialog (this, _("CPL's content is not encrypted."));
} catch (exception& e) {
projects / dcpomatic.git / blobdiff