projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ec476b
)
Remove pointless subheading in Keys->Advanced dialogues and improve spacing in the...
author
Carl Hetherington
<cth@carlh.net>
Sat, 11 Jul 2020 22:43:50 +0000
(
00:43
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 11 Jul 2020 22:43:50 +0000
(
00:43
+0200)
src/wx/config_dialog.cc
patch
|
blob
|
history
diff --git
a/src/wx/config_dialog.cc
b/src/wx/config_dialog.cc
index 85ff0a9a3361efd9d5a3d3f72850a15288aeb309..0ad7bfffaaa7555bc7d4d3f2294840ab0a8cf7fc 100644
(file)
--- a/
src/wx/config_dialog.cc
+++ b/
src/wx/config_dialog.cc
@@
-262,19
+262,10
@@
CertificateChainEditor::CertificateChainEditor (
, _get (get)
, _nag_alter (nag_alter)
{
, _get (get)
, _nag_alter (nag_alter)
{
- wxFont subheading_font (*wxNORMAL_FONT);
- subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
-
_sizer = new wxBoxSizer (wxVERTICAL);
_sizer = new wxBoxSizer (wxVERTICAL);
- {
- wxStaticText* m = new StaticText (this, title);
- m->SetFont (subheading_font);
- _sizer->Add (m, 0, wxALL, border);
- }
-
wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
- _sizer->Add (certificates_sizer, 0, wx
LEFT | wxRIGHT
, border);
+ _sizer->Add (certificates_sizer, 0, wx
ALL
, border);
_certificates = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (440, 150), wxLC_REPORT | wxLC_SINGLE_SEL);
_certificates = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (440, 150), wxLC_REPORT | wxLC_SINGLE_SEL);
@@
-690,14
+681,18
@@
KeysPage::setup ()
sizer->Add (m, 0, wxALL, _border);
}
sizer->Add (m, 0, wxALL, _border);
}
+ wxSizer* buttons = new wxBoxSizer (wxVERTICAL);
+
wxButton* export_decryption_certificate = new Button (_panel, _("Export KDM decryption certificate..."));
wxButton* export_decryption_certificate = new Button (_panel, _("Export KDM decryption certificate..."));
-
sizer->Add (export_decryption_certificate, 0, wxLEFT, _border
);
+
buttons->Add (export_decryption_certificate, 0, wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP
);
wxButton* export_settings = new Button (_panel, _("Export all KDM decryption settings..."));
wxButton* export_settings = new Button (_panel, _("Export all KDM decryption settings..."));
-
sizer->Add (export_settings, 0, wxLEFT, _border
);
+
buttons->Add (export_settings, 0, wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP
);
wxButton* import_settings = new Button (_panel, _("Import all KDM decryption settings..."));
wxButton* import_settings = new Button (_panel, _("Import all KDM decryption settings..."));
-
sizer->Add (import_settings, 0, wxLEFT, _border
);
+
buttons->Add (import_settings, 0, wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP
);
wxButton* decryption_advanced = new Button (_panel, _("Advanced..."));
wxButton* decryption_advanced = new Button (_panel, _("Advanced..."));
- sizer->Add (decryption_advanced, 0, wxALL, _border);
+ buttons->Add (decryption_advanced, 0);
+
+ sizer->Add (buttons, 0, wxLEFT, _border);
export_decryption_certificate->Bind (wxEVT_BUTTON, bind (&KeysPage::export_decryption_certificate, this));
export_settings->Bind (wxEVT_BUTTON, bind (&KeysPage::export_decryption_chain_and_key, this));
export_decryption_certificate->Bind (wxEVT_BUTTON, bind (&KeysPage::export_decryption_certificate, this));
export_settings->Bind (wxEVT_BUTTON, bind (&KeysPage::export_decryption_chain_and_key, this));