#include "wx/config_dialog.h"
#include "wx/about_dialog.h"
#include "wx/report_problem_dialog.h"
+#include "wx/file_picker_ctrl.h"
#include "wx/wx_util.h"
#include "wx/wx_signal_manager.h"
#include "wx/screens_panel.h"
#include <wx/wx.h>
#include <wx/preferences.h>
#include <wx/filepicker.h>
+#ifdef __WXOSX__
+#include <ApplicationServices/ApplicationServices.h>
+#endif
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
using std::exception;
using std::list;
+using std::string;
using boost::shared_ptr;
using boost::bind;
enum {
- ID_help_report_a_problem,
+ ID_help_report_a_problem = 1,
};
class DOMFrame : public wxFrame
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);
- wxSizer* dkdm = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ wxSizer* dkdm = new wxFlexGridSizer (4, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
add_label_to_sizer (dkdm, overall_panel, _("DKDM file"), true);
-#ifdef DCPOMATIC_USE_OWN_PICKER
- _dkdm = new FilePicker (overall_panel, _("Select a DKDM XML file..."), "*.xml");
-#else
- _dkdm = new wxFilePickerCtrl (overall_panel, wxID_ANY, wxEmptyString, _("Select a DKDM XML file..."), "*.xml", wxDefaultPosition, wxSize (300, -1));
-#endif
+ _dkdm = new FilePickerCtrl (overall_panel, _("Select a DKDM XML file..."), "*.xml");
dkdm->Add (_dkdm, 1, wxEXPAND);
- add_label_to_sizer (dkdm, overall_panel, _("Annotation"), true);
- _annotation_text = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
- dkdm->Add (_annotation_text, 1, wxEXPAND);
add_label_to_sizer (dkdm, overall_panel, _("Content title"), true);
_content_title_text = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
dkdm->Add (_content_title_text, 1, wxEXPAND);
+ dkdm->AddSpacer (0);
+ dkdm->AddSpacer (0);
+ add_label_to_sizer (dkdm, overall_panel, _("Annotation"), true);
+ _annotation_text = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
+ dkdm->Add (_annotation_text, 1, wxEXPAND);
+ dkdm->AddSpacer (0);
+ dkdm->AddSpacer (0);
add_label_to_sizer (dkdm, overall_panel, _("Issue date"), true);
_issue_date = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
dkdm->Add (_issue_date, 1, wxEXPAND);
void dkdm_changed ()
{
+ if (_dkdm->GetPath().IsEmpty()) {
+ return;
+ }
+
try {
dcp::EncryptedKDM encrypted (dcp::file_to_string (wx_to_std (_dkdm->GetPath())));
dcp::DecryptedKDM decrypted (encrypted, Config::instance()->decryption_chain()->key().get());
wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
);
} else {
+ string film_name = decrypted.annotation_text ();
+ if (film_name.empty ()) {
+ film_name = decrypted.content_title_text ();
+ }
shared_ptr<Job> job (new SendKDMEmailJob (
- decrypted.annotation_text(),
+ film_name,
decrypted.content_title_text(),
_timing->from(), _timing->until(),
- CinemaKDMs::collect (screen_kdms)
+ CinemaKDMs::collect (screen_kdms),
+ shared_ptr<Log> ()
));
JobManager::instance()->add (job);
wxPreferencesEditor* _config_dialog;
ScreensPanel* _screens;
KDMTimingPanel* _timing;
-#ifdef DCPOMATIC_USE_OWN_PICKER
- FilePicker* _dkdm;
-#else
- wxFilePickerCtrl* _dkdm;
-#endif
+ /* I can't seem to clear the value in a wxFilePickerCtrl, so use our own */
+ FilePickerCtrl* _dkdm;
wxStaticText* _annotation_text;
wxStaticText* _content_title_text;
wxStaticText* _issue_date;