* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.40 2003/06/13 15:54:42 gbazin Exp $
+ * $Id: interface.cpp,v 1.41 2003/06/19 12:21:53 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
if( i_playing_status == PLAYING_S )
{
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Pause")),
- wxBitmap( pause_xpm ) );
+ wxBitmap( pause_xpm ), wxNullBitmap,
+ wxITEM_NORMAL, wxU(_(HELP_PAUSE)) );
}
else
{
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Play")),
- wxBitmap( play_xpm ) );
+ wxBitmap( play_xpm ), wxNullBitmap,
+ wxITEM_NORMAL, wxU(_(HELP_PLAY)) );
}
GetToolBar()->Realize();
* preferences.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: preferences.cpp,v 1.21 2003/06/17 16:09:16 gbazin Exp $
+ * $Id: preferences.cpp,v 1.22 2003/06/19 12:21:53 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
wxButton *button;
wxArrayString array;
+ vlc_bool_t b_has_advanced = VLC_FALSE;
+
/* Initializations */
p_intf = _p_intf;
p_prefs_dialog =_p_prefs_dialog,
config_data->control.combobox = combo;
panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
panel_sizer->Add( combo, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+ if( p_item->b_advanced ) b_has_advanced = VLC_TRUE;
break;
case CONFIG_ITEM_STRING:
panel_sizer->Add( button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
button->SetClientData((void *)config_data);
}
+ if( p_item->b_advanced ) b_has_advanced = VLC_TRUE;
break;
case CONFIG_ITEM_INTEGER:
panel_sizer->Add( spin, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
spin->SetClientData((void *)config_data);
+ if( p_item->b_advanced ) b_has_advanced = VLC_TRUE;
break;
case CONFIG_ITEM_FLOAT:
label = new wxStaticText(panel, -1, wxU(p_item->psz_text));
- spin = new wxSpinCtrl( panel, -1,
- wxString::Format(wxT("%f"),p_item->f_value),
- wxDefaultPosition, wxDefaultSize,
- wxSP_ARROW_KEYS,
- -16000, 16000, (int)p_item->f_value);
- spin->SetToolTip( wxU(p_item->psz_longtext) );
- config_data->control.spinctrl = spin;
+ textctrl = new wxTextCtrl( panel, -1,
+ wxString::Format(wxT("%f"),p_item->f_value),
+ wxDefaultPosition, wxDefaultSize,
+ wxTE_PROCESS_ENTER );
+ textctrl->SetToolTip( wxU(p_item->psz_longtext) );
+ config_data->control.textctrl = textctrl;
panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
- panel_sizer->Add( spin, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+ panel_sizer->Add( textctrl, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+ if( p_item->b_advanced ) b_has_advanced = VLC_TRUE;
break;
case CONFIG_ITEM_BOOL:
checkbox->SetToolTip( wxU(p_item->psz_longtext) );
config_data->control.checkbox = checkbox;
panel_sizer->Add( checkbox, 0, wxALL, 5 );
+ if( p_item->b_advanced ) b_has_advanced = VLC_TRUE;
break;
default:
b_advanced = !config_GetInt( p_intf, "advanced" );
OnAdvanced( dummy_event );
- /* Create advanced checkbox */
- if( config_array.GetCount() )
+ /* Create advanced checkbox if needed */
+ if( config_array.GetCount() && b_has_advanced )
{
wxCheckBox *advanced_checkbox =
new wxCheckBox( this, Advanced_Event, wxU(_("Advanced options")) );
config_data->control.spinctrl->GetValue() );
break;
case CONFIG_ITEM_FLOAT:
- config_PutFloat( p_intf, config_data->option_name.mb_str(),
- config_data->control.spinctrl->GetValue() );
+ {
+ float f_value;
+ if( (wxSscanf(config_data->control.textctrl->GetValue(),
+ wxT("%f"), &f_value) == 1) )
+ config_PutFloat( p_intf, config_data->option_name.mb_str(),
+ f_value );
+ }
break;
}
}