X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=1b6524889316039a745613d691c70f432b6a717f;hb=be2da4aba6f258c58c93d86c177fc457ac6431c8;hp=879980ad931433737e7c8df605024f4bff7a75d3;hpb=22168eab8bdf29606b3c64fd216a86f684866d97;p=vlc

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 879980ad93..1b65248893 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -26,16 +26,14 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
 #include <vlc_intf_strings.h>
 
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
-#include "main_interface.hpp"
+#include "input_manager.hpp" /* Load Subtitles */
 #include "menus.hpp"
-#include "input_manager.hpp"
 #include "recents.hpp"
-#include "util/qvlcapp.hpp"
+#include "util/qt_dirs.hpp"
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"
@@ -50,6 +48,9 @@
 #include "dialogs/help.hpp"
 #include "dialogs/gototime.hpp"
 #include "dialogs/podcast_configuration.hpp"
+#include "dialogs/toolbar.hpp"
+#include "dialogs/plugins.hpp"
+#include "dialogs/interaction.hpp"
 
 #include <QEvent>
 #include <QApplication>
@@ -96,12 +97,8 @@ DialogsProvider::~DialogsProvider()
 
 void DialogsProvider::quit()
 {
-    /* Stop the playlist */
-    playlist_Stop( THEPL );
     b_isDying = true;
     vlc_object_kill( p_intf->p_libvlc );
-    QApplication::closeAllWindows();
-    QApplication::quit();
 }
 
 void DialogsProvider::customEvent( QEvent *event )
@@ -238,6 +235,17 @@ void DialogsProvider::podcastConfigureDialog()
     PodcastConfigDialog::getInstance( p_intf )->toggleVisible();
 }
 
+void DialogsProvider::toolbarDialog()
+{
+    ToolbarEditDialog::getInstance( p_intf )->toggleVisible();
+}
+
+void DialogsProvider::pluginDialog()
+{
+    PluginDialog *diag = new PluginDialog( p_intf );
+    diag->show();
+}
+
 /* Generic open file */
 void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
 {
@@ -372,7 +380,7 @@ QStringList DialogsProvider::showSimpleOpen( QString help,
     fileTypes.replace(QString(";*"), QString(" *"));
 
     return QFileDialog::getOpenFileNames( NULL,
-        help.isEmpty() ? qfu(I_OP_SEL_FILES ) : help,
+        help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help,
         path.isEmpty() ? qfu( p_intf->p_sys->psz_filepath ) : path,
         fileTypes );
 }
@@ -427,11 +435,9 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
 
     if (!dir.isEmpty() )
     {
-        QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive )
-            ? "dvd://" : "directory://" + toNativeSeparators( dir );
-        msg_Dbg( p_intf, "Directory opening: %s", qtu( dir ) );
-        input_item_t *p_input = input_item_NewExt( THEPL, qtu( mrl ),
-                              NULL, 0, NULL, -1 );
+        QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) ?
+            "dvd://" : "directory://" + toNativeSeparators( dir );
+        input_item_t *p_input = input_item_New( THEPL, qtu( mrl ), NULL );
 
         /* FIXME: playlist_AddInput() can fail */
         playlist_AddInput( THEPL, p_input,
@@ -478,7 +484,9 @@ void DialogsProvider::saveAPlaylist()
                                    qtr( "Save playlist as..." ),
                                    qfu( p_intf->p_sys->psz_filepath ),
                                    qtr( "XSPF playlist (*.xspf);; " ) +
-                                   qtr( "M3U playlist (*.m3u);; Any (*.*) " ) );
+                                   qtr( "M3U playlist (*.m3u);; " ) +
+                                   qtr( "HTML playlist (*.html);;" ) +
+                                   qtr( "Any (*.*) " ) );
     qfd->setFileMode( QFileDialog::AnyFile );
     qfd->setAcceptMode( QFileDialog::AcceptSave );
     qfd->setConfirmOverwrite( true );
@@ -488,25 +496,37 @@ void DialogsProvider::saveAPlaylist()
         if( qfd->selectedFiles().count() > 0 )
         {
             static const char psz_xspf[] = "export-xspf",
-                              psz_m3u[] = "export-m3u";
+                              psz_m3u[] = "export-m3u",
+                              psz_html[] = "export-html";
             const char *psz_module;
 
             QString file = qfd->selectedFiles().first();
             QString filter = qfd->selectedFilter();
 
-            if( file.contains( ".xsp" ) ||
-                ( filter.contains( ".xspf" ) && !file.contains( ".m3u" ) ) )
+            if( file.contains( ".xsp" ) || filter.contains( "XSPF" ) )
             {
                 psz_module = psz_xspf;
                 if( !file.contains( ".xsp" ) )
                     file.append( ".xspf" );
             }
-            else
+            else if( file.contains( ".m3u" )  || filter.contains( "M3U" ) )
             {
                 psz_module = psz_m3u;
                 if( !file.contains( ".m3u" ) )
                     file.append( ".m3u" );
             }
+            else if( file.contains(".html" ) || filter.contains( "HTML" ) )
+            {
+                psz_module = psz_html;
+                if( !file.contains( "html" ) )
+                    file.append( ".html" );
+            }
+            else
+            {
+                msg_Err( p_intf, "Impossible to recognise the file type" );
+                delete qfd;
+                return;
+            }
 
             playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
                         THEPL->p_local_category, psz_module);
@@ -526,15 +546,12 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
 
     if( s->exec() == QDialog::Accepted )
     {
-        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() ) );
+        const char *psz_option = qtu( s->getMrl() );
 
+        msg_Dbg( p_intf, "Sout mrl %s", psz_option );
         playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
                          PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
-                        -1, &psz_option, 1, true, pl_Unlocked );
+                        -1, 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked );
         RecentsMRL::getInstance( p_intf )->addRecent( mrl );
     }
 }
@@ -572,7 +589,7 @@ void DialogsProvider::loadSubtitlesFile()
     QString qsFile;
     foreach( qsFile, qsl )
     {
-        if( !input_AddSubtitles( p_input, qtu( toNativeSeparators( qsFile ) ),
+        if( input_AddSubtitle( p_input, qtu( toNativeSeparators( qsFile ) ),
                     true ) )
             msg_Warn( p_intf, "unable to load subtitles from '%s'",
                       qtu( qsFile ) );
@@ -586,7 +603,7 @@ void DialogsProvider::loadSubtitlesFile()
 
 void DialogsProvider::menuAction( QObject *data )
 {
-    QVLCMenu::DoAction( p_intf, data );
+    QVLCMenu::DoAction( data );
 }
 
 void DialogsProvider::menuUpdateAction( QObject *data )
@@ -598,7 +615,7 @@ void DialogsProvider::menuUpdateAction( QObject *data )
 
 void DialogsProvider::SDMenuAction( QString data )
 {
-    char *psz_sd = qtu( data );
+    const char *psz_sd = qtu( data );
     if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
         playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
     else
@@ -610,11 +627,8 @@ void DialogsProvider::SDMenuAction( QString data )
  **/
 void DialogsProvider::playMRL( const QString &mrl )
 {
-    input_item_t *p_input = input_item_New( p_intf,
-            qtu( mrl ), NULL );
-    playlist_AddInput( THEPL, p_input, PLAYLIST_GO,
-            PLAYLIST_END, true, pl_Unlocked );
-    vlc_gc_decref( p_input );
+    playlist_Add( THEPL, qtu( mrl ) , NULL,
+           PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false );
 
     RecentsMRL::getInstance( p_intf )->addRecent( mrl );
 }