/*
- 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
*/
-#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);
_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);
_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 ();
return wx_to_std (_name->GetValue());
}
-shared_ptr<dcp::Certificate>
+optional<dcp::Certificate>
ScreenDialog::certificate () const
{
return _certificate;
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, wxString::Format (_("Could not read certificate file (%s)"), e.what()));
+ error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
}
}
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 ();
}
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));
+ }
}