projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
wx
/
download_certificate_dialog.cc
diff --git
a/src/wx/download_certificate_dialog.cc
b/src/wx/download_certificate_dialog.cc
index 5a621d26fafbf614e05da44a1241f9266f87cf19..e18723a4a08213a4e59e42c0431b592a8393e5ba 100644
(file)
--- a/
src/wx/download_certificate_dialog.cc
+++ b/
src/wx/download_certificate_dialog.cc
@@
-1,27
+1,29
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include "doremi_certificate_panel.h"
-#include "dolby_certificate_panel.h"
+#include "dolby_doremi_certificate_panel.h"
#include "download_certificate_dialog.h"
#include "wx_util.h"
#include "download_certificate_dialog.h"
#include "wx_util.h"
+using boost::optional;
+
DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Download certificate"))
{
DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Download certificate"))
{
@@
-30,12
+32,9
@@
DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
_notebook = new wxNotebook (this, wxID_ANY);
sizer->Add (_notebook, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
_notebook = new wxNotebook (this, wxID_ANY);
sizer->Add (_notebook, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
- _pages.push_back (new DoremiCertificatePanel (_notebook, this));
- _setup.push_back (false);
- _notebook->AddPage (_pages.back(), _("Doremi"), true);
- _pages.push_back (new DolbyCertificatePanel (_notebook, this));
+ _pages.push_back (new DolbyDoremiCertificatePanel (_notebook, this));
_setup.push_back (false);
_setup.push_back (false);
- _notebook->AddPage (_pages.back(), _("Dolby
"), fals
e);
+ _notebook->AddPage (_pages.back(), _("Dolby
/ Doremi"), tru
e);
_download = new wxButton (this, wxID_ANY, _("Download"));
sizer->Add (_download, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
_download = new wxButton (this, wxID_ANY, _("Download"));
sizer->Add (_download, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
@@
-54,11
+53,17
@@
DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
SetSizerAndFit (sizer);
SetSizerAndFit (sizer);
- _notebook->Bind (wxEVT_NOTEBOOK_PAGE_CHANGED,
boost::bind (&DownloadCertificateDialog::page_changed, this)
);
- _download->Bind (wxEVT_
COMMAND_BUTTON_CLICKED
, boost::bind (&DownloadCertificateDialog::download, this));
+ _notebook->Bind (wxEVT_NOTEBOOK_PAGE_CHANGED,
&DownloadCertificateDialog::page_changed, this
);
+ _download->Bind (wxEVT_
BUTTON
, boost::bind (&DownloadCertificateDialog::download, this));
_download->Enable (false);
_download->Enable (false);
- page_changed ();
+ wxNotebookEvent ev;
+ page_changed (ev);
+}
+
+DownloadCertificateDialog::~DownloadCertificateDialog ()
+{
+ _notebook->Unbind (wxEVT_NOTEBOOK_PAGE_CHANGED, &DownloadCertificateDialog::page_changed, this);
}
void
}
void
@@
-70,21
+75,31
@@
DownloadCertificateDialog::download ()
dcp::Certificate
DownloadCertificateDialog::certificate () const
{
dcp::Certificate
DownloadCertificateDialog::certificate () const
{
- return _pages[_notebook->GetSelection()]->certificate ();
+ optional<dcp::Certificate> c = _pages[_notebook->GetSelection()]->certificate ();
+ DCPOMATIC_ASSERT (c);
+ return c.get ();
}
void
DownloadCertificateDialog::setup_sensitivity ()
{
}
void
DownloadCertificateDialog::setup_sensitivity ()
{
- _download->Enable (_pages[_notebook->GetSelection()]->ready_to_download ());
+ DownloadCertificatePanel* p = _pages[_notebook->GetSelection()];
+ _download->Enable (p->ready_to_download ());
+ wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
+ if (ok) {
+ ok->Enable (static_cast<bool>(p->certificate ()));
+ }
+
}
void
}
void
-DownloadCertificateDialog::page_changed ()
+DownloadCertificateDialog::page_changed (
wxNotebookEvent &
)
{
int const n = _notebook->GetSelection();
if (!_setup[n]) {
_pages[n]->setup ();
_setup[n] = true;
}
{
int const n = _notebook->GetSelection();
if (!_setup[n]) {
_pages[n]->setup ();
_setup[n] = true;
}
+
+ setup_sensitivity ();
}
}