projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Draw subtitle content in the timeline.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.cc
diff --git
a/src/wx/screen_dialog.cc
b/src/wx/screen_dialog.cc
index 6584e1ad6e92ba1b8a04a34ab761efdfa332b03b..89249645a5153009c2b0e26530561a4ce7e837d8 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 <wx/filepicker.h>
#include <wx/validate.h>
-#include <
lib
dcp/exceptions.h>
+#include <dcp/exceptions.h>
#include "lib/compose.hpp"
#include "screen_dialog.h"
#include "wx_util.h"
#include "lib/compose.hpp"
#include "screen_dialog.h"
#include "wx_util.h"
@@
-28,7
+28,7
@@
using std::string;
using std::cout;
using boost::shared_ptr;
using std::cout;
using boost::shared_ptr;
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<
lib
dcp::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)
{
: wxDialog (parent, wxID_ANY, std_to_wx (title))
, _certificate (certificate)
{
@@
-65,7
+65,9
@@
ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
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
}
string
@@
-74,25
+76,34
@@
ScreenDialog::name () const
return wx_to_std (_name->GetValue());
}
return wx_to_std (_name->GetValue());
}
-shared_ptr<
lib
dcp::Certificate>
+shared_ptr<dcp::Certificate>
ScreenDialog::certificate () const
{
return _certificate;
}
void
ScreenDialog::certificate () const
{
return _certificate;
}
void
-ScreenDialog::load_certificate (
wxCommandEvent &
)
+ScreenDialog::load_certificate ()
{
wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
if (d->ShowModal () == wxID_OK) {
try {
{
wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
if (d->ShowModal () == wxID_OK) {
try {
- _certificate.reset (new
lib
dcp::Certificate (boost::filesystem::path (wx_to_std (d->GetPath ()))));
+ _certificate.reset (new dcp::Certificate (boost::filesystem::path (wx_to_std (d->GetPath ()))));
_certificate_text->SetValue (_certificate->certificate ());
_certificate_text->SetValue (_certificate->certificate ());
- } catch (
lib
dcp::MiscError& e) {
+ } catch (dcp::MiscError& e) {
error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
}
}
d->Destroy ();
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.get ());
}
}