Shrink height of KDM creator a bit.

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 20ce9e475b3a9737cb3bf3017182ac1026c214f1..29c32d0ff2c255086ae6f80d4b8332baa7a1cb10 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -104,16 +104,20 @@ public:
                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);
                _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);

diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index 02b4a94261f4bd43ff159223589b303bbbe0d208..c0d0c27e8de12f5e2bfb8adf2d84791d3aeb24cf 100644 (file)
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -25,7 +25,7 @@
 KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
        : wxPanel (parent, wxID_ANY)
 {
-       wxFlexGridSizer* table = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       wxFlexGridSizer* table = new wxFlexGridSizer (6, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        add_label_to_sizer (table, this, _("From"), true);
        wxDateTime from;
        from.SetToCurrent ();
@@ -34,7 +34,7 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
        _from_time = new wxTimePickerCtrl (this, wxID_ANY, from);
        table->Add (_from_time, 1, wxEXPAND);
 
-       add_label_to_sizer (table, this, _("Until"), true);
+       add_label_to_sizer (table, this, _("until"), true);
        wxDateTime to = from;
        /* 1 week from now */
        to.Add (wxDateSpan (0, 0, 1, 0));