Commit 26603c85 authored by Clément Stenac's avatar Clément Stenac

* New wizard is now about usable, yet unfinished

    Todo
	- Heavy testing
	- Missing sanity checks
	- Extra options
	- Fix layout bugs

* playlist.cpp : Smaller layout, icons to do...

* timer.cpp : show the name and not the URI in status bar

* open.cpp : Bugfix for modal mode
parent 2f6ba22b
...@@ -341,11 +341,9 @@ void Interface::CreateOurMenuBar() ...@@ -341,11 +341,9 @@ void Interface::CreateOurMenuBar()
wxU(_("Open &Capture Device...\tCtrl-C")) ); wxU(_("Open &Capture Device...\tCtrl-C")) );
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append( Wizard_Event, wxU(_("&Wizard...\tCtrl-W")) );
file_menu->Append( StreamWizard_Event, file_menu->Append( StreamWizard_Event,
wxU(_("Streaming &Wizard...\tCtrl-W")) ); wxU(_("Old streaming Wizard...")) );
#if 0
file_menu->Append( Wizard_Event, wxU(_("New Wizard...")) );
#endif
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")) ); file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")) );
......
...@@ -981,8 +981,8 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) ) ...@@ -981,8 +981,8 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
if( i_method == OPEN_STREAM ) if( i_method == OPEN_STREAM )
{ {
Hide();
if( IsModal() ) EndModal( wxID_OK ); if( IsModal() ) EndModal( wxID_OK );
Hide();
return; return;
} }
......
This diff is collapsed.
...@@ -106,7 +106,7 @@ void Timer::Notify() ...@@ -106,7 +106,7 @@ void Timer::Notify()
b_old_seekable = VLC_FALSE; b_old_seekable = VLC_FALSE;
p_main_interface->statusbar->SetStatusText( p_main_interface->statusbar->SetStatusText(
wxU(p_intf->p_sys->p_input->psz_source), 2 ); wxU(p_intf->p_sys->p_input->p_item->psz_name), 2 );
p_main_interface->TogglePlayButton( PLAYING_S ); p_main_interface->TogglePlayButton( PLAYING_S );
i_old_playing_status = PLAYING_S; i_old_playing_status = PLAYING_S;
......
This diff is collapsed.
...@@ -671,6 +671,10 @@ private: ...@@ -671,6 +671,10 @@ private:
void ShowInfos( int item ); void ShowInfos( int item );
/* Event handlers (these functions should _not_ be virtual) */ /* Event handlers (these functions should _not_ be virtual) */
void OnSize( wxSizeEvent &event);
void DoSize();
void OnAddFile( wxCommandEvent& event ); void OnAddFile( wxCommandEvent& event );
void OnAddMRL( wxCommandEvent& event ); void OnAddMRL( wxCommandEvent& event );
void OnClose( wxCommandEvent& event ); void OnClose( wxCommandEvent& event );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment