From: Carl Hetherington Date: Wed, 10 Sep 2014 21:52:19 +0000 (+0100) Subject: Fix hidden advanced preferences button in some locales (e.g. de_DE). X-Git-Tag: v2.0.48~561^2~21 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e01961397fbf87c69da4c8a8e79cef3c16480d3a Fix hidden advanced preferences button in some locales (e.g. de_DE). --- diff --git a/ChangeLog b/ChangeLog index 67f31f66c..a529f6a81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-10 Carl Hetherington + + * Fix hidden advanced preferences button in some locales. + 2014-09-08 Carl Hetherington * Version 1.73.4 released. diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 2f9b9329e..816602355 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -61,6 +61,14 @@ public: {} protected: + wxPanel* make_panel (wxWindow* parent) + { + wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); + wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); + panel->SetSizer (s); + return panel; + } + wxSize _panel_size; int _border; }; @@ -75,13 +83,11 @@ public: wxWindow* CreateWindow (wxWindow* parent) { - wxPanel* panel = new wxPanel (parent); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + wxPanel* panel = make_panel (parent); wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - s->Add (table, 1, wxALL | wxEXPAND, _border); + panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); _set_language = new wxCheckBox (panel, wxID_ANY, _("Set language")); table->Add (_set_language, 1); @@ -238,13 +244,11 @@ public: wxWindow* CreateWindow (wxWindow* parent) { - wxPanel* panel = new wxPanel (parent); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + wxPanel* panel = make_panel (parent); wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - s->Add (table, 1, wxALL | wxEXPAND, _border); + panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); { add_label_to_sizer (table, panel, _("Default duration of still images"), true); @@ -443,12 +447,10 @@ public: wxWindow* CreateWindow (wxWindow* parent) { - wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + wxPanel* panel = make_panel (parent); _use_any_servers = new wxCheckBox (panel, wxID_ANY, _("Use all servers")); - s->Add (_use_any_servers, 0, wxALL, _border); + panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border); vector columns; columns.push_back (wx_to_std (_("IP address / host name"))); @@ -460,7 +462,7 @@ public: boost::bind (&EncodingServersPage::server_column, this, _1) ); - s->Add (_servers_list, 1, wxEXPAND | wxALL, _border); + panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border); _use_any_servers->SetValue (Config::instance()->use_any_servers ()); _use_any_servers->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&EncodingServersPage::use_any_servers_changed, this)); @@ -504,9 +506,7 @@ public: #endif wxWindow* CreateWindow (wxWindow* parent) { - wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + wxPanel* panel = make_panel (parent); vector columns; columns.push_back (wx_to_std (_("Name"))); @@ -519,7 +519,7 @@ public: 300 ); - s->Add (list, 1, wxEXPAND | wxALL, _border); + panel->GetSizer()->Add (list, 1, wxEXPAND | wxALL, _border); return panel; } @@ -551,13 +551,11 @@ public: wxWindow* CreateWindow (wxWindow* parent) { - wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + wxPanel* panel = make_panel (parent); wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - s->Add (table, 1, wxALL | wxEXPAND, _border); + panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); add_label_to_sizer (table, panel, _("IP address"), true); _tms_ip = new wxTextCtrl (panel, wxID_ANY); @@ -638,18 +636,18 @@ public: wxWindow* CreateWindow (wxWindow* parent) { +#ifdef DCPOMATIC_OSX /* We have to force both width and height of this one */ -#ifdef DCPOMATIC_OSX wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, wxSize (480, 128)); -#else +#else wxPanel* panel = new wxPanel (parent); -#endif +#endif wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); panel->SetSizer (s); wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - s->Add (table, 1, wxEXPAND | wxALL, _border); + panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); add_label_to_sizer (table, panel, _("Outgoing mail server"), true); _mail_server = new wxTextCtrl (panel, wxID_ANY); @@ -687,10 +685,10 @@ public: table->Add (_kdm_bcc, 1, wxEXPAND | wxALL); _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); - s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border); + panel->GetSizer()->Add (_kdm_email, 1, wxEXPAND | wxALL, _border); _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text")); - s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); + panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); Config* config = Config::instance (); _mail_server->SetValue (std_to_wx (config->mail_server ())); @@ -783,14 +781,11 @@ public: wxWindow* CreateWindow (wxWindow* parent) { - wxPanel* panel = new wxPanel (parent); - - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + wxPanel* panel = make_panel (parent); wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - s->Add (table, 1, wxALL | wxEXPAND, _border); + panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); { add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true);