Provide correct parent to dialogue box to avoid z-order problems under OS X (part...

[dcpomatic.git] / src / wx / report_problem_dialog.cc

diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index ae9b1d3ed2f40fc007503aef5a22028c7d03dc98..7519259eb75457ef82024878d648b163db60e2d2 100644 (file)
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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/>.
 
 */
 
@@ -27,6 +28,7 @@
 using std::string;
 using boost::shared_ptr;
 
+/** @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)
@@ -49,7 +51,7 @@ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> fil
 #ifdef __WXOSX__
        flags |= wxALIGN_RIGHT;
        t += wxT (":");
-#endif 
+#endif
        wxStaticText* m = new wxStaticText (this, wxID_ANY, t);
        _table->Add (m, 1, flags, 6);
 
@@ -61,11 +63,34 @@ ReportProblemDialog::ReportProblemDialog (wxWindow* parent, shared_ptr<Film> fil
        _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;
+               }
+       }
+
+       wxStaticText* n = new wxStaticText (this, wxID_ANY, wxT (""));
+       n->SetLabelMarkup (out);
+       _table->AddSpacer (0);
+       _table->Add (n, 1, wxEXPAND);
+
        _overall_sizer->Layout ();
        _overall_sizer->SetSizeHints (this);
 }
@@ -78,5 +103,10 @@ ReportProblemDialog::report ()
                return;
        }
 
+       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 (shared_ptr<Job> (new SendProblemReportJob (_film, wx_to_std (_email->GetValue ()), wx_to_std (_summary->GetValue ()))));
 }