Qt: Do not react to double-click in editor.

[vlc] / modules / gui / qt4 / dialogs_provider.cpp

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index a756e24b0bcf8cef9ac09b718b05a3e2c218a59e..1b6524889316039a745613d691c70f432b6a717f 100644 (file)
--- 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"
@@ -51,6 +49,8 @@
 #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>
@@ -97,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 )
@@ -244,6 +240,12 @@ 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 )
 {
@@ -435,8 +437,7 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
     {
         QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) ?
             "dvd://" : "directory://" + toNativeSeparators( dir );
-        input_item_t *p_input = input_item_NewExt( THEPL, qtu( mrl ),
-                              NULL, 0, NULL, -1 );
+        input_item_t *p_input = input_item_New( THEPL, qtu( mrl ), NULL );
 
         /* FIXME: playlist_AddInput() can fail */
         playlist_AddInput( THEPL, p_input,
@@ -501,7 +502,6 @@ void DialogsProvider::saveAPlaylist()
 
             QString file = qfd->selectedFiles().first();
             QString filter = qfd->selectedFilter();
-            const char* filt = filter.toAscii();
 
             if( file.contains( ".xsp" ) || filter.contains( "XSPF" ) )
             {
@@ -546,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 );
     }
 }
@@ -592,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 ) );
@@ -606,7 +603,7 @@ void DialogsProvider::loadSubtitlesFile()
 
 void DialogsProvider::menuAction( QObject *data )
 {
-    QVLCMenu::DoAction( p_intf, data );
+    QVLCMenu::DoAction( data );
 }
 
 void DialogsProvider::menuUpdateAction( QObject *data )
@@ -618,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