Merge branch '1.0'

[vlc] / modules / gui / qt4 / dialogs / extended.hpp

diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index 23af755cfcb7d28aee3e82080cc1d23dda02ac63..da5e29acc09375210e4b8b08ef76f991933cf523 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -2,7 +2,7 @@
  * extended.hpp : Extended controls - Undocked
  ****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
- * $Id: streaminfo.hpp 16687 2006-09-17 12:15:42Z jb $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -18,14 +18,17 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _EXTENDED_DIALOG_H_
-#define _EXTENDED_DIALOG_H_
+#ifndef QVLC_EXTENDED_DIALOG_H_
+#define QVLC_EXTENDED_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
-#include <QHBoxLayout>
+
+#include "components/extended_panels.hpp"
+
+class QTabWidget;
 
 class ExtendedDialog : public QVLCFrame
 {
@@ -37,11 +40,25 @@ public:
             instance = new ExtendedDialog( p_intf );
         return instance;
     }
-    virtual ~ExtendedDialog();
+    static void killInstance()
+    {
+        delete instance;
+        instance = NULL;
+    }
+    void showTab( int i );
 private:
     ExtendedDialog( intf_thread_t * );
+    virtual ~ExtendedDialog();
+
     static ExtendedDialog *instance;
-public slots:
+
+    SyncControls *syncW;
+    ExtVideo *videoEffect;
+    Equalizer *equal;
+    QTabWidget *mainTabW;
+private slots:
+    void changedItem( int );
 };
 
 #endif
+