diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-30 20:58:31 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-30 20:58:31 +0200 |
| commit | a7ad0cdff67faffc6bdaef21c100d4ef4016e406 (patch) | |
| tree | 7647368fe2fda9344f57236b6efd6bd06692a0fb /src/tools | |
| parent | cc105289bed33989e5c399433e28208652b18e70 (diff) | |
Allow annotation text to be set when combining DCPs.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_combiner.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index 566ec82f1..4a783d634 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -104,7 +104,13 @@ public: true ); - auto output = new wxBoxSizer (wxHORIZONTAL); + auto output = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + output->AddGrowableCol (1, 1); + + add_label_to_sizer (output, overall_panel, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _annotation_text = new wxTextCtrl (overall_panel, wxID_ANY, wxT("")); + output->Add (_annotation_text, 1, wxEXPAND); + add_label_to_sizer (output, overall_panel, _("Output DCP folder"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _output = new DirPickerCtrl (overall_panel); output->Add (_output, 1, wxEXPAND); @@ -162,7 +168,7 @@ private: } auto jm = JobManager::instance (); - jm->add (make_shared<CombineDCPJob>(_inputs, output)); + jm->add (make_shared<CombineDCPJob>(_inputs, output, wx_to_std(_annotation_text->GetValue()))); bool const ok = display_progress (_("DCP-o-matic Combine"), _("Combining DCPs")); if (!ok) { return; @@ -189,6 +195,7 @@ private: } EditableList<boost::filesystem::path, DirDialogWrapper>* _input; + wxTextCtrl* _annotation_text = nullptr; DirPickerCtrl* _output; vector<boost::filesystem::path> _inputs; Button* _combine; |