--- /dev/null
+/*
+ Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
+
+ 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 <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "lib/dcpomatic_assert.h"
+#include "full_language_tag_dialog.h"
+#include <dcp/language_tag.h>
+#include <wx/listctrl.h>
+#include <wx/srchctrl.h>
+#include <wx/wx.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/optional.hpp>
+#include <boost/signals2.hpp>
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <vector>
+
+
+using std::min;
+using std::pair;
+using std::string;
+using std::vector;
+using boost::optional;
+using std::shared_ptr;
+using std::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
+
+class SubtagListCtrl : public wxListCtrl
+{
+public:
+ SubtagListCtrl (wxWindow* parent)
+ : wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxLC_VIRTUAL)
+ {
+ AppendColumn ("", wxLIST_FORMAT_LEFT, 80);
+ AppendColumn ("", wxLIST_FORMAT_LEFT, 400);
+ }
+
+ void set (dcp::LanguageTag::SubtagType type, string search, optional<dcp::LanguageTag::SubtagData> subtag = optional<dcp::LanguageTag::SubtagData>())
+ {
+ _all_subtags = dcp::LanguageTag::get_all(type);
+ set_search (search);
+ if (subtag) {
+ auto i = find(_matching_subtags.begin(), _matching_subtags.end(), *subtag);
+ if (i != _matching_subtags.end()) {
+ auto item = std::distance(_matching_subtags.begin(), i);
+ SetItemState (item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+ EnsureVisible (item);
+ }
+ } else {
+ if (GetItemCount() > 0) {
+ /* The new list sometimes isn't visible without this */
+ EnsureVisible (0);
+ }
+ }
+ }
+
+ void set_search (string search)
+ {
+ if (search == "") {
+ _matching_subtags = _all_subtags;
+ } else {
+ _matching_subtags.clear ();
+
+ boost::algorithm::to_lower(search);
+ for (auto const& i: _all_subtags) {
+ if (
+ (boost::algorithm::to_lower_copy(i.subtag).find(search) != string::npos) ||
+ (boost::algorithm::to_lower_copy(i.description).find(search) != string::npos)) {
+ _matching_subtags.push_back (i);
+ }
+ }
+ }
+
+ SetItemCount (_matching_subtags.size());
+ if (GetItemCount() > 0) {
+ RefreshItems (0, GetItemCount() - 1);
+ }
+ }
+
+ optional<dcp::LanguageTag::SubtagData> selected_subtag () const
+ {
+ auto selected = GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected == -1) {
+ return {};
+ }
+
+ DCPOMATIC_ASSERT (static_cast<size_t>(selected) < _matching_subtags.size());
+ return _matching_subtags[selected];
+ }
+
+private:
+ wxString OnGetItemText (long item, long column) const
+ {
+ if (column == 0) {
+ return _matching_subtags[item].subtag;
+ } else {
+ return _matching_subtags[item].description;
+ }
+ }
+
+ std::vector<dcp::LanguageTag::SubtagData> _all_subtags;
+ std::vector<dcp::LanguageTag::SubtagData> _matching_subtags;
+};
+
+
+class LanguageSubtagPanel : public wxPanel
+{
+public:
+ LanguageSubtagPanel (wxWindow* parent)
+ : wxPanel (parent, wxID_ANY)
+ {
+#ifdef __WXGTK3__
+ int const height = 30;
+#else
+ int const height = -1;
+#endif
+
+ _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, height));
+ _list = new SubtagListCtrl (this);
+
+ auto sizer = new wxBoxSizer (wxVERTICAL);
+ sizer->Add (_search, 0, wxALL, 8);
+ sizer->Add (_list, 1, wxALL, 8);
+ SetSizer (sizer);
+
+ _search->Bind (wxEVT_TEXT, boost::bind(&LanguageSubtagPanel::search_changed, this));
+ _list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&LanguageSubtagPanel::selection_changed, this));
+ _list->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&LanguageSubtagPanel::selection_changed, this));
+ }
+
+ void set (dcp::LanguageTag::SubtagType type, string search, optional<dcp::LanguageTag::SubtagData> subtag = optional<dcp::LanguageTag::SubtagData>())
+ {
+ _list->set (type, search, subtag);
+ _search->SetValue (wxString(search));
+ }
+
+ optional<dcp::LanguageTag::RegionSubtag> get () const
+ {
+ if (!_list->selected_subtag()) {
+ return {};
+ }
+
+ return dcp::LanguageTag::RegionSubtag(_list->selected_subtag()->subtag);
+ }
+
+ boost::signals2::signal<void (optional<dcp::LanguageTag::SubtagData>)> SelectionChanged;
+ boost::signals2::signal<void (string)> SearchChanged;
+
+private:
+ void search_changed ()
+ {
+ auto search = _search->GetValue();
+ _list->set_search (search.ToStdString());
+ if (search.Length() > 0) {
+ _list->EnsureVisible (0);
+ }
+ SearchChanged (_search->GetValue().ToStdString());
+ }
+
+ void selection_changed ()
+ {
+ SelectionChanged (_list->selected_subtag());
+ }
+
+ wxSearchCtrl* _search;
+ SubtagListCtrl* _list;
+};
+
+
+FullLanguageTagDialog::FullLanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag)
+ : wxDialog (parent, wxID_ANY, "Language Tag", wxDefaultPosition, wxSize(-1, 500))
+{
+ _current_tag_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER);
+ _current_tag_list->AppendColumn ("", wxLIST_FORMAT_LEFT, 200);
+ _current_tag_list->AppendColumn ("", wxLIST_FORMAT_LEFT, 400);
+
+ auto button_sizer = new wxBoxSizer (wxVERTICAL);
+ _add_script = new wxButton(this, wxID_ANY, "Add script");
+ button_sizer->Add (_add_script, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
+ _add_region = new wxButton(this, wxID_ANY, "Add region");
+ button_sizer->Add (_add_region, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
+ _add_variant = new wxButton(this, wxID_ANY, "Add variant");
+ button_sizer->Add (_add_variant, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
+ _add_external = new wxButton(this, wxID_ANY, "Add external");
+ button_sizer->Add (_add_external, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
+ _remove = new wxButton(this, wxID_ANY, "Remove");
+ button_sizer->Add (_remove, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
+
+ _choose_subtag_panel = new LanguageSubtagPanel (this);
+ _choose_subtag_panel->set (dcp::LanguageTag::SubtagType::LANGUAGE, "");
+
+ auto ltor_sizer = new wxBoxSizer (wxHORIZONTAL);
+ ltor_sizer->Add (_current_tag_list, 1, wxALL, 8);
+ ltor_sizer->Add (button_sizer, 0, wxALL, 8);
+ ltor_sizer->Add (_choose_subtag_panel, 1, wxALL, 8);
+
+ auto overall_sizer = new wxBoxSizer (wxVERTICAL);
+ overall_sizer->Add (ltor_sizer, 0);
+
+ auto buttons = CreateSeparatedButtonSizer (wxOK);
+ if (buttons) {
+ overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+
+ SetSizerAndFit (overall_sizer);
+
+ set (tag);
+
+ _add_script->Bind (wxEVT_BUTTON, boost::bind(&FullLanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::SCRIPT, boost::optional<dcp::LanguageTag::SubtagData>()));
+ _add_region->Bind (wxEVT_BUTTON, boost::bind(&FullLanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::REGION, boost::optional<dcp::LanguageTag::SubtagData>()));
+ _add_variant->Bind (wxEVT_BUTTON, boost::bind(&FullLanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::VARIANT, boost::optional<dcp::LanguageTag::SubtagData>()));
+ _add_external->Bind (wxEVT_BUTTON, boost::bind(&FullLanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::EXTLANG, boost::optional<dcp::LanguageTag::SubtagData>()));
+ _remove->Bind (wxEVT_BUTTON, boost::bind(&FullLanguageTagDialog::remove_from_current_tag, this));
+ _choose_subtag_panel->SelectionChanged.connect(bind(&FullLanguageTagDialog::chosen_subtag_changed, this, _1));
+ _choose_subtag_panel->SearchChanged.connect(bind(&FullLanguageTagDialog::search_changed, this, _1));
+ _current_tag_list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&FullLanguageTagDialog::current_tag_selection_changed, this));
+ _current_tag_list->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&FullLanguageTagDialog::current_tag_selection_changed, this));
+}
+
+
+void
+FullLanguageTagDialog::remove_from_current_tag ()
+{
+ auto selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected <= 0) {
+ return;
+ }
+
+ _current_tag_subtags.erase (_current_tag_subtags.begin() + selected);
+ _current_tag_list->DeleteItem (selected);
+
+ _current_tag_list->SetItemState (min(selected, _current_tag_list->GetItemCount() - 1L), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+
+ setup_sensitivity ();
+ current_tag_selection_changed ();
+}
+
+
+dcp::LanguageTag FullLanguageTagDialog::get () const
+{
+ dcp::LanguageTag tag;
+
+ vector<dcp::LanguageTag::VariantSubtag> variants;
+ vector<dcp::LanguageTag::ExtlangSubtag> extlangs;
+
+ for (auto i: _current_tag_subtags) {
+ if (!i.subtag) {
+ continue;
+ }
+ switch (i.type) {
+ case dcp::LanguageTag::SubtagType::LANGUAGE:
+ tag.set_language (i.subtag->subtag);
+ break;
+ case dcp::LanguageTag::SubtagType::SCRIPT:
+ tag.set_script (i.subtag->subtag);
+ break;
+ case dcp::LanguageTag::SubtagType::REGION:
+ tag.set_region (i.subtag->subtag);
+ break;
+ case dcp::LanguageTag::SubtagType::VARIANT:
+ variants.push_back (i.subtag->subtag);
+ break;
+ case dcp::LanguageTag::SubtagType::EXTLANG:
+ extlangs.push_back (i.subtag->subtag);
+ break;
+ }
+ }
+
+ tag.set_variants (variants);
+ tag.set_extlangs (extlangs);
+ return tag;
+}
+
+
+void
+FullLanguageTagDialog::set (dcp::LanguageTag tag)
+{
+ _current_tag_subtags.clear ();
+ _current_tag_list->DeleteAllItems ();
+
+ bool have_language = false;
+ for (auto const& i: tag.subtags()) {
+ add_to_current_tag (i.first, i.second);
+ if (i.first == dcp::LanguageTag::SubtagType::LANGUAGE) {
+ have_language = true;
+ }
+ }
+
+ if (!have_language) {
+ add_to_current_tag (dcp::LanguageTag::SubtagType::LANGUAGE, dcp::LanguageTag::SubtagData("en", "English"));
+ }
+}
+
+
+string FullLanguageTagDialog::subtag_type_name (dcp::LanguageTag::SubtagType type)
+{
+ switch (type) {
+ case dcp::LanguageTag::SubtagType::LANGUAGE:
+ return "Language";
+ case dcp::LanguageTag::SubtagType::SCRIPT:
+ return "Script";
+ case dcp::LanguageTag::SubtagType::REGION:
+ return "Region";
+ case dcp::LanguageTag::SubtagType::VARIANT:
+ return "Variant";
+ case dcp::LanguageTag::SubtagType::EXTLANG:
+ return "External";
+ }
+
+ return {};
+}
+
+
+void
+FullLanguageTagDialog::search_changed (string search)
+{
+ long int selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected >= 0) {
+ _current_tag_subtags[selected].last_search = search;
+ }
+}
+
+
+void
+FullLanguageTagDialog::add_to_current_tag (dcp::LanguageTag::SubtagType type, optional<dcp::LanguageTag::SubtagData> subtag)
+{
+ _current_tag_subtags.push_back (Subtag(type, subtag));
+ wxListItem it;
+ it.SetId (_current_tag_list->GetItemCount());
+ it.SetColumn (0);
+ it.SetText (subtag_type_name(type));
+ _current_tag_list->InsertItem (it);
+ it.SetColumn (1);
+ if (subtag) {
+ it.SetText (subtag->description);
+ } else {
+ it.SetText ("Select...");
+ }
+ _current_tag_list->SetItem (it);
+ _current_tag_list->SetItemState (_current_tag_list->GetItemCount() - 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+ _choose_subtag_panel->set (type, "");
+ setup_sensitivity ();
+ current_tag_selection_changed ();
+}
+
+
+void
+FullLanguageTagDialog::current_tag_selection_changed ()
+{
+ auto selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected >= 0) {
+ _choose_subtag_panel->Enable (true);
+ _choose_subtag_panel->set (_current_tag_subtags[selected].type, _current_tag_subtags[selected].last_search, _current_tag_subtags[selected].subtag);
+ } else {
+ _choose_subtag_panel->Enable (false);
+ }
+}
+
+
+void
+FullLanguageTagDialog::chosen_subtag_changed (optional<dcp::LanguageTag::SubtagData> selection)
+{
+ if (!selection) {
+ return;
+ }
+
+ auto selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected >= 0) {
+ _current_tag_subtags[selected].subtag = *selection;
+ _current_tag_list->SetItem (selected, 0, subtag_type_name(_current_tag_subtags[selected].type));
+ _current_tag_list->SetItem (selected, 1, selection->description);
+ }
+
+ setup_sensitivity ();
+}
+
+void
+FullLanguageTagDialog::setup_sensitivity ()
+{
+ _add_script->Enable ();
+ _add_region->Enable ();
+ _add_variant->Enable ();
+ _add_external->Enable ();
+ for (auto const& i: _current_tag_subtags) {
+ switch (i.type) {
+ case dcp::LanguageTag::SubtagType::SCRIPT:
+ _add_script->Enable (false);
+ break;
+ case dcp::LanguageTag::SubtagType::REGION:
+ _add_region->Enable (false);
+ break;
+ case dcp::LanguageTag::SubtagType::VARIANT:
+ _add_variant->Enable (false);
+ break;
+ case dcp::LanguageTag::SubtagType::EXTLANG:
+ _add_external->Enable (false);
+ break;
+ default:
+ break;
+ }
+ }
+ auto selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ _remove->Enable (selected > 0);
+}
+
+
+RegionSubtagDialog::RegionSubtagDialog (wxWindow* parent, dcp::LanguageTag::RegionSubtag region)
+ : wxDialog (parent, wxID_ANY, _("Region"), wxDefaultPosition, wxSize(-1, 500))
+ , _panel (new LanguageSubtagPanel (this))
+{
+ auto sizer = new wxBoxSizer (wxVERTICAL);
+ sizer->Add (_panel, 1);
+
+ auto buttons = CreateSeparatedButtonSizer (wxOK);
+ if (buttons) {
+ sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+
+ SetSizer (sizer);
+
+ _panel->set (dcp::LanguageTag::SubtagType::REGION, "", *dcp::LanguageTag::get_subtag_data(region));
+}
+
+
+optional<dcp::LanguageTag::RegionSubtag>
+RegionSubtagDialog::get () const
+{
+ return _panel->get ();
+}
+
+
--- /dev/null
+/*
+ Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
+
+ 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 <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#ifndef DCPOMATIC_FULL_LANGUAGE_TAG_DIALOG_H
+#define DCPOMATIC_FULL_LANGUAGE_TAG_DIALOG_H
+
+
+#include "lib/warnings.h"
+#include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
+
+class wxListCtrl;
+class LanguageSubtagPanel;
+
+
+class FullLanguageTagDialog : public wxDialog
+{
+public:
+ class Subtag
+ {
+ public:
+ Subtag (dcp::LanguageTag::SubtagType type_, boost::optional<dcp::LanguageTag::SubtagData> subtag_)
+ : type (type_)
+ , subtag (subtag_)
+ {}
+
+ dcp::LanguageTag::SubtagType type;
+ boost::optional<dcp::LanguageTag::SubtagData> subtag;
+ std::string last_search;
+ };
+
+ FullLanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag = dcp::LanguageTag("en"));
+
+ dcp::LanguageTag get () const;
+ void set (dcp::LanguageTag tag);
+
+private:
+
+ std::string subtag_type_name (dcp::LanguageTag::SubtagType type);
+ void search_changed (std::string search);
+ void add_to_current_tag (dcp::LanguageTag::SubtagType type, boost::optional<dcp::LanguageTag::SubtagData> subtag);
+ void remove_from_current_tag ();
+ void current_tag_selection_changed ();
+ void chosen_subtag_changed (boost::optional<dcp::LanguageTag::SubtagData> selection);
+ void setup_sensitivity ();
+
+ std::vector<Subtag> _current_tag_subtags;
+ wxListCtrl* _current_tag_list;
+ LanguageSubtagPanel* _choose_subtag_panel;
+ wxButton* _add_script;
+ wxButton* _add_region;
+ wxButton* _add_variant;
+ wxButton* _add_external;
+ wxButton* _remove;
+};
+
+
+
+class RegionSubtagDialog : public wxDialog
+{
+public:
+ RegionSubtagDialog (wxWindow* parent, dcp::LanguageTag::RegionSubtag region);
+
+ boost::optional<dcp::LanguageTag::RegionSubtag> get () const;
+
+private:
+ LanguageSubtagPanel* _panel;
+};
+
+
+#endif
+++ /dev/null
-/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
-
- 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 <http://www.gnu.org/licenses/>.
-
-*/
-
-
-#include "lib/dcpomatic_assert.h"
-#include "language_tag_dialog.h"
-#include <dcp/language_tag.h>
-#include <wx/listctrl.h>
-#include <wx/srchctrl.h>
-#include <wx/wx.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/bind/bind.hpp>
-#include <boost/optional.hpp>
-#include <boost/signals2.hpp>
-#include <iostream>
-#include <iterator>
-#include <string>
-#include <vector>
-
-
-using std::min;
-using std::pair;
-using std::string;
-using std::vector;
-using boost::optional;
-using std::shared_ptr;
-using std::weak_ptr;
-#if BOOST_VERSION >= 106100
-using namespace boost::placeholders;
-#endif
-
-
-class SubtagListCtrl : public wxListCtrl
-{
-public:
- SubtagListCtrl (wxWindow* parent)
- : wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxLC_VIRTUAL)
- {
- AppendColumn ("", wxLIST_FORMAT_LEFT, 80);
- AppendColumn ("", wxLIST_FORMAT_LEFT, 400);
- }
-
- void set (dcp::LanguageTag::SubtagType type, string search, optional<dcp::LanguageTag::SubtagData> subtag = optional<dcp::LanguageTag::SubtagData>())
- {
- _all_subtags = dcp::LanguageTag::get_all(type);
- set_search (search);
- if (subtag) {
- vector<dcp::LanguageTag::SubtagData>::iterator i = find(_matching_subtags.begin(), _matching_subtags.end(), *subtag);
- if (i != _matching_subtags.end()) {
- long item = std::distance(_matching_subtags.begin(), i);
- SetItemState (item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
- EnsureVisible (item);
- }
- } else {
- if (GetItemCount() > 0) {
- /* The new list sometimes isn't visible without this */
- EnsureVisible (0);
- }
- }
- }
-
- void set_search (string search)
- {
- if (search == "") {
- _matching_subtags = _all_subtags;
- } else {
- _matching_subtags.clear ();
-
- boost::algorithm::to_lower(search);
- for (auto const& i: _all_subtags) {
- if (
- (boost::algorithm::to_lower_copy(i.subtag).find(search) != string::npos) ||
- (boost::algorithm::to_lower_copy(i.description).find(search) != string::npos)) {
- _matching_subtags.push_back (i);
- }
- }
- }
-
- SetItemCount (_matching_subtags.size());
- if (GetItemCount() > 0) {
- RefreshItems (0, GetItemCount() - 1);
- }
- }
-
- optional<dcp::LanguageTag::SubtagData> selected_subtag () const
- {
- long int selected = GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (selected == -1) {
- return optional<dcp::LanguageTag::SubtagData>();
- }
-
- DCPOMATIC_ASSERT (static_cast<size_t>(selected) < _matching_subtags.size());
- return _matching_subtags[selected];
- }
-
-private:
- wxString OnGetItemText (long item, long column) const
- {
- if (column == 0) {
- return _matching_subtags[item].subtag;
- } else {
- return _matching_subtags[item].description;
- }
- }
-
- std::vector<dcp::LanguageTag::SubtagData> _all_subtags;
- std::vector<dcp::LanguageTag::SubtagData> _matching_subtags;
-};
-
-
-class LanguageSubtagPanel : public wxPanel
-{
-public:
- LanguageSubtagPanel (wxWindow* parent)
- : wxPanel (parent, wxID_ANY)
- {
-#ifdef __WXGTK3__
- int const height = 30;
-#else
- int const height = -1;
-#endif
-
- _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, height));
- _list = new SubtagListCtrl (this);
-
- wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
- sizer->Add (_search, 0, wxALL, 8);
- sizer->Add (_list, 1, wxALL, 8);
- SetSizer (sizer);
-
- _search->Bind (wxEVT_TEXT, boost::bind(&LanguageSubtagPanel::search_changed, this));
- _list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&LanguageSubtagPanel::selection_changed, this));
- _list->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&LanguageSubtagPanel::selection_changed, this));
- }
-
- void set (dcp::LanguageTag::SubtagType type, string search, optional<dcp::LanguageTag::SubtagData> subtag = optional<dcp::LanguageTag::SubtagData>())
- {
- _list->set (type, search, subtag);
- _search->SetValue (wxString(search));
- }
-
- optional<dcp::LanguageTag::RegionSubtag> get () const
- {
- if (!_list->selected_subtag()) {
- return {};
- }
-
- return dcp::LanguageTag::RegionSubtag(_list->selected_subtag()->subtag);
- }
-
- boost::signals2::signal<void (optional<dcp::LanguageTag::SubtagData>)> SelectionChanged;
- boost::signals2::signal<void (string)> SearchChanged;
-
-private:
- void search_changed ()
- {
- auto search = _search->GetValue();
- _list->set_search (search.ToStdString());
- if (search.Length() > 0) {
- _list->EnsureVisible (0);
- }
- SearchChanged (_search->GetValue().ToStdString());
- }
-
- void selection_changed ()
- {
- SelectionChanged (_list->selected_subtag());
- }
-
- wxSearchCtrl* _search;
- SubtagListCtrl* _list;
-};
-
-
-LanguageTagDialog::LanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag)
- : wxDialog (parent, wxID_ANY, "Language Tag", wxDefaultPosition, wxSize(-1, 500))
-{
- _current_tag_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER);
- _current_tag_list->AppendColumn ("", wxLIST_FORMAT_LEFT, 200);
- _current_tag_list->AppendColumn ("", wxLIST_FORMAT_LEFT, 400);
-
- wxBoxSizer* button_sizer = new wxBoxSizer (wxVERTICAL);
- _add_script = new wxButton(this, wxID_ANY, "Add script");
- button_sizer->Add (_add_script, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
- _add_region = new wxButton(this, wxID_ANY, "Add region");
- button_sizer->Add (_add_region, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
- _add_variant = new wxButton(this, wxID_ANY, "Add variant");
- button_sizer->Add (_add_variant, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
- _add_external = new wxButton(this, wxID_ANY, "Add external");
- button_sizer->Add (_add_external, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
- _remove = new wxButton(this, wxID_ANY, "Remove");
- button_sizer->Add (_remove, 0, wxTOP | wxBOTTOM | wxEXPAND, 2);
-
- _choose_subtag_panel = new LanguageSubtagPanel (this);
- _choose_subtag_panel->set (dcp::LanguageTag::SubtagType::LANGUAGE, "");
-
- wxBoxSizer* ltor_sizer = new wxBoxSizer (wxHORIZONTAL);
- ltor_sizer->Add (_current_tag_list, 1, wxALL, 8);
- ltor_sizer->Add (button_sizer, 0, wxALL, 8);
- ltor_sizer->Add (_choose_subtag_panel, 1, wxALL, 8);
-
- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- overall_sizer->Add (ltor_sizer, 0);
-
- wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
- if (buttons) {
- overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
- }
-
- SetSizerAndFit (overall_sizer);
-
- set (tag);
-
- _add_script->Bind (wxEVT_BUTTON, boost::bind(&LanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::SCRIPT, boost::optional<dcp::LanguageTag::SubtagData>()));
- _add_region->Bind (wxEVT_BUTTON, boost::bind(&LanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::REGION, boost::optional<dcp::LanguageTag::SubtagData>()));
- _add_variant->Bind (wxEVT_BUTTON, boost::bind(&LanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::VARIANT, boost::optional<dcp::LanguageTag::SubtagData>()));
- _add_external->Bind (wxEVT_BUTTON, boost::bind(&LanguageTagDialog::add_to_current_tag, this, dcp::LanguageTag::SubtagType::EXTLANG, boost::optional<dcp::LanguageTag::SubtagData>()));
- _remove->Bind (wxEVT_BUTTON, boost::bind(&LanguageTagDialog::remove_from_current_tag, this));
- _choose_subtag_panel->SelectionChanged.connect(bind(&LanguageTagDialog::chosen_subtag_changed, this, _1));
- _choose_subtag_panel->SearchChanged.connect(bind(&LanguageTagDialog::search_changed, this, _1));
- _current_tag_list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&LanguageTagDialog::current_tag_selection_changed, this));
- _current_tag_list->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&LanguageTagDialog::current_tag_selection_changed, this));
-}
-
-
-void
-LanguageTagDialog::remove_from_current_tag ()
-{
- long int selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (selected <= 0) {
- return;
- }
-
- _current_tag_subtags.erase (_current_tag_subtags.begin() + selected);
- _current_tag_list->DeleteItem (selected);
-
- _current_tag_list->SetItemState (min(selected, _current_tag_list->GetItemCount() - 1L), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-
- setup_sensitivity ();
- current_tag_selection_changed ();
-}
-
-
-dcp::LanguageTag LanguageTagDialog::get () const
-{
- dcp::LanguageTag tag;
-
- vector<dcp::LanguageTag::VariantSubtag> variants;
- vector<dcp::LanguageTag::ExtlangSubtag> extlangs;
-
- for (auto i: _current_tag_subtags) {
- if (!i.subtag) {
- continue;
- }
- switch (i.type) {
- case dcp::LanguageTag::SubtagType::LANGUAGE:
- tag.set_language (i.subtag->subtag);
- break;
- case dcp::LanguageTag::SubtagType::SCRIPT:
- tag.set_script (i.subtag->subtag);
- break;
- case dcp::LanguageTag::SubtagType::REGION:
- tag.set_region (i.subtag->subtag);
- break;
- case dcp::LanguageTag::SubtagType::VARIANT:
- variants.push_back (i.subtag->subtag);
- break;
- case dcp::LanguageTag::SubtagType::EXTLANG:
- extlangs.push_back (i.subtag->subtag);
- break;
- }
- }
-
- tag.set_variants (variants);
- tag.set_extlangs (extlangs);
- return tag;
-}
-
-
-void
-LanguageTagDialog::set (dcp::LanguageTag tag)
-{
- _current_tag_subtags.clear ();
- _current_tag_list->DeleteAllItems ();
-
- bool have_language = false;
- for (auto const& i: tag.subtags()) {
- add_to_current_tag (i.first, i.second);
- if (i.first == dcp::LanguageTag::SubtagType::LANGUAGE) {
- have_language = true;
- }
- }
-
- if (!have_language) {
- add_to_current_tag (dcp::LanguageTag::SubtagType::LANGUAGE, dcp::LanguageTag::SubtagData("en", "English"));
- }
-}
-
-
-string LanguageTagDialog::subtag_type_name (dcp::LanguageTag::SubtagType type)
-{
- switch (type) {
- case dcp::LanguageTag::SubtagType::LANGUAGE:
- return "Language";
- case dcp::LanguageTag::SubtagType::SCRIPT:
- return "Script";
- case dcp::LanguageTag::SubtagType::REGION:
- return "Region";
- case dcp::LanguageTag::SubtagType::VARIANT:
- return "Variant";
- case dcp::LanguageTag::SubtagType::EXTLANG:
- return "External";
- }
-
- return "";
-}
-
-
-void
-LanguageTagDialog::search_changed (string search)
-{
- long int selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (selected >= 0) {
- _current_tag_subtags[selected].last_search = search;
- }
-}
-
-
-void
-LanguageTagDialog::add_to_current_tag (dcp::LanguageTag::SubtagType type, optional<dcp::LanguageTag::SubtagData> subtag)
-{
- _current_tag_subtags.push_back (Subtag(type, subtag));
- wxListItem it;
- it.SetId (_current_tag_list->GetItemCount());
- it.SetColumn (0);
- it.SetText (subtag_type_name(type));
- _current_tag_list->InsertItem (it);
- it.SetColumn (1);
- if (subtag) {
- it.SetText (subtag->description);
- } else {
- it.SetText ("Select...");
- }
- _current_tag_list->SetItem (it);
- _current_tag_list->SetItemState (_current_tag_list->GetItemCount() - 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
- _choose_subtag_panel->set (type, "");
- setup_sensitivity ();
- current_tag_selection_changed ();
-}
-
-
-void
-LanguageTagDialog::current_tag_selection_changed ()
-{
- long int selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (selected >= 0) {
- _choose_subtag_panel->Enable (true);
- _choose_subtag_panel->set (_current_tag_subtags[selected].type, _current_tag_subtags[selected].last_search, _current_tag_subtags[selected].subtag);
- } else {
- _choose_subtag_panel->Enable (false);
- }
-}
-
-
-void
-LanguageTagDialog::chosen_subtag_changed (optional<dcp::LanguageTag::SubtagData> selection)
-{
- if (!selection) {
- return;
- }
-
- long int selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (selected >= 0) {
- _current_tag_subtags[selected].subtag = *selection;
- _current_tag_list->SetItem (selected, 0, subtag_type_name(_current_tag_subtags[selected].type));
- _current_tag_list->SetItem (selected, 1, selection->description);
- }
-
- setup_sensitivity ();
-}
-
-void
-LanguageTagDialog::setup_sensitivity ()
-{
- _add_script->Enable ();
- _add_region->Enable ();
- _add_variant->Enable ();
- _add_external->Enable ();
- for (auto const& i: _current_tag_subtags) {
- switch (i.type) {
- case dcp::LanguageTag::SubtagType::SCRIPT:
- _add_script->Enable (false);
- break;
- case dcp::LanguageTag::SubtagType::REGION:
- _add_region->Enable (false);
- break;
- case dcp::LanguageTag::SubtagType::VARIANT:
- _add_variant->Enable (false);
- break;
- case dcp::LanguageTag::SubtagType::EXTLANG:
- _add_external->Enable (false);
- break;
- default:
- break;
- }
- }
- long int selected = _current_tag_list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- _remove->Enable (selected > 0);
-}
-
-
-RegionSubtagDialog::RegionSubtagDialog (wxWindow* parent, dcp::LanguageTag::RegionSubtag region)
- : wxDialog (parent, wxID_ANY, _("Region"), wxDefaultPosition, wxSize(-1, 500))
- , _panel (new LanguageSubtagPanel (this))
-{
- wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
- sizer->Add (_panel, 1);
-
- wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
- if (buttons) {
- sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
- }
-
- SetSizer (sizer);
-
- _panel->set (dcp::LanguageTag::SubtagType::REGION, "", *dcp::LanguageTag::get_subtag_data(region));
-}
-
-
-optional<dcp::LanguageTag::RegionSubtag>
-RegionSubtagDialog::get () const
-{
- return _panel->get ();
-}
-
-
+++ /dev/null
-/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
-
- 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 <http://www.gnu.org/licenses/>.
-
-*/
-
-
-#ifndef DCPOMATIC_LANGUAGE_TAG_DIALOG_H
-#define DCPOMATIC_LANGUAGE_TAG_DIALOG_H
-
-
-#include "lib/warnings.h"
-#include <dcp/language_tag.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
-
-
-class wxListCtrl;
-class LanguageSubtagPanel;
-
-
-class LanguageTagDialog : public wxDialog
-{
-public:
- class Subtag
- {
- public:
- Subtag (dcp::LanguageTag::SubtagType type_, boost::optional<dcp::LanguageTag::SubtagData> subtag_)
- : type (type_)
- , subtag (subtag_)
- {}
-
- dcp::LanguageTag::SubtagType type;
- boost::optional<dcp::LanguageTag::SubtagData> subtag;
- std::string last_search;
- };
-
- LanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag = dcp::LanguageTag("en"));
-
- dcp::LanguageTag get () const;
- void set (dcp::LanguageTag tag);
-
-private:
-
- std::string subtag_type_name (dcp::LanguageTag::SubtagType type);
- void search_changed (std::string search);
- void add_to_current_tag (dcp::LanguageTag::SubtagType type, boost::optional<dcp::LanguageTag::SubtagData> subtag);
- void remove_from_current_tag ();
- void current_tag_selection_changed ();
- void chosen_subtag_changed (boost::optional<dcp::LanguageTag::SubtagData> selection);
- void setup_sensitivity ();
-
- std::vector<Subtag> _current_tag_subtags;
- wxListCtrl* _current_tag_list;
- LanguageSubtagPanel* _choose_subtag_panel;
- wxButton* _add_script;
- wxButton* _add_region;
- wxButton* _add_variant;
- wxButton* _add_external;
- wxButton* _remove;
-};
-
-
-
-class RegionSubtagDialog : public wxDialog
-{
-public:
- RegionSubtagDialog (wxWindow* parent, dcp::LanguageTag::RegionSubtag region);
-
- boost::optional<dcp::LanguageTag::RegionSubtag> get () const;
-
-private:
- LanguageSubtagPanel* _panel;
-};
-
-
-#endif
#include "dcpomatic_button.h"
-#include "language_tag_dialog.h"
+#include "full_language_tag_dialog.h"
#include "language_tag_widget.h"
#include "wx_util.h"
#include <wx/wx.h>
void
LanguageTagWidget::edit ()
{
- LanguageTagDialog* d = new LanguageTagDialog(_parent, _tag);
+ auto d = new FullLanguageTagDialog(_parent, _tag);
d->ShowModal ();
set (d->get());
Changed (d->get());
#include "content_version_dialog.h"
#include "editable_list.h"
-#include "language_tag_dialog.h"
+#include "full_language_tag_dialog.h"
#include "language_tag_widget.h"
#include "smpte_metadata_dialog.h"
#include "rating_dialog.h"
vector<EditableListColumn> columns;
columns.push_back (EditableListColumn("Language", 250, true));
- _additional_subtitle_languages = new EditableList<dcp::LanguageTag, LanguageTagDialog> (
+ _additional_subtitle_languages = new EditableList<dcp::LanguageTag, FullLanguageTagDialog> (
this,
columns,
boost::bind(&SMPTEMetadataDialog::additional_subtitle_languages, this),
*/
#include "editable_list.h"
-#include "language_tag_dialog.h"
+#include "full_language_tag_dialog.h"
#include "lib/film.h"
#include "lib/weak_film.h"
#include <dcp/language_tag.h>
LanguageTagWidget* _audio_language;
wxCheckBox* _enable_main_subtitle_language;
LanguageTagWidget* _main_subtitle_language;
- EditableList<dcp::LanguageTag, LanguageTagDialog>* _additional_subtitle_languages;
+ EditableList<dcp::LanguageTag, FullLanguageTagDialog>* _additional_subtitle_languages;
wxStaticText* _release_territory;
wxSpinCtrl* _version_number;
wxChoice* _status;
dkdm_output_panel.cc
drive_wipe_warning_dialog.cc
email_dialog.cc
+ full_language_tag_dialog.cc
image_sequence_dialog.cc
isdcf_metadata_dialog.cc
dcp_text_track_dialog.cc
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
projects / dcpomatic.git / commitdiff