Qt: now that you don't control the controls size anymore, be careful to resize the...

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

diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 6b34a1419fbce7f2c5ab265966bfe717a80c04e0..fdeeb2adb205b16c075e1943f8169f5f25869ef4 100644 (file)
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.hpp : Panels for the open dialogs
  ****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright (C) 2006-2009 the VideoLAN team
  * Copyright (C) 2007 Société des arts technologiques
  * Copyright (C) 2007 Savoir-faire Linux
  * $Id$
@@ -71,9 +71,6 @@ enum
     JACK_DEVICE
 };
 
-static const char *psz_devModule[] = { "v4l", "v4l2", "pvr", "dvb", "bda",
-                                       "dshow", "screen", "jack" };
-
 class QWidget;
 class QLineEdit;
 class QString;
@@ -94,22 +91,10 @@ protected:
 public slots:
     virtual void updateMRL() = 0;
 signals:
-    void mrlUpdated( QString );
+    void mrlUpdated( QStringList, 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();
-    void reject();
-};
-
 class FileOpenPanel: public OpenPanel
 {
     Q_OBJECT;
@@ -120,15 +105,12 @@ public:
     virtual void accept() ;
 private:
     Ui::OpenFile ui;
-    QStringList browse( QString );
-    FileOpenBox *dialogBox;
-    QLineEdit *lineFileEdit;
-    QStringList fileCompleteList ;
 public slots:
     virtual void updateMRL();
 private slots:
     void browseFileSub();
-    void toggleSubtitleFrame();
+    void browseFile();
+    void toggleSubtitleFrame( bool );
 };
 
 class NetOpenPanel: public OpenPanel