- table->Add (_remake_certificates, 0);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, _panel, _("Private key for leaf certificate"), true);
- {
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _signer_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
- wxFont font = _signer_private_key->GetFont ();
- font.SetFamily (wxFONTFAMILY_TELETYPE);
- _signer_private_key->SetFont (font);
- s->Add (_signer_private_key, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
- _load_signer_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
- s->Add (_load_signer_private_key, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
- table->Add (s, 0);
- }
-
- add_label_to_sizer (table, _panel, _("Certificate for decrypting DCPs"), true);
- {
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _decryption_certificate = new wxStaticText (_panel, wxID_ANY, wxT (""));
- wxFont font = _decryption_certificate->GetFont ();
- font.SetFamily (wxFONTFAMILY_TELETYPE);
- _decryption_certificate->SetFont (font);
- s->Add (_decryption_certificate, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
- _load_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Load..."));
- s->Add (_load_decryption_certificate, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
- table->Add (s, 0);
- }
-
- add_label_to_sizer (table, _panel, _("Private key for decrypting DCPs"), true);
- {
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _decryption_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
- wxFont font = _decryption_private_key->GetFont ();
- font.SetFamily (wxFONTFAMILY_TELETYPE);
- _decryption_private_key->SetFont (font);
- s->Add (_decryption_private_key, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
- _load_decryption_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
- s->Add (_load_decryption_private_key, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
- table->Add (s, 0);
- }
+ table->Add (_remake_certificates, wxGBPosition (r, 0), wxGBSpan (1, 3));
+ ++r;
+
+ add_label_to_grid_bag_sizer (table, _panel, _("Private key for leaf certificate"), true, wxGBPosition (r, 0));
+ _signer_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
+ wxFont font = _signer_private_key->GetFont ();
+ font.SetFamily (wxFONTFAMILY_TELETYPE);
+ _signer_private_key->SetFont (font);
+ table->Add (_signer_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ _load_signer_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
+ table->Add (_load_signer_private_key, wxGBPosition (r, 2));
+ ++r;
+
+ add_label_to_grid_bag_sizer (table, _panel, _("Certificate for decrypting DCPs"), true, wxGBPosition (r, 0));
+ _decryption_certificate = new wxStaticText (_panel, wxID_ANY, wxT (""));
+ _decryption_certificate->SetFont (font);
+ table->Add (_decryption_certificate, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ _load_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Load..."));
+ table->Add (_load_decryption_certificate, wxGBPosition (r, 2));
+ ++r;
+
+ add_label_to_grid_bag_sizer (table, _panel, _("Private key for decrypting DCPs"), true, wxGBPosition (r, 0));
+ _decryption_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
+ _decryption_private_key->SetFont (font);
+ table->Add (_decryption_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ _load_decryption_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
+ table->Add (_load_decryption_private_key, wxGBPosition (r, 2));
+ ++r;