summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-05-04 00:19:00 +0200
committerCarl Hetherington <cth@carlh.net>2024-05-04 00:19:02 +0200
commitf8a0f78aaeb113cbf952d48b8d61bffc8bd2ee6d (patch)
tree35968a295f32a8bedd0e63ed7e548612bb606a30
parenta99a759f98c63c5bbe4f2c01dbcdee86d97f7f40 (diff)
Remove in-place translations support.
It feels like there have been too many failed attempts and not enough (maybe zero?) successes so it's just too confusing.
-rw-r--r--src/tools/dcpomatic.cc33
-rw-r--r--src/wx/send_i18n_dialog.cc82
-rw-r--r--src/wx/send_i18n_dialog.h50
-rw-r--r--src/wx/wscript1
4 files changed, 0 insertions, 166 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1b1ef0629..584ebd27d 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -47,7 +47,6 @@
#include "wx/report_problem_dialog.h"
#include "wx/save_template_dialog.h"
#include "wx/self_dkdm_dialog.h"
-#include "wx/send_i18n_dialog.h"
#include "wx/servers_list_dialog.h"
#include "wx/standard_controls.h"
#include "wx/system_information_dialog.h"
@@ -241,7 +240,6 @@ enum {
ID_tools_encoding_servers,
ID_tools_manage_templates,
ID_tools_check_for_updates,
- ID_tools_send_translations,
ID_tools_system_information,
ID_tools_restore_default_preferences,
ID_tools_export_preferences,
@@ -353,7 +351,6 @@ public:
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_manage_templates, this), ID_tools_manage_templates);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates);
- Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_send_translations, this), ID_tools_send_translations);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_system_information, this),ID_tools_system_information);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_restore_default_preferences, this), ID_tools_restore_default_preferences);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_export_preferences, this), ID_tools_export_preferences);
@@ -1107,35 +1104,6 @@ private:
UpdateChecker::instance()->run();
}
- void tools_send_translations ()
- {
- SendI18NDialog dialog(this);
- if (dialog.ShowModal() != wxID_OK) {
- return;
- }
-
- string body;
- body += dialog.name() + "\n";
- body += dialog.language() + "\n";
- body += string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n";
- body += "--\n";
- auto translations = I18NHook::translations ();
- for (auto i: translations) {
- body += i.first + "\n" + i.second + "\n\n";
- }
- if (dialog.email().find("@") == string::npos) {
- error_dialog (this, _("You must enter a valid email address when sending translations, "
- "otherwise the DCP-o-matic maintainers cannot credit you or contact you with questions."));
- } else {
- Email email(dialog.email(), { "carl@dcpomatic.com" }, "DCP-o-matic translations", body);
- try {
- email.send("main.carlh.net", 2525, EmailProtocol::STARTTLS);
- } catch (NetworkError& e) {
- error_dialog (this, _("Could not send translations"), std_to_wx(e.what()));
- }
- }
- }
-
void help_about ()
{
AboutDialog dialog(this);
@@ -1399,7 +1367,6 @@ private:
add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0);
add_item (tools, _("Manage templates..."), ID_tools_manage_templates, 0);
add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0);
- add_item (tools, _("Send translations..."), ID_tools_send_translations, 0);
add_item (tools, _("System information..."), ID_tools_system_information, 0);
tools->AppendSeparator ();
add_item (tools, _("Restore default preferences"), ID_tools_restore_default_preferences, ALWAYS);
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/wscript b/src/wx/wscript
index 9c6ea6b84..a6eefa69f 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -139,7 +139,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