* modules/gui/wxwindows/*: The wxwindows interface is now a "dialogs provider" module...

[vlc] / modules / gui / wxwindows / playlist.cpp

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index 51bcd32fbe5b5e50570b2ebe450c9d24d631310a..64d421eb13e5aef86871ac5c45359b21e541734a 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -2,7 +2,7 @@
  * playlist.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: playlist.cpp,v 1.9 2003/05/12 17:33:19 gbazin Exp $
+ * $Id: playlist.cpp,v 1.13 2003/07/17 17:30:40 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *
@@ -59,7 +59,8 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
 enum
 {
     /* menu items */
-    AddMRL_Event = 1,
+    AddFile_Event = 1,
+    AddMRL_Event,
     Close_Event,
     Open_Event,
     Save_Event,
@@ -74,6 +75,7 @@ enum
 
 BEGIN_EVENT_TABLE(Playlist, wxFrame)
     /* Menu events */
+    EVT_MENU(AddFile_Event, Playlist::OnAddFile)
     EVT_MENU(AddMRL_Event, Playlist::OnAddMRL)
     EVT_MENU(Close_Event, Playlist::OnClose)
     EVT_MENU(Open_Event, Playlist::OnOpen)
@@ -98,13 +100,12 @@ END_EVENT_TABLE()
 /*****************************************************************************
  * Constructor.
  *****************************************************************************/
-Playlist::Playlist( intf_thread_t *_p_intf, Interface *_p_main_interface ):
-    wxFrame( _p_main_interface, -1, wxU(_("Playlist")), wxDefaultPosition,
+Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
+    wxFrame( p_parent, -1, wxU(_("Playlist")), wxDefaultPosition,
              wxDefaultSize, wxDEFAULT_FRAME_STYLE )
 {
     /* Initializations */
     p_intf = _p_intf;
-    p_main_interface = _p_main_interface;
     i_update_counter = 0;
     b_need_update = VLC_FALSE;
     vlc_mutex_init( p_intf, &lock );
@@ -112,6 +113,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, Interface *_p_main_interface ):
 
     /* Create our "Manage" menu */
     wxMenu *manage_menu = new wxMenu;
+    manage_menu->Append( AddFile_Event, wxU(_("&Simple Add...")) );
     manage_menu->Append( AddMRL_Event, wxU(_("&Add MRL...")) );
     manage_menu->Append( Open_Event, wxU(_("&Open Playlist...")) );
     manage_menu->Append( Save_Event, wxU(_("&Save Playlist...")) );
@@ -328,7 +330,7 @@ void Playlist::OnSave( wxCommandEvent& WXUNUSED(event) )
     }
 
     wxFileDialog dialog( this, wxU(_("Save playlist")),
-                         wxT(""), wxT(""), wxT("*.*"), wxSAVE );
+                         wxT(""), wxT(""), wxT("*"), wxSAVE );
 
     if( dialog.ShowModal() == wxID_OK )
     {
@@ -349,7 +351,7 @@ void Playlist::OnOpen( wxCommandEvent& WXUNUSED(event) )
     }
 
     wxFileDialog dialog( this, wxU(_("Open playlist")),
-                         wxT(""), wxT(""), wxT("*.*"), wxOPEN );
+                         wxT(""), wxT(""), wxT("*"), wxOPEN );
 
     if( dialog.ShowModal() == wxID_OK )
     {
@@ -359,28 +361,22 @@ void Playlist::OnOpen( wxCommandEvent& WXUNUSED(event) )
     vlc_object_release( p_playlist );
 }
 
-void Playlist::OnAddMRL( wxCommandEvent& WXUNUSED(event) )
+void Playlist::OnAddFile( wxCommandEvent& WXUNUSED(event) )
 {
-    playlist_t *p_playlist =
-        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                       FIND_ANYWHERE );
-    if( p_playlist == NULL )
-    {
-        return;
-    }
+    p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_FILE_SIMPLE, 0 );
 
-    /* Show/hide the open dialog */
-    OpenDialog dialog( p_intf, this, FILE_ACCESS );
-
-    if( dialog.ShowModal() == wxID_OK )
-    {
-        playlist_Add( p_playlist, (const char *)dialog.mrl.mb_str(),
-                      PLAYLIST_APPEND, PLAYLIST_END );
-    }
+#if 0
+    Rebuild();
+#endif
+}
 
-    vlc_object_release( p_playlist );
+void Playlist::OnAddMRL( wxCommandEvent& WXUNUSED(event) )
+{
+    p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_FILE, 0 );
 
+#if 0
     Rebuild();
+#endif
 }
 
 void Playlist::OnInvertSelection( wxCommandEvent& WXUNUSED(event) )