diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-10 15:44:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-10 15:44:24 +0100 |
| commit | f4030653da8f5a0b3daebe640f485b3daf9ef091 (patch) | |
| tree | 88c2780c466d326bdb41db4d5c49699eb7abc2fe /src | |
| parent | 8acd8bd6fe321bfb848c16e9357991bc1fad87a9 (diff) | |
| parent | 1deb6103acac71dd2b6da5b95dc25bea053ffc8b (diff) | |
Merge remote-tracking branch 'origin/master' into 2.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/config_dialog.cc | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index c1ea926ea..fa7ccf7cc 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1117,18 +1117,26 @@ public: table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL); table->AddSpacer (0); - add_label_to_sizer (table, panel, _("Log"), true); - _log_general = new wxCheckBox (panel, wxID_ANY, _("General")); - table->Add (_log_general, 1, wxEXPAND | wxALL); - _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings")); - table->AddSpacer (0); - table->Add (_log_warning, 1, wxEXPAND | wxALL); - _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors")); - table->AddSpacer (0); - table->Add (_log_error, 1, wxEXPAND | wxALL); - _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing")); - table->AddSpacer (0); - table->Add (_log_timing, 1, wxEXPAND | wxALL); + int flags = wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL; +#ifdef __WXOSX__ + flags |= wxALIGN_RIGHT; + t += wxT (":"); +#endif + wxStaticText* m = new wxStaticText (panel, wxID_ANY, _("Log")); + table->Add (m, 0, flags, 6); + + { + wxBoxSizer* t = new wxBoxSizer (wxVERTICAL); + _log_general = new wxCheckBox (panel, wxID_ANY, _("General")); + t->Add (_log_general, 1, wxEXPAND | wxALL); + _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings")); + t->Add (_log_warning, 1, wxEXPAND | wxALL); + _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors")); + t->Add (_log_error, 1, wxEXPAND | wxALL); + _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing")); + t->Add (_log_timing, 1, wxEXPAND | wxALL); + table->Add (t, 0, wxALL, 6); + } Config* config = Config::instance (); |