Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index b702ae0ad8188be5892108c5b8ebef9afee3157e..e312af9205b1dc24ebf940b14e520d957c847463 100644 (file)
--- 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
@@ -19,32 +19,33 @@
 
 #include <wx/filepicker.h>
 #include <wx/validate.h>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include "screen_dialog.h"
 #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<libdcp::Certificate> certificate)
-       : TableDialog (parent, std_to_wx (title), 2, true)
+ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> certificate)
+       : TableDialog (parent, std_to_wx (title), 2, 1, 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<libdcp::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 libdcp::Certificate (file));
+               _certificate = dcp::Certificate (dcp::file_to_string (file));
                _certificate_text->SetValue (_certificate->certificate ());
-       } catch (libdcp::MiscError& e) {
-               error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
+       } catch (dcp::MiscError& e) {
+               error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
        }
 }
 
@@ -128,7 +129,9 @@ void
 ScreenDialog::setup_sensitivity ()
 {
        wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
-       ok->Enable (_certificate);
+       if (ok) {
+               ok->Enable (static_cast<bool>(_certificate));
+       }
 
        _download_certificate->Enable (
                _manufacturer->GetStringSelection() == _("Doremi") ||