More OS X tweaks.

[dcpomatic.git] / src / tools / dcpomatic_kdm.cc

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 5972b6c0f9a9259040a79d9b4398e6bc8a352b04..df0df54896a87e3cfc6c92b674fe3a496217dc04 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -20,11 +20,13 @@
 #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/kdm_timing_panel.h"
 #include "wx/kdm_output_panel.h"
+#include "wx/job_view_dialog.h"
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/screen.h"
@@ -39,6 +41,9 @@
 #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>
 
@@ -48,11 +53,12 @@
 
 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
@@ -61,6 +67,7 @@ public:
        DOMFrame (wxString const & title)
                : wxFrame (NULL, -1, title)
                , _config_dialog (0)
+               , _job_view (0)
        {
                wxMenuBar* bar = new wxMenuBar;
                setup_menu (bar);
@@ -99,11 +106,7 @@ public:
                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);
                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(""));
@@ -204,6 +207,10 @@ private:
 
        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());
@@ -270,14 +277,24 @@ private:
                                        wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
                                        );
                        } else {
-                               JobManager::instance()->add (
-                                       shared_ptr<Job> (new SendKDMEmailJob (
-                                                                decrypted.annotation_text(),
-                                                                decrypted.content_title_text(),
-                                                                _timing->from(), _timing->until(),
-                                                                CinemaKDMs::collect (screen_kdms)
-                                                                ))
-                                       );
+                               string film_name = decrypted.annotation_text ();
+                               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)
+                                                            ));
+
+                               JobManager::instance()->add (job);
+                               if (_job_view) {
+                                       _job_view->Destroy ();
+                                       _job_view = 0;
+                               }
+                               _job_view = new JobViewDialog (this, _("Send KDM emails"), job);
+                               _job_view->ShowModal ();
                        }
                } catch (dcp::NotEncryptedError& e) {
                        error_dialog (this, _("CPL's content is not encrypted."));
@@ -298,16 +315,14 @@ private:
        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;
        wxButton* _create;
        KDMOutputPanel* _output;
+       JobViewDialog* _job_view;
 };
 
 /** @class App