* qt: don't hide the file browser on double click

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index 12ab0e39f265e66fecb2a49f40cbf35c361a62cc..849675b2fd06eb170d739667be20f3cb6679cb5a 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -55,7 +55,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     fileTypes.replace(QString(";*"), QString(" *"));
 
     // Make this QFileDialog a child of tempWidget from the ui.
-    dialogBox = new QFileDialog( ui.tempWidget, NULL,
+    dialogBox = new FileOpenBox( ui.tempWidget, NULL,
             qfu( p_intf->p_libvlc->psz_homedir ), fileTypes );
     dialogBox->setFileMode( QFileDialog::ExistingFiles );
     /* We don't want to see a grip in the middle of the window, do we? */
@@ -196,8 +196,8 @@ bool FileOpenPanel::eventFilter(QObject *object, QEvent *event)
 {
     if ( ( object == dialogBox ) && ( event->type() == QEvent::Hide ) )
     {
-         event->ignore();
-         return true;
+        event->ignore();
+        return true;
     }
     // standard event processing
     else

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index 45a3c342603913662450cb3f5df4504f823cec0e..b063a4280652b142da6be69866839a44ac844017 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -28,12 +28,12 @@
 #include <vlc/vlc.h>
 #include <QWidget>
 #include <QString>
+#include <QFileDialog>
 #include "ui/open_file.h"
 #include "ui/open_disk.h"
 #include "ui/open_net.h"
 #include "ui/open_capture.h"
 
-class QFileDialog;
 class QLineEdit;
 
 class OpenPanel: public QWidget
@@ -55,6 +55,17 @@ signals:
     void methodChanged( QString method );
 };
 
+class FileOpenBox: public QFileDialog
+{
+    Q_OBJECT;
+public:
+    FileOpenBox( QWidget *parent, const QString &caption,
+        const QString &directory, const QString &filter ):
+        QFileDialog( parent, caption, directory, filter ) {}
+public slots:
+    void accept() {}
+};
+
 class FileOpenPanel: public OpenPanel
 {
     Q_OBJECT;
@@ -66,7 +77,7 @@ public:
 private:
     Ui::OpenFile ui;
     QStringList browse( QString );
-    QFileDialog *dialogBox;
+    FileOpenBox *dialogBox;
     QLineEdit *lineFileEdit;
     bool eventFilter(QObject *, QEvent *);
 public slots:
@@ -75,7 +86,6 @@ private slots:
     void browseFile();
     void browseFileSub();
     void toggleSubtitleFrame();
-
 };
 
 class NetOpenPanel: public OpenPanel