From fdbec5549a446f848c386eb931586cefc16e618c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Sat, 4 Mar 2006 09:12:21 +0000 Subject: [PATCH] Fix ordering of widgets in sout panel (Closes:#469) --- modules/gui/wxwidgets/dialogs/streamout.cpp | 23 ++++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/gui/wxwidgets/dialogs/streamout.cpp b/modules/gui/wxwidgets/dialogs/streamout.cpp index 5a8c83a4aa..80d96f645d 100644 --- a/modules/gui/wxwidgets/dialogs/streamout.cpp +++ b/modules/gui/wxwidgets/dialogs/streamout.cpp @@ -179,12 +179,12 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): mrl_sizer->Add( mrl_combo, 1, wxALL | wxALIGN_CENTER, 5 ); mrl_sizer_sizer->Add( mrl_sizer, 1, wxEXPAND | wxALL, 5 ); - /* Create the output encapsulation panel */ - encapsulation_panel = EncapsulationPanel( panel ); - /* Create the access output panel */ access_panel = AccessPanel( panel ); + /* Create the output encapsulation panel */ + encapsulation_panel = EncapsulationPanel( panel ); + /* Create the transcoding panel */ transcoding_panel = TranscodingPanel( panel ); @@ -602,10 +602,15 @@ wxPanel *SoutDialog::MiscPanel( wxWindow* parent ) wxT(""), wxDefaultPosition, wxSize( 100, -1 ), wxTE_PROCESS_ENTER); - wxStaticText *ttl_label = new wxStaticText( misc_subpanels[TTL_MISC_SOUT], -1, - wxU(_("Time-To-Live (TTL)")) ); - ttl_spin = new wxSpinCtrl( misc_subpanels[TTL_MISC_SOUT], -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, - 0, 1, 255, config_GetInt( p_intf, "ttl" ) ); + sout_all_checkbox = new wxCheckBox( misc_subpanels[TTL_MISC_SOUT], + SoutAll_Event, wxU(_("Select all elementary streams")) ); + + wxStaticText *ttl_label = new wxStaticText( misc_subpanels[TTL_MISC_SOUT], + -1, + wxU(_("Time-To-Live (TTL)")) ); + ttl_spin = new wxSpinCtrl( misc_subpanels[TTL_MISC_SOUT], -1, + wxEmptyString, wxDefaultPosition, wxDefaultSize, + 0, 1, 255, config_GetInt( p_intf, "ttl" ) ); subpanel_sizer->Add( sap_checkbox, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL ); @@ -620,9 +625,7 @@ wxPanel *SoutDialog::MiscPanel( wxWindow* parent ) subpanel_sizer->Add( subpanel_sub_sizer, 1, wxEXPAND | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL ); - sout_all_checkbox = new wxCheckBox( misc_subpanels[TTL_MISC_SOUT], - SoutAll_Event, wxU(_("Select all elementary streams")) ); - subpanel2_sizer->Add( sout_all_checkbox, 1, + subpanel2_sizer->Add( sout_all_checkbox, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT, 5 ); subpanel2_sizer->Add( ttl_label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL ); subpanel2_sizer->Add( ttl_spin, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL ); -- 2.39.2