BOOST_FOREACH.

[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 21a675ac70c0b74ae7d886d4e9c2a2d7ccd86470..627223c460d77d10c8b5d086645119db47efd343 100644 (file)
--- a/src/wx/download_certificate_dialog.cc
+++ b/src/wx/download_certificate_dialog.cc
@@ -22,9 +22,11 @@
 #include "barco_alchemy_certificate_panel.h"
 #include "christie_certificate_panel.h"
 #include "gdc_certificate_panel.h"
+#include "qube_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "static_text.h"
 #include "wx_util.h"
+#include "dcpomatic_button.h"
 
 using boost::optional;
 
@@ -36,7 +38,7 @@ DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
        _notebook = new wxNotebook (this, wxID_ANY);
        sizer->Add (_notebook, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-       _download = new wxButton (this, wxID_ANY, _("Download"));
+       _download = new Button (this, _("Download"));
        sizer->Add (_download, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
 
        _message = new StaticText (this, wxT (""));
@@ -50,8 +52,10 @@ DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
        _pages.push_back (new BarcoAlchemyCertificatePanel (this));
        _pages.push_back (new ChristieCertificatePanel (this));
        _pages.push_back (new GDCCertificatePanel (this));
+       _pages.push_back (new QubeCertificatePanel (this, N_("QXI")));
+       _pages.push_back (new QubeCertificatePanel (this, N_("QXPD")));
 
-       BOOST_FOREACH (DownloadCertificatePanel* i, _pages) {
+       for (auto i: _pages) {
                _notebook->AddPage (i, i->name(), true);
        }
 
@@ -68,6 +72,8 @@ DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
 
        _notebook->SetSelection (0);
 
+       SetMinSize (wxSize(640, -1));
+
        setup_sensitivity ();
 }
 
@@ -102,7 +108,8 @@ DownloadCertificateDialog::setup_sensitivity ()
 }
 
 void
-DownloadCertificateDialog::page_changed (wxNotebookEvent &)
+DownloadCertificateDialog::page_changed (wxNotebookEvent& ev)
 {
        setup_sensitivity ();
+       ev.Skip ();
 }