X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Femail_dialog.cc;h=65fb47473f1cccd40d0bd1f584722168234dcef1;hb=469a5dbd4251b094e6d4b668a763568c25947b88;hp=fa9e319f607d31306be5c47c684000868a670f73;hpb=df89a39cfd34d0d70609daa214d3b618bb6223bd;p=dcpomatic.git

diff --git a/src/wx/email_dialog.cc b/src/wx/email_dialog.cc
index fa9e319f6..65fb47473 100644
--- a/src/wx/email_dialog.cc
+++ b/src/wx/email_dialog.cc
@@ -1,45 +1,60 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-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 "email_dialog.h"
 #include "wx_util.h"
 
+
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using boost::optional;
+
 
 EmailDialog::EmailDialog (wxWindow* parent)
 	: TableDialog (parent, _("Email address"), 2, 1, true)
 {
 	add (_("Email address"), true);
-	_email = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (400, -1)));
+	_email = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(400, -1)));
 
 	layout ();
+
+	_email->SetFocus ();
 }
 
+
 void
 EmailDialog::set (string address)
 {
-	_email->SetValue (std_to_wx (address));
+	_email->SetValue (std_to_wx(address));
 }
 
-string
+
+optional<string>
 EmailDialog::get () const
 {
-	return wx_to_std (_email->GetValue ());
+	auto s = wx_to_std (_email->GetValue ());
+	if (s.empty()) {
+		/* Invalid email address */
+		return {};
+	}
+
+	return s;
 }