/*
- Copyright (C) 2012 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 "screen_dialog.h"
#include "wx_util.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)
- : 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, 1, true)
, _certificate (certificate)
{
- wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
- table->AddGrowableCol (1, 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_label_to_sizer (table, this, "Certificate", true);
- _certificate_load = new wxButton (this, wxID_ANY, wxT ("Load from file..."));
- table->Add (_certificate_load, 1, wxEXPAND);
-
- table->AddSpacer (0);
+ add (_("Name"), true);
+ _name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
+
+ 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..."));
+ s->Add (_load_certificate, 1, wxEXPAND);
+ s->Add (_download_certificate, 1, wxEXPAND);
+ add (s);
+
+ 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 ());
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);
- _certificate_load->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::load_certificate, this));
+ _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));
setup_sensitivity ();
+ layout ();
}
string
return wx_to_std (_name->GetValue());
}
-shared_ptr<dcp::Certificate>
+optional<dcp::Certificate>
ScreenDialog::certificate () const
{
return _certificate;
}
void
-ScreenDialog::load_certificate ()
+ScreenDialog::load_certificate (boost::filesystem::path file)
{
- wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
+ try {
+ _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)"), std_to_wx(e.what()).data()));
+ }
+}
+void
+ScreenDialog::select_certificate ()
+{
+ wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
if (d->ShowModal () == wxID_OK) {
- try {
- _certificate.reset (new dcp::Certificate (boost::filesystem::path (wx_to_std (d->GetPath ()))));
- _certificate_text->SetValue (_certificate->certificate ());
- } catch (dcp::MiscError& e) {
- error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
- }
+ load_certificate (boost::filesystem::path (wx_to_std (d->GetPath ())));
}
-
d->Destroy ();
setup_sensitivity ();
}
+void
+ScreenDialog::download_certificate ()
+{
+ 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 ();
+}
+
void
ScreenDialog::setup_sensitivity ()
{
wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
- ok->Enable (_certificate);
+ if (ok) {
+ ok->Enable (static_cast<bool>(_certificate));
+ }
}