X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Freport_problem_dialog.cc;h=5497908ca69b413336412bb52530ad9fe2be7a4b;hp=78c092921ce5d62db81c905207dbd896bcf4dc5f;hb=be436f229587905e89ac768b3c57b0e983cfe7fa;hpb=009e4abb14cfcaecc0de8fab179adc7bd5feffd4

diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index 78c092921..5497908ca 100644
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -1,32 +1,42 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
+#include "check_box.h"
 #include "report_problem_dialog.h"
+#include "static_text.h"
 #include "wx_util.h"
 #include "lib/config.h"
 #include "lib/job_manager.h"
 #include "lib/send_problem_report_job.h"
 #include <wx/sizer.h>
 
+
+using std::make_shared;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+
 
+/** @param parent Parent window.
+ *  @param film Film that we are working on, or 0.
+ */
 ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> film)
 	: wxDialog (parent, wxID_ANY, _("Report A Problem"))
 	, _film (film)
@@ -39,46 +49,76 @@ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> fil
 
 	_overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
 	if (buttons) {
 		_overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	wxString t = _("My problem is");
+	auto t = _("My problem is");
 	int flags = wxALIGN_TOP | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
-	if (left) {
-		flags |= wxALIGN_RIGHT;
-		t += wxT (":");
-	}
-#endif	
-	wxStaticText* m = new wxStaticText (this, wxID_ANY, t);
+	flags |= wxALIGN_RIGHT;
+	t += wxT (":");
+#endif
+	auto m = new StaticText (this, t);
 	_table->Add (m, 1, flags, 6);
 
-	_summary = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (320, 240), wxTE_MULTILINE);
+	_summary = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(320, 240), wxTE_MULTILINE);
 	_table->Add (_summary, 1, wxEXPAND | wxALIGN_TOP);
 
-	_send_logs = new wxCheckBox (this, wxID_ANY, _("Send logs"));
+	_send_logs = new CheckBox (this, _("Send logs"));
 	_send_logs->SetValue (true);
 	_table->Add (_send_logs, 1, wxEXPAND);
 	_table->AddSpacer (0);
 
-	add_label_to_sizer (_table, this, _("Contact email"), true);
+	add_label_to_sizer (_table, this, _("Your email address"), true);
 	_email = new wxTextCtrl (this, wxID_ANY, wxT (""));
 	_email->SetValue (std_to_wx (Config::instance()->kdm_from ()));
 	_table->Add (_email, 1, wxEXPAND);
 
+	/* We can't use Wrap() here as it doesn't work with markup:
+	 * http://trac.wxwidgets.org/ticket/13389
+	 */
+
+	wxString in = _("<i>It is important that you enter a valid email address here, otherwise I can't ask you for more details on your problem.</i>");
+	wxString out;
+	int const width = 45;
+	int current = 0;
+	for (size_t i = 0; i < in.Length(); ++i) {
+		if (in[i] == ' ' && current >= width) {
+			out += '\n';
+			current = 0;
+		} else {
+			out += in[i];
+			++current;
+		}
+	}
+
+	auto n = new StaticText (this, wxT(""));
+	n->SetLabelMarkup (out);
+	_table->AddSpacer (0);
+	_table->Add (n, 1, wxEXPAND);
+
 	_overall_sizer->Layout ();
 	_overall_sizer->SetSizeHints (this);
+
+	_summary->SetFocus ();
 }
 
+
 void
 ReportProblemDialog::report ()
 {
-	if (_email->GetValue().IsEmpty ()) {
+	if (_email->GetValue().IsEmpty()) {
 		error_dialog (this, _("Please enter an email address so that we can contact you with any queries about the problem."));
 		return;
 	}
 
-	JobManager::instance()->add (shared_ptr<Job> (new SendProblemReportJob (_film, wx_to_std (_email->GetValue ()), wx_to_std (_summary->GetValue ()))));
+	if (_email->GetValue() == "carl@dcpomatic.com" || _email->GetValue() == "cth@carlh.net") {
+		error_dialog (this, wxString::Format(_("Enter your email address for the contact, not %s"), _email->GetValue().data()));
+		return;
+	}
+
+	JobManager::instance()->add (make_shared<SendProblemReportJob>(_film, wx_to_std(_email->GetValue()), wx_to_std(_summary->GetValue())));
 }
+