Rearrange cerficate download UI a bit.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 0d46a46ec215dfc5f7de8cdaf89821d955bf3fe2..02bbe96ea5786be93c7e78cb9fe03226a2fbde3c 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
@@ -17,34 +17,31 @@
 
 */
 
-#include <wx/filepicker.h>
-#include <wx/validate.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 "download_certificate_dialog.h"
+#include "lib/compose.hpp"
+#include "lib/util.h"
+#include <dcp/exceptions.h>
+#include <wx/filepicker.h>
+#include <wx/validate.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)
-       : 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);
-       _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);
@@ -59,15 +56,8 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
        _certificate_text->SetFont (font);
        add (_certificate_text);
 
-       _manufacturer->Append (_("Unknown"));
-       _manufacturer->Append (_("Doremi"));
-       _manufacturer->Append (_("Dolby"));
-       _manufacturer->Append (_("Other"));
-       _manufacturer->SetSelection (0);
-
        _load_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::select_certificate, this));
        _download_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_certificate, this));
-       _manufacturer->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ScreenDialog::setup_sensitivity, this));
 
        setup_sensitivity ();
        layout ();
@@ -79,7 +69,7 @@ ScreenDialog::name () const
        return wx_to_std (_name->GetValue());
 }
 
-shared_ptr<dcp::Certificate>
+optional<dcp::Certificate>
 ScreenDialog::certificate () const
 {
        return _certificate;
@@ -89,10 +79,10 @@ void
 ScreenDialog::load_certificate (boost::filesystem::path file)
 {
        try {
-               _certificate.reset (new dcp::Certificate (file));
-               _certificate_text->SetValue (_certificate->certificate ());
+               _certificate = dcp::Certificate (dcp::file_to_string (file));
+               _certificate_text->SetValue (std_to_wx (_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)"), std_to_wx(e.what()).data()));
        }
 }
 
@@ -111,16 +101,12 @@ ScreenDialog::select_certificate ()
 void
 ScreenDialog::download_certificate ()
 {
-       if (_manufacturer->GetStringSelection() == _("Doremi")) {
-               DownloadCertificateDialog* d = new DoremiCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1));
-               d->ShowModal ();
-               d->Destroy ();
-       } else if (_manufacturer->GetStringSelection() == _("Dolby")) {
-               DownloadCertificateDialog* d = new DolbyCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1));
-               d->ShowModal ();
-               d->Destroy ();
+       DownloadCertificateDialog* d = new DownloadCertificateDialog (this);
+       if (d->ShowModal() == wxID_OK) {
+               _certificate = d->certificate ();
+               _certificate_text->SetValue (std_to_wx (_certificate->certificate ()));
        }
-
+       d->Destroy ();
        setup_sensitivity ();
 }
 
@@ -128,10 +114,7 @@ void
 ScreenDialog::setup_sensitivity ()
 {
        wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
-       ok->Enable (_certificate.get ());
-
-       _download_certificate->Enable (
-               _manufacturer->GetStringSelection() == _("Doremi") ||
-               _manufacturer->GetStringSelection() == _("Dolby")
-               );
+       if (ok) {
+               ok->Enable (static_cast<bool>(_certificate));
+       }
 }