/*****************************************************************************
* dialogs.cpp : wxWindows plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: dialogs.cpp,v 1.1 2003/07/17 17:30:40 gbazin Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id: dialogs.cpp,v 1.16 2004/03/01 18:31:13 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#include <vlc/vlc.h>
#include <vlc/aout.h>
-
-#ifdef WIN32 /* mingw32 hack */
-#undef Yield
-#undef CreateDialog
-#endif
-
-/* Let vlc take care of the i18n stuff */
-#define WXINTL_NO_GETTEXT_MACRO
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-
#include <vlc/intf.h>
#include "stream_control.h"
EVT_COMMAND(INTF_DIALOG_NET, wxEVT_DIALOG, DialogsProvider::OnOpenNet)
EVT_COMMAND(INTF_DIALOG_FILE_SIMPLE, wxEVT_DIALOG,
DialogsProvider::OnOpenFileSimple)
+ EVT_COMMAND(INTF_DIALOG_FILE_GENERIC, wxEVT_DIALOG,
+ DialogsProvider::OnOpenFileGeneric)
EVT_COMMAND(INTF_DIALOG_PLAYLIST, wxEVT_DIALOG,
DialogsProvider::OnPlaylist)
DialogsProvider::OnMessages)
EVT_COMMAND(INTF_DIALOG_PREFS, wxEVT_DIALOG,
DialogsProvider::OnPreferences)
+ EVT_COMMAND(INTF_DIALOG_STREAMWIZARD, wxEVT_DIALOG,
+ DialogsProvider::OnStreamWizardDialog)
EVT_COMMAND(INTF_DIALOG_FILEINFO, wxEVT_DIALOG,
DialogsProvider::OnFileInfo)
- //EVT_COMMAND(ShowPopup_Event, wxEVT_DIALOG, DialogsProvider::OnShowPopup)
+ EVT_COMMAND(INTF_DIALOG_POPUPMENU, wxEVT_DIALOG,
+ DialogsProvider::OnPopupMenu)
+ EVT_COMMAND(INTF_DIALOG_EXIT, wxEVT_DIALOG,
+ DialogsProvider::OnExitThread)
END_EVENT_TABLE()
/*****************************************************************************
p_messages_dialog = NULL;
p_fileinfo_dialog = NULL;
p_prefs_dialog = NULL;
+ p_file_generic_dialog = NULL;
+ p_streamwizard_dialog = NULL;
/* Give our interface a nice little icon */
p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
/* Create the messages dialog so it can begin storing logs */
p_messages_dialog = new Messages( p_intf, p_parent ? p_parent : this );
+
+ /* Intercept all menu events in our custom event handler */
+ PushEventHandler( new MenuEvtHandler( p_intf, NULL ) );
}
DialogsProvider::~DialogsProvider()
if( p_playlist_dialog ) delete p_playlist_dialog;
if( p_messages_dialog ) delete p_messages_dialog;
if( p_fileinfo_dialog ) delete p_fileinfo_dialog;
+ if( p_file_generic_dialog ) delete p_file_generic_dialog;
+ if( p_streamwizard_dialog ) delete p_streamwizard_dialog;
+
if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
+
+ /* We must set this here because on win32 this destructor will be
+ * automatically called so we must not call it again on wxApp->OnExit().
+ * There shouldn't be any race conditions as all this should be done
+ * from the same thread. */
+ p_intf->p_sys->p_wxwindow = NULL;
}
void DialogsProvider::OnIdle( wxIdleEvent& WXUNUSED(event) )
}
}
+void DialogsProvider::OnStreamWizardDialog( wxCommandEvent& WXUNUSED(event) )
+{
+ /* Show/hide the stream window */
+ if( !p_streamwizard_dialog )
+ p_streamwizard_dialog = new StreamDialog( p_intf, this );
+
+ if( p_streamwizard_dialog )
+ {
+ p_streamwizard_dialog->Show( !p_streamwizard_dialog->IsShown() );
+ }
+}
+
+void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
+{
+ intf_dialog_args_t *p_arg = (intf_dialog_args_t *)event.GetClientData();
+
+ if( p_arg == NULL )
+ {
+ msg_Dbg( p_intf, "OnOpenFileGeneric() called with NULL arg" );
+ return;
+ }
+
+ if( p_file_generic_dialog == NULL )
+ p_file_generic_dialog = new wxFileDialog( this );
+
+ if( p_file_generic_dialog )
+ {
+ p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) );
+ p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) );
+ p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
+ (p_arg->b_multiple ? wxMULTIPLE:0) );
+ }
+
+ if( p_file_generic_dialog &&
+ p_file_generic_dialog->ShowModal() == wxID_OK )
+ {
+ wxArrayString paths;
+
+ p_file_generic_dialog->GetPaths( paths );
+
+ p_arg->i_results = paths.GetCount();
+ p_arg->psz_results = (char **)malloc( p_arg->i_results *
+ sizeof(char *) );
+ for( size_t i = 0; i < paths.GetCount(); i++ )
+ {
+ p_arg->psz_results[i] = strdup( paths[i].mb_str() );
+ }
+ }
+
+ /* Callback */
+ if( p_arg->pf_callback )
+ {
+ p_arg->pf_callback( p_arg );
+ }
+
+ /* Blocking or not ? */
+ if( p_arg->b_blocking )
+ {
+ vlc_mutex_lock( &p_arg->lock );
+ p_arg->b_ready = 1;
+ vlc_cond_signal( &p_arg->wait );
+ }
+
+ if( p_arg->psz_results )
+ {
+ for( int i = 0; i < p_arg->i_results; i++ )
+ {
+ free( p_arg->psz_results[i] );
+ }
+ free( p_arg->psz_results );
+ }
+ if( p_arg->psz_title ) free( p_arg->psz_title );
+ if( p_arg->psz_extensions ) free( p_arg->psz_extensions );
+
+ if( p_arg->b_blocking )
+ {
+ vlc_mutex_unlock( &p_arg->lock );
+ }
+ else
+ {
+ free( p_arg );
+ }
+}
+
void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
{
playlist_t *p_playlist =
}
if( p_file_dialog == NULL )
- p_file_dialog = new wxFileDialog( this, wxU(_("Open file")),
+ p_file_dialog = new wxFileDialog( this, wxU(_("Open File")),
wxT(""), wxT(""), wxT("*"), wxOPEN | wxMULTIPLE );
if( p_file_dialog && p_file_dialog->ShowModal() == wxID_OK )
for( size_t i = 0; i < paths.GetCount(); i++ )
if( event.GetInt() )
playlist_Add( p_playlist, (const char *)paths[i].mb_str(),
+ (const char *)paths[i].mb_str(),
PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO),
PLAYLIST_END );
else
playlist_Add( p_playlist, (const char *)paths[i].mb_str(),
+ (const char *)paths[i].mb_str(),
PLAYLIST_APPEND, PLAYLIST_END );
}
Open( NET_ACCESS, event.GetInt() );
}
-void DialogsProvider::OnOpenSat( wxCommandEvent& event )
-{
- Open( SAT_ACCESS, event.GetInt() );
-}
-
void DialogsProvider::Open( int i_access_method, int i_arg )
{
/* Show/hide the open dialog */
if( !p_open_dialog )
- p_open_dialog = new OpenDialog( p_intf, this, i_access_method, i_arg );
+ p_open_dialog = new OpenDialog( p_intf, this, i_access_method, i_arg,
+ OPEN_NORMAL );
if( p_open_dialog )
{
p_open_dialog->Show( i_access_method, i_arg );
}
}
+
+void DialogsProvider::OnPopupMenu( wxCommandEvent& event )
+{
+ wxPoint mousepos = ScreenToClient( wxGetMousePosition() );
+ ::PopupMenu( p_intf, this, mousepos );
+}
+
+void DialogsProvider::OnExitThread( wxCommandEvent& WXUNUSED(event) )
+{
+ wxTheApp->ExitMainLoop();
+}
projects / vlc / blobdiff