Merge remote-tracking branch 'origin/main' into v2.17.x

4 files changed, 2 insertions, 133 deletions

diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc
deleted file mode 100644
index 6efcf993c..000000000
--- a/src/wx/send_i18n_dialog.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (C) 2018-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 "i18n_hook.h"
-#include "send_i18n_dialog.h"
-#include "wx_util.h"
-#include <dcp/warnings.h>
-LIBDCP_DISABLE_WARNINGS
-#include <wx/listctrl.h>
-LIBDCP_ENABLE_WARNINGS
-
-
-using std::string;
-using std::map;
-
-
-SendI18NDialog::SendI18NDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("Send translations"))
-{
-	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
-
-	auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-
-	add_label_to_sizer (table, this, _("Your name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-	_name = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_name, 0, wxEXPAND);
-
-	add_label_to_sizer (table, this, _("Your email"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-	_email = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_email, 0, wxEXPAND);
-
-	add_label_to_sizer (table, this, _("Language"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-	_language = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_language, 0, wxEXPAND);
-
-	auto list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(800, -1), wxLC_REPORT | wxLC_NO_HEADER);
-	list->AppendColumn(wxT(""), wxLIST_FORMAT_LEFT, 400);
-	list->AppendColumn(wxT(""), wxLIST_FORMAT_LEFT, 400);
-
-	auto translations = I18NHook::translations ();
-	int N = 0;
-	for (auto const& i: translations) {
-		wxListItem it;
-		it.SetId(N);
-		it.SetColumn(0);
-		it.SetText(std_to_wx(i.first));
-		list->InsertItem(it);
-		it.SetColumn(1);
-		it.SetText(std_to_wx(i.second));
-		list->SetItem(it);
-		++N;
-	}
-
-	overall_sizer->Add (table, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
-	overall_sizer->Add (list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
-
-	auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizerAndFit (overall_sizer);
-}
diff --git a/src/wx/send_i18n_dialog.h b/src/wx/send_i18n_dialog.h
deleted file mode 100644
index 4651fb811..000000000
--- a/src/wx/send_i18n_dialog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (C) 2018 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 "wx_util.h"
-#include <dcp/warnings.h>
-LIBDCP_DISABLE_WARNINGS
-#include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
-
-
-class SendI18NDialog : public wxDialog
-{
-public:
-	SendI18NDialog (wxWindow* parent);
-
-	std::string name () {
-		return wx_to_std (_name->GetValue());
-	}
-
-	std::string email () {
-		return wx_to_std (_email->GetValue());
-	}
-
-	std::string language () {
-		return wx_to_std (_language->GetValue());
-	}
-
-private:
-	wxTextCtrl* _name;
-	wxTextCtrl* _email;
-	wxTextCtrl* _language;
-};
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index b39dbd5dc..374beb656 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -687,6 +687,7 @@ supported_by.Add (wxT ("Daniel Martinez Lara"));
 supported_by.Add (wxT ("Gabriel Montagné Láscaris-Comneno"));
 supported_by.Add (wxT ("Marga Laube"));
 supported_by.Add (wxT ("James Lauchlan"));
+supported_by.Add (wxT ("Luc Lavergne"));
 supported_by.Add (wxT ("Nicholas Lavigne"));
 supported_by.Add (wxT ("Philip Lawrence"));
 supported_by.Add (wxT ("David Lawrence"));
@@ -961,6 +962,7 @@ supported_by.Add (wxT ("Jason Phelps"));
 supported_by.Add (wxT ("John Phillips"));
 supported_by.Add (wxT ("Nat Phong"));
 supported_by.Add (wxT ("Phonotone"));
+supported_by.Add (wxT ("Kari Layland Photography"));
 supported_by.Add (wxT ("MelRish Photos And Films"));
 supported_by.Add (wxT ("Paolo Piccioli"));
 supported_by.Add (wxT ("Peccadillo Pictures"));
diff --git a/src/wx/wscript b/src/wx/wscript
index a41e3827e..bdae9708e 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -151,7 +151,6 @@ sources = """
           screen_dialog.cc
           screens_panel.cc
           self_dkdm_dialog.cc
-          send_i18n_dialog.cc
           send_test_email_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc