KDM AnnotationText tags are optional.

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

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index b98ec84a9aa939cf165c84bd1283afc8aad10e56..1f61aad5139c918a12dc00013394b7c78bf679d2 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -86,7 +86,7 @@ class DOMFrame : public wxFrame
 {
 public:
        DOMFrame (wxString const & title)
-               : wxFrame (NULL, -1, title)
+               : wxFrame (0, -1, title)
                , _config_dialog (0)
                , _job_view (0)
        {
@@ -146,7 +146,7 @@ public:
                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 (&column, _1), false
+                       overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&always_valid), bind (&column, _1), false
                        );
                vertical->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
 
@@ -160,7 +160,7 @@ public:
                _create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs"));
                vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
-               main_sizer->Add (vertical, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
+               main_sizer->Add (vertical, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
                overall_panel->SetSizer (main_sizer);
 
                /* Instantly save any config changes when using a DCP-o-matic GUI */
@@ -271,9 +271,9 @@ private:
 
                                /* Make an empty KDM */
                                dcp::DecryptedKDM kdm (
-                                       dcp::LocalTime (_timing->from(), i->cinema->utc_offset(), 0),
-                                       dcp::LocalTime (_timing->until(), i->cinema->utc_offset(), 0),
-                                       decrypted.annotation_text(),
+                                       dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+                                       dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+                                       decrypted.annotation_text().get_value_or (""),
                                        decrypted.content_title_text(),
                                        dcp::LocalTime().as_string()
                                        );
@@ -296,7 +296,7 @@ private:
                                        wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
                                        );
                        } else {
-                               string film_name = decrypted.annotation_text ();
+                               string film_name = decrypted.annotation_text().get_value_or ("");
                                if (film_name.empty ()) {
                                        film_name = decrypted.content_title_text ();
                                }
@@ -359,7 +359,7 @@ private:
        {
                wxInitAllImageHandlers ();
 
-               SetAppName (_("DCP-o-matic KDM creator"));
+               SetAppName (_("DCP-o-matic KDM Creator"));
 
                if (!wxApp::OnInit()) {
                        return false;
@@ -395,7 +395,7 @@ private:
                */
                Config::drop ();
 
-               _frame = new DOMFrame (_("DCP-o-matic KDM creator"));
+               _frame = new DOMFrame (_("DCP-o-matic KDM Creator"));
                SetTopWindow (_frame);
                _frame->Maximize ();
                _frame->Show ();