X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=66e37a4cf94d58225b199fa8a88cef93fe19de22;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=0d46a46ec215dfc5f7de8cdaf89821d955bf3fe2;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 0d46a46ec..66e37a4cf 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,25 +26,26 @@
 #include "wx_util.h"
 #include "doremi_certificate_dialog.h"
 #include "dolby_certificate_dialog.h"
+#include <iostream>
 
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using boost::optional;
 
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<dcp::Certificate> certificate)
+ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> certificate)
 	: TableDialog (parent, std_to_wx (title), 2, true)
 	, _certificate (certificate)
 {
-	add ("Name", true);
+	add (_("Name"), true);
 	_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
 
-	add ("Server manufacturer", true);
+	add (_("Server manufacturer"), true);
 	_manufacturer = add (new wxChoice (this, wxID_ANY));
 
 	add (_("Certificate"), true);
 	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 	_load_certificate = new wxButton (this, wxID_ANY, _("Load from file..."));
-	_download_certificate = new wxButton (this, wxID_ANY, _("Download"));
+	_download_certificate = new wxButton (this, wxID_ANY, _("Download..."));
 	s->Add (_load_certificate, 1, wxEXPAND);
 	s->Add (_download_certificate, 1, wxEXPAND);
 	add (s);
@@ -79,7 +80,7 @@ ScreenDialog::name () const
 	return wx_to_std (_name->GetValue());
 }
 
-shared_ptr<dcp::Certificate>
+optional<dcp::Certificate>
 ScreenDialog::certificate () const
 {
 	return _certificate;
@@ -89,10 +90,10 @@ void
 ScreenDialog::load_certificate (boost::filesystem::path file)
 {
 	try {
-		_certificate.reset (new dcp::Certificate (file));
+		_certificate = dcp::Certificate (dcp::file_to_string (file));
 		_certificate_text->SetValue (_certificate->certificate ());
 	} catch (dcp::MiscError& e) {
-		error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
+		error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what()));
 	}
 }
 
@@ -128,7 +129,9 @@ void
 ScreenDialog::setup_sensitivity ()
 {
 	wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
-	ok->Enable (_certificate.get ());
+	if (ok) {
+		ok->Enable (_certificate);
+	}
 
 	_download_certificate->Enable (
 		_manufacturer->GetStringSelection() == _("Doremi") ||