From d461d2685050842cb86875f5a5aa62505779b9ed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Mar 2021 08:38:25 +0100 Subject: [PATCH] Add simpler language tag dialog (#1931). --- platform/windows/wscript | 1 + src/lib/config.cc | 24 ++++++ src/lib/config.h | 8 ++ src/wx/language_tag_dialog.cc | 146 ++++++++++++++++++++++++++++++++ src/wx/language_tag_dialog.h | 50 +++++++++++ src/wx/language_tag_widget.cc | 4 +- src/wx/smpte_metadata_dialog.cc | 4 +- src/wx/smpte_metadata_dialog.h | 3 +- src/wx/wscript | 1 + 9 files changed, 236 insertions(+), 5 deletions(-) create mode 100644 src/wx/language_tag_dialog.cc create mode 100644 src/wx/language_tag_dialog.h diff --git a/platform/windows/wscript b/platform/windows/wscript index 9357e74ef..930fbfa0d 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -336,6 +336,7 @@ File "%cdist_deps%/share/libdcp/tags/language" File "%cdist_deps%/share/libdcp/tags/region" File "%cdist_deps%/share/libdcp/tags/script" File "%cdist_deps%/share/libdcp/tags/variant" +File "%cdist_deps%/share/libdcp/tags/dcnc" SectionEnd """, file=f) diff --git a/src/lib/config.cc b/src/lib/config.cc index 23b06f2e4..0dcc84117 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -176,6 +176,7 @@ Config::set_defaults () _player_kdm_directory = boost::none; _audio_mapping = boost::none; _minimum_frame_size = 65536; + _custom_languages.clear (); _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -552,6 +553,15 @@ try _minimum_frame_size = f.optional_number_child("MinimumFrameSize").get_value_or(65536); + for (auto i: f.node_children("CustomLanguage")) { + try { + /* This will fail if it's called before dcp::init() as it won't recognise the + * tag. That's OK because the Config will be reloaded again later. + */ + _custom_languages.push_back (dcp::LanguageTag(i->content())); + } catch (std::runtime_error& e) {} + } + if (boost::filesystem::exists (_cinemas_file)) { cxml::Document f ("Cinemas"); f.read_file (_cinemas_file); @@ -981,6 +991,9 @@ Config::write_config () const _audio_mapping->as_xml (root->add_child("AudioMapping")); } root->add_child("MinimumFrameSize")->add_child_text(raw_convert(_minimum_frame_size)); + for (auto const& i: _custom_languages) { + root->add_child("CustomLanguage")->add_child_text(i.to_string()); + } try { auto const s = doc.write_to_string_formatted (); @@ -1420,3 +1433,14 @@ Config::set_audio_mapping_to_default () _audio_mapping = audio_mapping (ch); changed (AUDIO_MAPPING); } + + +void +Config::add_custom_language (dcp::LanguageTag tag) +{ + if (find(_custom_languages.begin(), _custom_languages.end(), tag) == _custom_languages.end()) { + _custom_languages.push_back (tag); + changed (); + } +} + diff --git a/src/lib/config.h b/src/lib/config.h index 0e8fccb53..3371e48bf 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -540,6 +541,10 @@ public: return _minimum_frame_size; } + std::vector custom_languages () const { + return _custom_languages; + } + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -1055,6 +1060,8 @@ public: maybe_set (_minimum_frame_size, size); } + void add_custom_language (dcp::LanguageTag tag); + void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing @@ -1269,6 +1276,7 @@ private: boost::optional _player_kdm_directory; boost::optional _audio_mapping; int _minimum_frame_size; + std::vector _custom_languages; static int const _current_version; diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc new file mode 100644 index 000000000..96e7c5283 --- /dev/null +++ b/src/wx/language_tag_dialog.cc @@ -0,0 +1,146 @@ +/* + Copyright (C) 2021 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include "full_language_tag_dialog.h" +#include "language_tag_dialog.h" +#include "wx_util.h" +#include "lib/config.h" +#include +#include +#include + + +using std::vector; + + +LanguageTagDialog::LanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag) + : wxDialog (parent, wxID_ANY, _("Language Tag")) +{ + _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(600, 700), wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER); + _list->AppendColumn ("", wxLIST_FORMAT_LEFT, 400); + _list->AppendColumn ("", wxLIST_FORMAT_LEFT, 150); + auto add = new wxButton (this, wxID_ANY, _("Add language...")); + + auto overall_sizer = new wxBoxSizer (wxVERTICAL); + overall_sizer->Add (_list, 0, wxALL, DCPOMATIC_SIZER_GAP); + overall_sizer->Add (add, 0, wxALL, DCPOMATIC_SIZER_GAP); + + auto buttons = CreateSeparatedButtonSizer (wxOK); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + } + + SetSizerAndFit (overall_sizer); + + for (auto const& i: dcp::dcnc_tags()) { + _presets.push_back (dcp::LanguageTag(i.first)); + } + + std::sort (_presets.begin(), _presets.end(), [](dcp::LanguageTag const& i, dcp::LanguageTag const& j) { + return i.description() < j.description(); + }); + + _custom = Config::instance()->custom_languages (); + + populate_list (); + + set (tag); + + add->Bind (wxEVT_BUTTON, boost::bind(&LanguageTagDialog::add_language, this)); +} + + +void +LanguageTagDialog::add_language () +{ + auto full = new FullLanguageTagDialog (GetParent()); + auto r = full->ShowModal (); + if (r == wxID_OK) { + Config::instance()->add_custom_language (full->get()); + set (full->get()); + } + full->Destroy (); +} + + +void +LanguageTagDialog::populate_list () +{ + _list->DeleteAllItems (); + + auto add = [this](vector const& tags) { + for (auto const& i: tags) { + wxListItem it; + it.SetId (_list->GetItemCount()); + it.SetColumn (0); + it.SetText (std_to_wx(i.description())); + _list->InsertItem (it); + it.SetColumn (1); + it.SetText (std_to_wx(i.to_string())); + _list->SetItem (it); + } + }; + + add (_presets); + add (_custom); +} + + +void +LanguageTagDialog::set (dcp::LanguageTag tag) +{ + size_t selection = 0; + + auto iter = find(_presets.begin(), _presets.end(), tag); + if (iter == _presets.end()) { + iter = find(_custom.begin(), _custom.end(), tag); + if (iter == _custom.end()) { + _custom.push_back (tag); + selection = _presets.size() + _custom.size() - 1; + populate_list (); + _list->EnsureVisible (_list->GetItemCount() - 1); + } else { + selection = _presets.size() + std::distance(_custom.begin(), iter); + } + } else { + selection = std::distance(_presets.begin(), iter); + } + + _list->SetItemState (selection, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); +} + + +dcp::LanguageTag +LanguageTagDialog::get () const +{ + auto selected = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + DCPOMATIC_ASSERT (selected >= 0); + + if (selected < static_cast(_presets.size())) { + return _presets[selected]; + } + + selected -= _presets.size(); + + DCPOMATIC_ASSERT (selected < static_cast(_custom.size())); + return _custom[selected]; +} + diff --git a/src/wx/language_tag_dialog.h b/src/wx/language_tag_dialog.h new file mode 100644 index 000000000..ae6ea4ef7 --- /dev/null +++ b/src/wx/language_tag_dialog.h @@ -0,0 +1,50 @@ +/* + Copyright (C) 2021 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#ifndef DCPOMATIC_LANGUAGE_TAG_DIALOG_H +#define DCPOMATIC_LANGUAGE_TAG_DIALOG_H + + +#include +#include + + +class wxListCtrl; + + +class LanguageTagDialog : public wxDialog +{ +public: + LanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag = dcp::LanguageTag("en")); + + dcp::LanguageTag get () const; + void set (dcp::LanguageTag tag); + +private: + void add_language (); + void populate_list (); + + std::vector _presets; + std::vector _custom; + wxListCtrl* _list; +}; + +#endif diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc index a032545ad..d71b5fc7a 100644 --- a/src/wx/language_tag_widget.cc +++ b/src/wx/language_tag_widget.cc @@ -20,7 +20,7 @@ #include "dcpomatic_button.h" -#include "full_language_tag_dialog.h" +#include "language_tag_dialog.h" #include "language_tag_widget.h" #include "wx_util.h" #include @@ -44,7 +44,7 @@ LanguageTagWidget::LanguageTagWidget (wxWindow* parent, wxString tooltip, dcp::L void LanguageTagWidget::edit () { - auto d = new FullLanguageTagDialog(_parent, _tag); + auto d = new LanguageTagDialog(_parent, _tag); d->ShowModal (); set (d->get()); Changed (d->get()); diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc index 2f3869d58..64afcac5c 100644 --- a/src/wx/smpte_metadata_dialog.cc +++ b/src/wx/smpte_metadata_dialog.cc @@ -20,7 +20,7 @@ #include "content_version_dialog.h" #include "editable_list.h" -#include "full_language_tag_dialog.h" +#include "language_tag_dialog.h" #include "language_tag_widget.h" #include "smpte_metadata_dialog.h" #include "rating_dialog.h" @@ -111,7 +111,7 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr weak_ vector columns; columns.push_back (EditableListColumn("Language", 250, true)); - _additional_subtitle_languages = new EditableList ( + _additional_subtitle_languages = new EditableList ( this, columns, boost::bind(&SMPTEMetadataDialog::additional_subtitle_languages, this), diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h index 128d155f3..558023b0f 100644 --- a/src/wx/smpte_metadata_dialog.h +++ b/src/wx/smpte_metadata_dialog.h @@ -32,6 +32,7 @@ class Film; class RatingDialog; class ContentVersionDialog; class LanguageTagWidget; +class LanguageTagDialog; class SMPTEMetadataDialog : public wxDialog, public WeakFilm @@ -64,7 +65,7 @@ private: LanguageTagWidget* _audio_language; wxCheckBox* _enable_main_subtitle_language; LanguageTagWidget* _main_subtitle_language; - EditableList* _additional_subtitle_languages; + EditableList* _additional_subtitle_languages; wxStaticText* _release_territory; wxSpinCtrl* _version_number; wxChoice* _status; diff --git a/src/wx/wscript b/src/wx/wscript index 41d51ded5..f70d2921c 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -93,6 +93,7 @@ sources = """ kdm_dialog.cc kdm_output_panel.cc kdm_timing_panel.cc + language_tag_dialog.cc language_tag_widget.cc make_chain_dialog.cc markers_dialog.cc -- 2.30.2