Merge master.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 910dece9d0dcc9a05c48b7055c5bb99f79e7b9dc..f94400be7fed94ff873601d5f7740a714fe41089 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -19,7 +19,7 @@
 
 #include <wx/filepicker.h>
 #include <wx/validate.h>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "lib/compose.hpp"
 #include "screen_dialog.h"
 #include "wx_util.h"
@@ -28,18 +28,18 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<libdcp::Certificate> certificate)
+ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<dcp::Certificate> certificate)
        : wxDialog (parent, wxID_ANY, std_to_wx (title))
        , _certificate (certificate)
 {
        wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
        table->AddGrowableCol (1, 1);
 
-       add_label_to_sizer (table, this, "Name");
+       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");
+       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);
 
@@ -65,7 +65,9 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
 
-       _certificate_load->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ScreenDialog::load_certificate), 0, this);
+       _certificate_load->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::load_certificate, this));
+
+       setup_sensitivity ();
 }
 
 string
@@ -74,24 +76,34 @@ ScreenDialog::name () const
        return wx_to_std (_name->GetValue());
 }
 
-shared_ptr<libdcp::Certificate>
+shared_ptr<dcp::Certificate>
 ScreenDialog::certificate () const
 {
        return _certificate;
 }
 
 void
-ScreenDialog::load_certificate (wxCommandEvent &)
+ScreenDialog::load_certificate ()
 {
        wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
-       d->ShowModal ();
-       
-       try {
-               _certificate.reset (new libdcp::Certificate (wx_to_std (d->GetPath ())));
-               _certificate_text->SetValue (_certificate->certificate ());
-       } catch (libdcp::MiscError& e) {
-               error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
-       }
 
+       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()));
+               }
+       }
+       
        d->Destroy ();
+
+       setup_sensitivity ();
+}
+
+void
+ScreenDialog::setup_sensitivity ()
+{
+       wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
+       ok->Enable (_certificate);
 }