* modules/gui/wxwindows/open.cpp: removed the channels server entry.

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index 93582ba9c676539d297fad08f1100b8ab670082d..15838bc70c5c38da00485d804bee32ac6188628a 100644 (file)
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -2,7 +2,7 @@
  * open.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: open.cpp,v 1.15 2003/04/21 00:54:26 ipkiss Exp $
+ * $Id: open.cpp,v 1.16 2003/05/07 00:18:39 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -79,9 +79,9 @@ enum
     DiscChapter_Event,
 
     NetType_Event,
-    NetRadio1_Event, NetRadio2_Event, NetRadio3_Event, NetRadio4_Event,
-    NetPort1_Event, NetPort2_Event, NetPort3_Event, NetPort4_Event,
-    NetAddr1_Event, NetAddr2_Event, NetAddr3_Event, NetAddr4_Event,
+    NetRadio1_Event, NetRadio2_Event, NetRadio3_Event,
+    NetPort1_Event, NetPort2_Event, NetPort3_Event,
+    NetAddr1_Event, NetAddr2_Event, NetAddr3_Event,
 
     SoutEnable_Event,
     SoutSettings_Event,
@@ -116,7 +116,6 @@ BEGIN_EVENT_TABLE(OpenDialog, wxDialog)
     EVT_RADIOBUTTON(NetRadio1_Event, OpenDialog::OnNetTypeChange)
     EVT_RADIOBUTTON(NetRadio2_Event, OpenDialog::OnNetTypeChange)
     EVT_RADIOBUTTON(NetRadio3_Event, OpenDialog::OnNetTypeChange)
-    EVT_RADIOBUTTON(NetRadio4_Event, OpenDialog::OnNetTypeChange)
     EVT_TEXT(NetPort1_Event, OpenDialog::OnNetPanelChange)
     EVT_SPINCTRL(NetPort1_Event, OpenDialog::OnNetPanelChange)
     EVT_TEXT(NetPort2_Event, OpenDialog::OnNetPanelChange)
@@ -125,7 +124,6 @@ BEGIN_EVENT_TABLE(OpenDialog, wxDialog)
     EVT_SPINCTRL(NetPort3_Event, OpenDialog::OnNetPanelChange)
     EVT_TEXT(NetAddr2_Event, OpenDialog::OnNetPanelChange)
     EVT_TEXT(NetAddr3_Event, OpenDialog::OnNetPanelChange)
-    EVT_TEXT(NetAddr4_Event, OpenDialog::OnNetPanelChange)
 
     /* Events generated by the stream output buttons */
     EVT_CHECKBOX(SoutEnable_Event, OpenDialog::OnSoutEnable)
@@ -166,6 +164,10 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
     mrl_combo = new wxComboBox( panel, MRL_Event, mrl,
                                 wxPoint(20,25), wxSize(120, -1),
                                 0, NULL );
+    mrl_combo->SetToolTip( _("You can use this field directly by typing the "
+        "full MRL you want to open.\n""Alternatively, the field will be filled"
+        "automatically when you use the following controls.") );
+
     mrl_sizer->Add( mrl_label, 0, wxEXPAND | wxALL, 5 );
     mrl_sizer->Add( mrl_combo, 1, wxEXPAND | wxALL, 5 );
     mrl_sizer_sizer->Add( mrl_sizer, 1, wxEXPAND | wxALL, 5 );
@@ -356,17 +358,16 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
                                   wxSize(200, 200) );
 
     wxBoxSizer *sizer_row = new wxBoxSizer( wxVERTICAL );
-    wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );
+    wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 3, 20 );
 
     static const wxString net_type_array[] =
     {
         _("UDP/RTP"),
         _("UDP/RTP Multicast"),
-        _("Channel server"),
         _("HTTP/FTP/MMS")
     };
 
-    for( i=0; i<4; i++ )
+    for( i=0; i<3; i++ )
     {
         net_radios[i] = new wxRadioButton( panel, NetRadio1_Event + i,
                                            net_type_array[i],
@@ -417,41 +418,19 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
                          wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
     net_subpanels[1]->SetSizerAndFit( subpanel_sizer );
 
-    /* Channel server row */
-    subpanel_sizer = new wxFlexGridSizer( 4, 1, 20 );
-    label = new wxStaticText( net_subpanels[2], -1, _("Address") );
-    net_addrs[2] = new wxTextCtrl( net_subpanels[2], NetAddr3_Event, "",
-                                   wxDefaultPosition, wxDefaultSize,
-                                   wxTE_PROCESS_ENTER);
-    subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
-    subpanel_sizer->Add( net_addrs[2], 1,
-                         wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
-
-    label = new wxStaticText( net_subpanels[2], -1, _("Port") );
-    net_ports[2] = new wxSpinCtrl( net_subpanels[2], NetPort3_Event,
-                                   wxString::Format("%d", val),
-                                   wxDefaultPosition, wxDefaultSize,
-                                   wxSP_ARROW_KEYS,
-                                   0, 16000, val);
-
-    subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
-    subpanel_sizer->Add( net_ports[2], 1,
-                         wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
-    net_subpanels[2]->SetSizerAndFit( subpanel_sizer );
-
     /* HTTP row */
     subpanel_sizer = new wxFlexGridSizer( 2, 1, 20 );
-    label = new wxStaticText( net_subpanels[3], -1, _("URL") );
-    net_addrs[3] = new wxTextCtrl( net_subpanels[3], NetAddr4_Event, "",
+    label = new wxStaticText( net_subpanels[2], -1, _("URL") );
+    net_addrs[2] = new wxTextCtrl( net_subpanels[2], NetAddr3_Event, "",
                                    wxDefaultPosition, wxSize( 200, -1 ),
                                    wxTE_PROCESS_ENTER);
     subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
-    subpanel_sizer->Add( net_addrs[3], 1,
+    subpanel_sizer->Add( net_addrs[2], 1,
                          wxEXPAND | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
-    net_subpanels[3]->SetSizerAndFit( subpanel_sizer );
+    net_subpanels[2]->SetSizerAndFit( subpanel_sizer );
 
     /* Stuff everything into the main panel */
-    for( i=0; i<4; i++ )
+    for( i=0; i<3; i++ )
     {
         sizer->Add( net_radios[i], 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
         sizer->Add( net_subpanels[i], 1,
@@ -646,7 +625,7 @@ void OpenDialog::OnNetTypeChange( wxCommandEvent& event )
 
     i_net_type = event.GetId() - NetRadio1_Event;
 
-    for(i=0; i<4; i++)
+    for(i=0; i<3; i++)
     {
         net_radios[i]->SetValue( event.GetId() == (NetRadio1_Event+i) );
         net_subpanels[i]->Enable( event.GetId() == (NetRadio1_Event+i) );