X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdownload_certificate_dialog.cc;h=627223c460d77d10c8b5d086645119db47efd343;hb=5e74e417e8b3d4e9773d0fad97cf11a5c4eeeccf;hp=a1209700166524051984049ced10917ff475f211;hpb=998b2eea5640cda23950ff6c5e24bd1f9ccb160f;p=dcpomatic.git diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc index a12097001..627223c46 100644 --- a/src/wx/download_certificate_dialog.cc +++ b/src/wx/download_certificate_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -22,8 +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; @@ -35,10 +38,10 @@ 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 wxStaticText (this, wxID_ANY, wxT ("")); + _message = new StaticText (this, wxT ("")); sizer->Add (_message, 0, wxALL, DCPOMATIC_SIZER_GAP); wxFont font = _message->GetFont(); font.SetStyle (wxFONTSTYLE_ITALIC); @@ -49,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); } @@ -67,6 +72,8 @@ DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent) _notebook->SetSelection (0); + SetMinSize (wxSize(640, -1)); + setup_sensitivity (); } @@ -101,7 +108,8 @@ DownloadCertificateDialog::setup_sensitivity () } void -DownloadCertificateDialog::page_changed (wxNotebookEvent &) +DownloadCertificateDialog::page_changed (wxNotebookEvent& ev) { setup_sensitivity (); + ev.Skip (); }