Qt4 - Copyright update and CRs

[vlc] / modules / gui / qt4 / main_interface.hpp

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 41b4cf19dde6fbd8e23df8231d3ef43e9b4ecf87..261336442caf7273bd36474039d3cdf2601837b1 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * main_interface.hpp : Main Interface
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -18,13 +18,14 @@
  *
  * 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 _MAIN_INTERFACE_H_
 #define _MAIN_INTERFACE_H_
 
-#include <vlc/intf.h>
-#include <vlc/aout.h>
+#include "qt4.hpp"
+#include <vlc_aout.h>
 #include "ui/main_interface.h"
 #include "util/qvlcframe.hpp"
 
@@ -42,6 +43,7 @@ class BackgroundWidget;
 class PlaylistWidget;
 class VolumeClickHandler;
 class VisualSelector;
+class ControlsWidget;
 
 class MainInterface : public QVLCMW
 {
@@ -56,6 +58,10 @@ public:
     int controlVideo( void *p_window, int i_query, va_list args );
 protected:
     void resizeEvent( QResizeEvent * );
+    void dropEvent( QDropEvent *);
+    void dragEnterEvent( QDragEnterEvent * );
+    void dragMoveEvent( QDragMoveEvent * );
+    void dragLeaveEvent( QDragLeaveEvent * );
     void closeEvent( QCloseEvent *);
     Ui::MainInterfaceUI ui;
     friend class VolumeClickHandler;
@@ -71,14 +77,23 @@ private:
     /* Video */
     VideoWidget         *videoWidget;
     virtual void keyPressEvent( QKeyEvent *);
+    virtual void wheelEvent( QWheelEvent * );
+
+    bool embeddedPlaylistWasActive;
+    bool videoIsActive;
+    QSize savedVideoSize;
+
 
     BackgroundWidget    *bgWidget;
     VisualSelector      *visualSelector;
+    ControlsWidget      *advControls;
     PlaylistWidget      *playlistWidget;
 
     bool                 playlistEmbeddedFlag;
     bool                 videoEmbeddedFlag;
     bool                 alwaysVideoFlag;
+    bool                 advControlsEnabled;
+    bool                 visualSelectorEnabled;
 
     InputManager        *main_input_manager;
     InputSlider         *slider;
@@ -88,7 +103,10 @@ private:
     QLabel              *nameLabel;
 
     void customEvent( QEvent *);
+public slots:
+    void undockPlaylist();
 private slots:
+    void setNavigation( int );
     void setStatus( int );
     void setName( QString );
     void setDisplay( float, int, int );
@@ -99,6 +117,7 @@ private slots:
     void next();
     void playlist();
     void visual();
+    void advanced();
     void updateVolume( int sliderVolume );
 };