Lots of #include <iostream>s for Arch.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index ca278a233fc5fe59b5d20df19209b2622486bf1b..66e37a4cf94d58225b199fa8a88cef93fe19de22 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,42 +19,38 @@
 
 #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)
-       : wxDialog (parent, wxID_ANY, std_to_wx (title))
+ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> certificate)
+       : TableDialog (parent, std_to_wx (title), 2, true)
        , _certificate (certificate)
 {
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
-       table->AddGrowableCol (1, 1);
+       add (_("Name"), true);
+       _name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
 
-       add_label_to_sizer (table, this, "Name", true);
-       _name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1));
-       table->Add (_name, 1, wxEXPAND);
+       add (_("Server manufacturer"), true);
+       _manufacturer = add (new wxChoice (this, wxID_ANY));
 
-       add_label_to_sizer (table, this, "Server manufacturer", true);
-       _manufacturer = new wxChoice (this, wxID_ANY);
-       table->Add (_manufacturer, 1, wxEXPAND);
-
-       add_label_to_sizer (table, this, _("Certificate"), true);
+       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);
-       table->Add (s, 1, wxEXPAND);
+       add (s);
 
-       table->AddSpacer (0);
+       add_spacer ();
        _certificate_text = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (320, 256), wxTE_MULTILINE | wxTE_READONLY);
        if (certificate) {
                _certificate_text->SetValue (certificate->certificate ());
@@ -62,19 +58,7 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
        wxFont font = wxSystemSettings::GetFont (wxSYS_ANSI_FIXED_FONT);
        font.SetPointSize (font.GetPointSize() / 2);
        _certificate_text->SetFont (font);
-       table->Add (_certificate_text, 1, wxEXPAND);
-
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-       
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-       }
-
-       SetSizer (overall_sizer);
-       overall_sizer->Layout ();
-       overall_sizer->SetSizeHints (this);
+       add (_certificate_text);
 
        _manufacturer->Append (_("Unknown"));
        _manufacturer->Append (_("Doremi"));
@@ -87,6 +71,7 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
        _manufacturer->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ScreenDialog::setup_sensitivity, this));
 
        setup_sensitivity ();
+       layout ();
 }
 
 string
@@ -95,7 +80,7 @@ ScreenDialog::name () const
        return wx_to_std (_name->GetValue());
 }
 
-shared_ptr<libdcp::Certificate>
+optional<dcp::Certificate>
 ScreenDialog::certificate () const
 {
        return _certificate;
@@ -105,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)"), e.what()));
        }
 }
 
@@ -129,22 +114,24 @@ ScreenDialog::download_certificate ()
 {
        if (_manufacturer->GetStringSelection() == _("Doremi")) {
                DownloadCertificateDialog* d = new DoremiCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1));
-               d->setup ();
                d->ShowModal ();
                d->Destroy ();
        } else if (_manufacturer->GetStringSelection() == _("Dolby")) {
                DownloadCertificateDialog* d = new DolbyCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1));
-               d->setup ();
                d->ShowModal ();
                d->Destroy ();
        }
+
+       setup_sensitivity ();
 }
 
 void
 ScreenDialog::setup_sensitivity ()
 {
        wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
-       ok->Enable (_certificate);
+       if (ok) {
+               ok->Enable (_certificate);
+       }
 
        _download_certificate->Enable (
                _manufacturer->GetStringSelection() == _("Doremi") ||