Qt4 - Unification of Hotkeys for Sprefs et Adv Preferences.

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

diff --git a/modules/gui/qt4/components/open.hpp b/modules/gui/qt4/components/open.hpp
index efabcb4e1e3ac89bbe98262702a7d3edafedf564..32bc6acaab771a3031b6e6bbb9c713bdb9be9baf 100644 (file)
--- a/modules/gui/qt4/components/open.hpp
+++ b/modules/gui/qt4/components/open.hpp
@@ -2,10 +2,13 @@
  * open.hpp : Panels for the open dialogs
  ****************************************************************************
  * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2007 Société des arts technologiques
+ * Copyright (C) 2007 Savoir-faire Linux
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *          Jean-Baptiste Kempf <jb@videolan.org>
+ *          Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +29,7 @@
 #define _OPENPANELS_H_
 
 #include <vlc/vlc.h>
+
 #include <QFileDialog>
 
 #include "ui/open_file.h"
@@ -37,13 +41,20 @@
 #   include <limits.h>
 #endif
 
-#define setMaxBound( spinbox ) spinbox->setRange ( 0, INT_MAX );
+#define setSpinBoxFreq( spinbox ){ spinbox->setRange ( 0, INT_MAX ); \
+    spinbox->setAccelerated( true ); }
 
-#define V4L_DEVICE         0x0
-#define PVR_DEVICE         0x1
-#define DVB_DEVICE         0x2
-#define BDA_DEVICE         0x4
-#define DSHOW_DEVICE       0x8
+enum
+{
+    V4L_DEVICE,
+    V4L2_DEVICE,
+    PVR_DEVICE,
+    DVB_DEVICE,
+    BDA_DEVICE,
+    DSHOW_DEVICE,
+    SCREEN_DEVICE,
+    JACK_DEVICE
+};
 
 class QWidget;
 class QLineEdit;
@@ -92,10 +103,10 @@ private:
     QStringList browse( QString );
     FileOpenBox *dialogBox;
     QLineEdit *lineFileEdit;
+    QStringList fileCompleteList ;
 public slots:
     virtual void updateMRL();
 private slots:
-    void browseFile();
     void browseFileSub();
     void toggleSubtitleFrame();
 };
@@ -112,8 +123,7 @@ private:
 public slots:
     virtual void updateMRL();
 private slots:
-    void updateProtocol(int);
-    void updateAddress();
+    void updateProtocol( int );
 };
 
 class DiscOpenPanel: public OpenPanel
@@ -123,11 +133,16 @@ public:
     DiscOpenPanel( QWidget *, intf_thread_t * );
     virtual ~DiscOpenPanel();
     virtual void clear() ;
+    virtual void accept() ;
 private:
     Ui::OpenDisk ui;
+    char *psz_dvddiscpath, *psz_vcddiscpath, *psz_cddadiscpath;
+    bool b_firstdvd, b_firstvcd, b_firstcdda;
 public slots:
     virtual void updateMRL() ;
-    virtual void updateButtons() ;
+private slots:
+    void browseDevice();
+    void updateButtons() ;
 };
 
 
@@ -142,12 +157,16 @@ private:
     Ui::OpenCapture ui;
     QRadioButton *dvbs, *dvbt, *dvbc;
     QRadioButton *bdas, *bdat, *bdac;
-    QSpinBox  *v4lFreq, *pvrFreq, *pvrBitr ;
+    QSpinBox  *v4lFreq, *pvrFreq, *pvrBitr;
     QLineEdit *v4lVideoDevice, *v4lAudioDevice;
+    QLineEdit *v4l2VideoDevice, *v4l2AudioDevice;
     QLineEdit *pvrDevice, *pvrRadioDevice;
-    QComboBox *v4lNormBox, *pvrNormBox, *bdaBandBox;
+    QComboBox *v4lNormBox, *v4l2StdBox, *pvrNormBox, *bdaBandBox;
     QSpinBox *dvbCard, *dvbFreq, *dvbSrate;
     QSpinBox *bdaCard, *bdaFreq, *bdaSrate;
+    QSpinBox *jackChannels, *jackCaching;
+    QCheckBox *jackPace, *jackConnect;
+    QLineEdit *jackPortsSelected;
 
     QLabel *bdaSrateLabel, *bdaBandLabel;