X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=93bfe8cfae911c006f74c74a2e0237d62dd3128a;hb=19933fe7a674ee6d1253821a656507a6a712f8d0;hp=18baf86744c9b426d0a07d256f3875a1643db443;hpb=1cbc005bd347d6d9e72018608f70dbfb2068662a;p=vlc

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 18baf86744..93bfe8cfae 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * main_inteface.cpp : Main interface
- ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ *****************************************************************************
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,31 +19,43 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <QEvent>
 #include <QApplication>
 #include <QSignalMapper>
 #include <QFileDialog>
 
+#include <vlc_common.h>
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
+#include "main_interface.hpp"
 #include "menus.hpp"
 #include <vlc_intf_strings.h>
+#include "input_manager.hpp"
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"
-#include "dialogs/prefs_dialog.hpp"
-#include "dialogs/streaminfo.hpp"
+#include "dialogs/bookmarks.hpp"
+#include "dialogs/preferences.hpp"
+#include "dialogs/mediainfo.hpp"
 #include "dialogs/messages.hpp"
 #include "dialogs/extended.hpp"
+#include "dialogs/vlm.hpp"
 #include "dialogs/sout.hpp"
 #include "dialogs/open.hpp"
+#include "dialogs/help.hpp"
+#include "dialogs/gototime.hpp"
+#include "dialogs/podcast_configuration.hpp"
 
 DialogsProvider* DialogsProvider::instance = NULL;
 
 DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
-                                      QObject( NULL ), p_intf( _p_intf )
+                                  QObject( NULL ), p_intf( _p_intf )
 {
     fixed_timer = new QTimer( this );
     fixed_timer->start( 150 /* milliseconds */ );
@@ -60,8 +73,25 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
 
 DialogsProvider::~DialogsProvider()
 {
+    msg_Dbg( p_intf, "Destroying the Dialog Provider" );
     PlaylistDialog::killInstance();
-    StreamInfoDialog::killInstance();
+    MediaInfoDialog::killInstance();
+    MessagesDialog::killInstance();
+    ExtendedDialog::killInstance();
+    BookmarksDialog::killInstance();
+    HelpDialog::killInstance();
+#ifdef UPDATE_CHECK
+    UpdateDialog::killInstance();
+#endif
+
+    fixed_timer->stop();
+}
+
+void DialogsProvider::quit()
+{
+    vlc_object_kill( p_intf->p_libvlc );
+    QApplication::closeAllWindows();
+    QApplication::quit();
 }
 
 void DialogsProvider::customEvent( QEvent *event )
@@ -71,248 +101,522 @@ void DialogsProvider::customEvent( QEvent *event )
         DialogEvent *de = static_cast<DialogEvent*>(event);
         switch( de->i_dialog )
         {
-            case INTF_DIALOG_FILE:
-            case INTF_DIALOG_DISC:
-            case INTF_DIALOG_NET:
-            case INTF_DIALOG_CAPTURE:
-                openDialog( de->i_dialog ); break;
-            case INTF_DIALOG_PLAYLIST:
-                playlistDialog(); break;
-            case INTF_DIALOG_MESSAGES:
-                messagesDialog(); break;
-            case INTF_DIALOG_PREFS:
-               prefsDialog(); break;
-            case INTF_DIALOG_POPUPMENU:
-            case INTF_DIALOG_AUDIOPOPUPMENU:
-            case INTF_DIALOG_VIDEOPOPUPMENU:
-            case INTF_DIALOG_MISCPOPUPMENU:
-               popupMenu( de->i_dialog ); break;
-            case INTF_DIALOG_FILEINFO:
-               streaminfoDialog(); break;
-            case INTF_DIALOG_INTERACTION:
-               doInteraction( de->p_arg ); break;
-            case INTF_DIALOG_VLM:
-            case INTF_DIALOG_BOOKMARKS:
-               bookmarksDialog(); break;
-            case INTF_DIALOG_WIZARD:
-            default:
-               msg_Warn( p_intf, "unimplemented dialog\n" );
+        case INTF_DIALOG_FILE_SIMPLE:
+        case INTF_DIALOG_FILE:
+            openDialog(); break;
+        case INTF_DIALOG_FILE_GENERIC:
+            openFileGenericDialog( de->p_arg ); break;
+        case INTF_DIALOG_DISC:
+            openDiscDialog(); break;
+        case INTF_DIALOG_NET:
+            openNetDialog(); break;
+        case INTF_DIALOG_SAT:
+        case INTF_DIALOG_CAPTURE:
+            openCaptureDialog(); break;
+        case INTF_DIALOG_DIRECTORY:
+            PLAppendDir(); break;
+        case INTF_DIALOG_PLAYLIST:
+            playlistDialog(); break;
+        case INTF_DIALOG_MESSAGES:
+            messagesDialog(); break;
+        case INTF_DIALOG_FILEINFO:
+           mediaInfoDialog(); break;
+        case INTF_DIALOG_PREFS:
+           prefsDialog(); break;
+        case INTF_DIALOG_BOOKMARKS:
+           bookmarksDialog(); break;
+        case INTF_DIALOG_EXTENDED:
+           extendedDialog(); break;
+#ifdef ENABLE_VLM
+        case INTF_DIALOG_VLM:
+           vlmDialog(); break;
+#endif
+        case INTF_DIALOG_INTERACTION:
+           doInteraction( de->p_arg ); break;
+        case INTF_DIALOG_POPUPMENU:
+           QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break;
+        case INTF_DIALOG_AUDIOPOPUPMENU:
+           QVLCMenu::AudioPopupMenu( p_intf ); break;
+        case INTF_DIALOG_VIDEOPOPUPMENU:
+           QVLCMenu::VideoPopupMenu( p_intf ); break;
+        case INTF_DIALOG_MISCPOPUPMENU:
+           QVLCMenu::MiscPopupMenu( p_intf ); break;
+        case INTF_DIALOG_WIZARD:
+        case INTF_DIALOG_STREAMWIZARD:
+            openThenStreamingDialogs(); break;
+#ifdef UPDATE_CHECK
+        case INTF_DIALOG_UPDATEVLC:
+            updateDialog(); break;
+#endif
+        case INTF_DIALOG_EXIT:
+            quit(); break;
+        default:
+           msg_Warn( p_intf, "unimplemented dialog" );
         }
     }
 }
 
+/****************************************************************************
+ * Individual simple dialogs
+ ****************************************************************************/
 void DialogsProvider::playlistDialog()
 {
     PlaylistDialog::getInstance( p_intf )->toggleVisible();
 }
 
-void DialogsProvider::openDialog()
+void DialogsProvider::prefsDialog()
 {
-    openDialog( 0 );
+    PrefsDialog::getInstance( p_intf )->toggleVisible();
 }
-void DialogsProvider::PLAppendDialog()
+
+void DialogsProvider::extendedDialog()
 {
+    ExtendedDialog::getInstance( p_intf )->toggleVisible();
 }
-void DialogsProvider::MLAppendDialog()
+
+void DialogsProvider::messagesDialog()
 {
+    MessagesDialog::getInstance( p_intf )->toggleVisible();
 }
-void DialogsProvider::openDialog( int i_dialog )
+
+void DialogsProvider::gotoTimeDialog()
 {
-    OpenDialog::getInstance( p_intf )->toggleVisible();
+    GotoTimeDialog::getInstance( p_intf )->toggleVisible();
 }
 
-void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
+#ifdef ENABLE_VLM
+void DialogsProvider::vlmDialog()
 {
-    InteractionDialog *qdialog;
-    interaction_dialog_t *p_dialog = p_arg->p_dialog;
-    switch( p_dialog->i_action )
-    {
-    case INTERACT_NEW:
-        qdialog = new InteractionDialog( p_intf, p_dialog );
-        p_dialog->p_private = (void*)qdialog;
-        if( !(p_dialog->i_status == ANSWERED_DIALOG) )
-            qdialog->show();
-        break;
-    case INTERACT_UPDATE:
-        qdialog = (InteractionDialog*)(p_dialog->p_private);
-        if( qdialog)
-            qdialog->update();
-        break;
-    case INTERACT_HIDE:
-        qdialog = (InteractionDialog*)(p_dialog->p_private);
-        if( qdialog )
-            qdialog->hide();
-        p_dialog->i_status = HIDDEN_DIALOG;
-        break;
-    case INTERACT_DESTROY:
-        qdialog = (InteractionDialog*)(p_dialog->p_private);
-        if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
-            delete qdialog;
-        p_dialog->i_status = DESTROYED_DIALOG;
-        break;
-    }
+    VLMDialog::getInstance( p_intf )->toggleVisible();
 }
+#endif
 
-void DialogsProvider::quit()
+void DialogsProvider::helpDialog()
 {
-    p_intf->b_die = VLC_TRUE;
-    QApplication::quit();
+    HelpDialog::getInstance( p_intf )->toggleVisible();
 }
 
-void DialogsProvider::streaminfoDialog()
+#ifdef UPDATE_CHECK
+void DialogsProvider::updateDialog()
 {
-    (new SoutDialog( p_intf ))->show();
-    StreamInfoDialog::getInstance( p_intf )->toggleVisible();
+    UpdateDialog::getInstance( p_intf )->toggleVisible();
 }
+#endif
 
-void DialogsProvider::streamingDialog()
+void DialogsProvider::aboutDialog()
 {
+    AboutDialog::getInstance( p_intf )->toggleVisible();
 }
 
-void DialogsProvider::prefsDialog()
+void DialogsProvider::mediaInfoDialog()
 {
-    PrefsDialog::getInstance( p_intf )->toggleVisible();
+    MediaInfoDialog::getInstance( p_intf )->toggleVisible();
 }
-void DialogsProvider::extendedDialog()
+
+void DialogsProvider::mediaCodecDialog()
 {
-    ExtendedDialog::getInstance( p_intf )->toggleVisible();
+    MediaInfoDialog::getInstance( p_intf )->showTab( 2 );
 }
 
-void DialogsProvider::messagesDialog()
+void DialogsProvider::bookmarksDialog()
 {
-    MessagesDialog::getInstance( p_intf )->toggleVisible();
+    BookmarksDialog::getInstance( p_intf )->toggleVisible();
 }
 
-void DialogsProvider::menuAction( QObject *data )
+void DialogsProvider::podcastConfigureDialog()
 {
-    QVLCMenu::DoAction( p_intf, data );
+    PodcastConfigDialog::getInstance( p_intf )->toggleVisible();
 }
 
-void DialogsProvider::menuUpdateAction( QObject *data )
+
+/****************************************************************************
+ * All the open/add stuff
+ * Open Dialog first - Simple Open then
+ ****************************************************************************/
+
+void DialogsProvider::openDialog( int i_tab )
 {
-    MenuFunc * f = qobject_cast<MenuFunc *>(data);
-    f->doFunc( p_intf );
+    OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
 }
+void DialogsProvider::openDialog()
+{
+    openDialog( OPEN_FILE_TAB );
+}
+void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
+{
+    if( p_arg == NULL )
+    {
+        msg_Warn( p_intf, "openFileGenericDialog() called with NULL arg" );
+        return;
+    }
 
-void DialogsProvider::SDMenuAction( QString data )
+    /* Replace the extensions to a Qt format */
+    int i = 0;
+    QString extensions = qfu( p_arg->psz_extensions );
+    while ( ( i = extensions.indexOf( "|", i ) ) != -1 )
+    {
+        if( ( extensions.count( "|" ) % 2 ) == 0 )
+            extensions.replace( i, 1, ");;" );
+        else
+            extensions.replace( i, 1, "(" );
+    }
+    extensions.replace(QString(";*"), QString(" *"));
+    extensions.append( ")" );
+
+    /* Save */
+    if( p_arg->b_save )
+    {
+        QString file = QFileDialog::getSaveFileName( NULL, p_arg->psz_title,
+                            qfu( p_intf->p_sys->psz_filepath ), extensions );
+        if( !file.isEmpty() )
+        {
+            p_arg->i_results = 1;
+            p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) );
+            p_arg->psz_results[0] = strdup( qtu( file ) );
+        }
+        else
+            p_arg->i_results = 0;
+    }
+    else /* non-save mode */
+    {
+        QStringList files = QFileDialog::getOpenFileNames( NULL,
+                p_arg->psz_title, qfu( p_intf->p_sys->psz_filepath ),
+                extensions );
+        p_arg->i_results = files.count();
+        p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) );
+        i = 0;
+        foreach( QString file, files )
+            p_arg->psz_results[i++] = strdup( qtu( file ) );
+    }
+
+    /* Callback */
+    if( p_arg->pf_callback )
+        p_arg->pf_callback( p_arg );
+
+    /* Clean afterwards */
+    if( p_arg->psz_results )
+    {
+        for( i = 0; i < p_arg->i_results; i++ )
+            free( p_arg->psz_results[i] );
+        free( p_arg->psz_results );
+    }
+    free( p_arg->psz_title );
+    free( p_arg->psz_extensions );
+    free( p_arg );
+}
+
+void DialogsProvider::openFileDialog()
 {
-    char *psz_sd = data.toUtf8().data();
-    if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
-        playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
-    else
-        playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
+    openDialog( OPEN_FILE_TAB );
+}
+void DialogsProvider::openDiscDialog()
+{
+    openDialog( OPEN_DISC_TAB );
+}
+void DialogsProvider::openNetDialog()
+{
+    openDialog( OPEN_NETWORK_TAB );
+}
+void DialogsProvider::openCaptureDialog()
+{
+    openDialog( OPEN_CAPTURE_TAB );
 }
 
+/* Same as the open one, but force the enqueue */
+void DialogsProvider::PLAppendDialog()
+{
+    OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_ENQUEUE)
+                            ->showTab( OPEN_FILE_TAB );
+}
 
-void DialogsProvider::simplePLAppendDialog()
+/* Unimplemmented yet - Usefull ? */
+void DialogsProvider::MLAppendDialog()
+{}
+
+/**
+ * Simple open
+ ***/
+QStringList DialogsProvider::showSimpleOpen( QString help,
+                                             int filters,
+                                             QString path )
 {
-    QStringList files = showSimpleOpen();
-    QString file;
-    foreach( file, files )
+    QString fileTypes = "";
+    if( filters & EXT_FILTER_MEDIA ) {
+        ADD_FILTER_MEDIA( fileTypes );
+    }
+    if( filters & EXT_FILTER_VIDEO ) {
+        ADD_FILTER_VIDEO( fileTypes );
+    }
+    if( filters & EXT_FILTER_AUDIO ) {
+        ADD_FILTER_AUDIO( fileTypes );
+    }
+    if( filters & EXT_FILTER_PLAYLIST ) {
+        ADD_FILTER_PLAYLIST( fileTypes );
+    }
+    if( filters & EXT_FILTER_SUBTITLE ) {
+        ADD_FILTER_SUBTITLE( fileTypes );
+    }
+    ADD_FILTER_ALL( fileTypes );
+    fileTypes.replace(QString(";*"), QString(" *"));
+    return QFileDialog::getOpenFileNames( NULL,
+        help.isNull() ? qfu(I_OP_SEL_FILES ) : help,
+        path.isNull() ? qfu( p_intf->p_sys->psz_filepath ) : path,
+        fileTypes );
+}
+
+/**
+ * Open a file,
+ * pl helps you to choose from playlist or media library,
+ * go to start or enqueue
+ **/
+void DialogsProvider::addFromSimple( bool pl, bool go)
+{
+    QStringList files = DialogsProvider::showSimpleOpen();
+    int i = 0;
+    foreach( QString file, files )
     {
         const char * psz_utf8 = qtu( file );
         playlist_Add( THEPL, psz_utf8, NULL,
-                PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END, VLC_TRUE );
+                      go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) |
+                                               ( i ? PLAYLIST_PREPARSE : 0 ) )
+                         : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
+                      PLAYLIST_END,
+                      pl ? true : false, false );
+        i++;
     }
 }
 
+void DialogsProvider::simpleOpenDialog()
+{
+    addFromSimple( true, true ); /* Playlist and Go */
+}
+
+void DialogsProvider::simplePLAppendDialog()
+{
+    addFromSimple( true, false );
+}
+
 void DialogsProvider::simpleMLAppendDialog()
 {
-    QStringList files = showSimpleOpen();
-    QString file;
-    foreach( file, files )
+    addFromSimple( false, false );
+}
+
+/* Directory */
+/**
+ * Open a directory,
+ * pl helps you to choose from playlist or media library,
+ * go to start or enqueue
+ **/
+static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
+{
+    QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") );
+    if (!dir.isEmpty()) {
+        input_item_t *p_input = input_ItemNewExt( THEPL,
+                                        qtu( "directory://" + dir ), NULL,
+                                        0, NULL, -1 );
+
+        /* FIXME: playlist_AddInput() can fail */
+        playlist_AddInput( THEPL, p_input,
+                       go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
+                       PLAYLIST_END, pl, pl_Unlocked );
+        input_Read( THEPL, p_input, false );
+        vlc_gc_decref( p_input );
+    }
+}
+
+void DialogsProvider::PLAppendDir()
+{
+    openDirectory( p_intf, true, false );
+}
+
+void DialogsProvider::MLAppendDir()
+{
+    openDirectory( p_intf, false , false );
+}
+
+/****************
+ * Playlist     *
+ ****************/
+void DialogsProvider::openAPlaylist()
+{
+    QStringList files = showSimpleOpen( qtr( "Open playlist file" ),
+                                        EXT_FILTER_PLAYLIST );
+    foreach( QString file, files )
     {
-        const char * psz_utf8 =  qtu( file );
-        playlist_Add( THEPL, psz_utf8, psz_utf8,
-                      PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END,
-                      VLC_TRUE);
+        playlist_Import( THEPL, qtu(file) );
     }
 }
 
-void DialogsProvider::simpleOpenDialog()
+void DialogsProvider::saveAPlaylist()
 {
-    QStringList files = showSimpleOpen();
-    QString file;
-    for( size_t i = 0 ; i< files.size(); i++ )
+    QFileDialog *qfd = new QFileDialog( NULL,
+                                   qtr( "Choose a filename to save playlist" ),
+                                   qfu( p_intf->p_sys->psz_filepath ),
+                                   qtr( "XSPF playlist (*.xspf);; " ) +
+                                   qtr( "M3U playlist (*.m3u);; Any (*.*) " ) );
+    qfd->setFileMode( QFileDialog::AnyFile );
+    qfd->setAcceptMode( QFileDialog::AcceptSave );
+    qfd->setConfirmOverwrite( true );
+
+    if( qfd->exec() == QDialog::Accepted )
     {
-        const char * psz_utf8 = qtu( files[i] );
-        /* Play the first one, parse and enqueue the other ones */
-        playlist_Add( THEPL, psz_utf8, NULL,
-                      PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
-                      ( i ? PLAYLIST_PREPARSE : 0 ),
-                      PLAYLIST_END, VLC_TRUE );
+        if( qfd->selectedFiles().count() > 0 )
+        {
+            static const char psz_xspf[] = "export-xspf",
+                              psz_m3u[] = "export-m3u";
+            const char *psz_module;
+
+            QString file = qfd->selectedFiles().first();
+            QString filter = qfd->selectedFilter();
+
+            if( file.contains( ".xsp" ) ||
+                ( filter.contains( ".xspf" ) && !file.contains( ".m3u" ) ) )
+            {
+                psz_module = psz_xspf;
+                if( !file.contains( ".xsp" ) )
+                    file.append( ".xspf" );
+            }
+            else
+            {
+                psz_module = psz_m3u;
+                if( !file.contains( ".m3u" ) )
+                    file.append( ".m3u" );
+            }
+
+            playlist_Export( THEPL, qtu( file ), THEPL->p_local_category,
+                             psz_module);
+        }
     }
+    delete qfd;
 }
 
-void DialogsProvider::openPlaylist()
+
+/****************************************************************************
+ * Sout emulation
+ ****************************************************************************/
+
+void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
+                                       bool b_transcode_only )
 {
-    QStringList files = showSimpleOpen();
-    QString file;
-    for( size_t i = 0 ; i< files.size(); i++ )
+    SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only );
+
+    if( s->exec() == QDialog::Accepted )
     {
-        const char * psz_utf8 = qtu( files[i] );
-        playlist_Import( THEPL, psz_utf8 );
+        msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) );
+        /* Just do it */
+        int i_len = strlen( qtu( s->getMrl() ) ) + 10;
+        char *psz_option = (char*)malloc( i_len );
+        snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) );
+
+        playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
+                         PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
+                        -1, &psz_option, 1, true, pl_Unlocked );
     }
 }
 
-void DialogsProvider::openDirectory()
+void DialogsProvider::openThenStreamingDialogs()
 {
-    QString dir = QFileDialog::getExistingDirectory ( 0,
-                                                     _("Open directory") );
-    const char *psz_utf8 = qtu( dir );
-    input_item_t *p_input = input_ItemNewExt( THEPL, psz_utf8, NULL,
-                                               0, NULL, -1 );
-    playlist_AddInput( THEPL, p_input, PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE);
-    input_Read( THEPL, p_input, VLC_FALSE );
+    OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_STREAM )
+                                ->showTab( OPEN_FILE_TAB );
 }
-void DialogsProvider::openMLDirectory()
+
+void DialogsProvider::openThenTranscodingDialogs()
 {
-    QString dir = QFileDialog::getExistingDirectory ( 0,
-                                                     _("Open directory") );
-    const char *psz_utf8 = qtu( dir );
-    input_item_t *p_input = input_ItemNewExt( THEPL, psz_utf8, NULL,
-                                               0, NULL, -1 );
-    playlist_AddInput( THEPL, p_input, PLAYLIST_APPEND, PLAYLIST_END,
-                        VLC_FALSE );
-    input_Read( THEPL, p_input, VLC_FALSE );
+    OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, false, OPEN_AND_SAVE )
+                                ->showTab( OPEN_FILE_TAB );
 }
 
-QStringList DialogsProvider::showSimpleOpen()
+/****************************************************************************
+ * Menus / Interaction
+ ****************************************************************************/
+
+void DialogsProvider::menuAction( QObject *data )
 {
-    QString FileTypes;
-    FileTypes = _("Media Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_MEDIA;
-    FileTypes += ");;";
-    FileTypes += _("Video Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_VIDEO;
-    FileTypes += ");;";
-    FileTypes += _("Sound Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_AUDIO;
-    FileTypes += ");;";
-    FileTypes += _("PlayList Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_PLAYLIST;
-    FileTypes += ");;";
-    FileTypes += _("All Files");
-    FileTypes += " (*.*)";
-    FileTypes.replace(QString(";*"), QString(" *"));
-    return QFileDialog::getOpenFileNames( NULL, qfu(I_POP_SEL_FILES ),
-                    p_intf->p_libvlc->psz_homedir, FileTypes );
+    QVLCMenu::DoAction( p_intf, data );
 }
 
-void DialogsProvider::switchToSkins()
+void DialogsProvider::menuUpdateAction( QObject *data )
 {
-    var_SetString( p_intf, "intf-switch", "skins2" );
+    MenuFunc * f = qobject_cast<MenuFunc *>(data);
+    f->doFunc( p_intf );
 }
 
-void DialogsProvider::bookmarksDialog()
+void DialogsProvider::SDMenuAction( QString data )
 {
+    char *psz_sd = strdup( qtu( data ) );
+    if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
+        playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
+    else
+        playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
+    free( psz_sd );
 }
 
-void DialogsProvider::popupMenu( int i_dialog )
+void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
 {
+    InteractionDialog *qdialog;
+    interaction_dialog_t *p_dialog = p_arg->p_dialog;
+    switch( p_dialog->i_action )
+    {
+    case INTERACT_NEW:
+        qdialog = new InteractionDialog( p_intf, p_dialog );
+        p_dialog->p_private = (void*)qdialog;
+        if( !(p_dialog->i_status == ANSWERED_DIALOG) )
+            qdialog->show();
+        break;
+    case INTERACT_UPDATE:
+        qdialog = (InteractionDialog*)(p_dialog->p_private);
+        if( qdialog )
+            qdialog->update();
+        else
+        {
+            /* The INTERACT_NEW message was forgotten
+               so we must create the dialog and update it*/
+            qdialog = new InteractionDialog( p_intf, p_dialog );
+            p_dialog->p_private = (void*)qdialog;
+            if( !(p_dialog->i_status == ANSWERED_DIALOG) )
+                qdialog->show();
+            if( qdialog )
+                qdialog->update();
+        }
+        break;
+    case INTERACT_HIDE:
+        qdialog = (InteractionDialog*)(p_dialog->p_private);
+        if( qdialog )
+            qdialog->hide();
+        p_dialog->i_status = HIDDEN_DIALOG;
+        break;
+    case INTERACT_DESTROY:
+        qdialog = (InteractionDialog*)(p_dialog->p_private);
+        if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
+            delete qdialog;
+        p_dialog->i_status = DESTROYED_DIALOG;
+        break;
+    }
+}
 
+void DialogsProvider::loadSubtitlesFile()
+{
+    input_thread_t *p_input = THEMIM->getInput();
+    if( !p_input )
+        return;
+    input_item_t *p_item = input_GetItem( p_input );
+    if( !p_item )
+        return;
+    char *path = input_item_GetURI( p_item );
+    if( !path )
+        path = strdup( "" );
+    char *sep = strrchr( path, DIR_SEP_CHAR );
+    if( sep )
+        *sep = '\0';
+    QStringList qsl = showSimpleOpen( qtr( "Open subtitles file" ),
+                                      EXT_FILTER_SUBTITLE,
+                                      path );
+    free( path );
+    QString qsFile;
+    foreach( qsFile, qsl )
+    {
+        if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) )
+            msg_Warn( p_intf, "unable to load subtitles from '%s'",
+                      qtu( qsFile ) );
+    }
 }