X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Freport_problem_dialog.cc;h=13ddb0539f31f86f50de4b9b67db73c04cda2c15;hb=e72a69ac2ebf24df05ba4b6de65bfa338a58b0ec;hp=68411ee917144f98a5f16879a9a5be360d95c81a;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index 68411ee91..13ddb0539 100644
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,25 @@
 
 */
 
+
+#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 film Film that we are working on, or 0 */
+/** @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)
@@ -41,29 +49,29 @@ 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__
 	flags |= wxALIGN_RIGHT;
 	t += wxT (":");
 #endif
-	wxStaticText* m = new wxStaticText (this, wxID_ANY, t);
+	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, 0, wxALIGN_CENTRE_VERTICAL);
 	_email = new wxTextCtrl (this, wxID_ANY, wxT (""));
 	_email->SetValue (std_to_wx (Config::instance()->kdm_from ()));
 	_table->Add (_email, 1, wxEXPAND);
@@ -86,22 +94,31 @@ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> fil
 		}
 	}
 
-	wxStaticText* n = new wxStaticText (this, wxID_ANY, wxT (""));
+	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())));
 }
+