qt4 - Simple Preferences: add the overlay option to the video preferences panel.

[vlc] / modules / gui / qt4 / components / open.hpp

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index 45a3c342603913662450cb3f5df4504f823cec0e..96ee0236dd65c7f0046c8bb38f8139025627c9f4 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.hpp : Panels for the open dialogs
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -28,12 +28,13 @@
 #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
@@ -51,10 +52,21 @@ protected:
 public slots:
     virtual void updateMRL() = 0;
 signals:
-    void mrlUpdated(QString);
+    void mrlUpdated( QString );
     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,16 +78,14 @@ public:
 private:
     Ui::OpenFile ui;
     QStringList browse( QString );
-    QFileDialog *dialogBox;
+    FileOpenBox *dialogBox;
     QLineEdit *lineFileEdit;
-    bool eventFilter(QObject *, QEvent *);
 public slots:
     virtual void updateMRL();
 private slots:
     void browseFile();
     void browseFileSub();
     void toggleSubtitleFrame();
-
 };
 
 class NetOpenPanel: public OpenPanel
@@ -94,12 +104,12 @@ private slots:
     void updateAddress();
 };
 
-class DiskOpenPanel: public OpenPanel
+class DiscOpenPanel: public OpenPanel
 {
     Q_OBJECT;
 public:
-    DiskOpenPanel( QWidget *, intf_thread_t * );
-    virtual ~DiskOpenPanel();
+    DiscOpenPanel( QWidget *, intf_thread_t * );
+    virtual ~DiscOpenPanel();
     virtual void clear() ;
 private:
     Ui::OpenDisk ui;