Qt4 - removing some debug.

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index f3881b8b81abf3d4d902d7607d56fcb1344a4aef..c0bd121180f7f03c8ab4029257b295404612fac1 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * 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>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
  *
  * 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
@@ -18,29 +19,33 @@
  *
  * 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 "ui/main_interface.h"
+#include "qt4.hpp"
 #include "util/qvlcframe.hpp"
 
-#include <QSize>
+#include <vlc_aout.h>
+
+#include <QSystemTrayIcon>
 
 class QSettings;
 class QCloseEvent;
 class QKeyEvent;
 class QLabel;
-
+class QEvent;
 class InputManager;
-class InputSlider;
 class VideoWidget;
 class BackgroundWidget;
 class PlaylistWidget;
-class VolumeClickHandler;
+class VisualSelector;
+class AdvControlsWidget;
+class ControlsWidget;
+class QMenu;
+class QSize;
 
 class MainInterface : public QVLCMW
 {
@@ -49,70 +54,88 @@ public:
     MainInterface( intf_thread_t *);
     virtual ~MainInterface();
 
-    void resizeEvent( QResizeEvent * );
+    void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
+                        int *pi_y, unsigned int *pi_width,
+                        unsigned int *pi_height );
+    void releaseVideo( void * );
+    int controlVideo( void *p_window, int i_query, va_list args );
 
+    QSystemTrayIcon *getSysTray() { return sysTray; };
+    QMenu *getSysTrayMenu() { return systrayMenu; };
+    bool isAdvancedVisible();
 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;
 private:
-    QSettings *settings;
-    QSize mainSize, addSize;
+    QSettings           *settings;
+    QSize                mainSize, addSize;
+    QSystemTrayIcon     *sysTray;
+    QMenu               *systrayMenu;
+    QString              input_name;
+    QVBoxLayout         *mainLayout;
+    ControlsWidget      *controls;
+
+    bool                 need_components_update;
 
     void calculateInterfaceSize();
     void handleMainUi( QSettings* );
-    
-    virtual void keyPressEvent( QKeyEvent *);
+    void handleSystray();
+    void doComponentsUpdate();
+    void createSystray();
 
-    /* All the stuff that goes in the main position */
+    /* Video */
     VideoWidget         *videoWidget;
+    virtual void keyPressEvent( QKeyEvent *);
+    virtual void wheelEvent( QWheelEvent * );
+
+    bool                 embeddedPlaylistWasActive;
+    bool                 videoIsActive;
+    QSize                savedVideoSize;
+
     BackgroundWidget    *bgWidget;
+    VisualSelector      *visualSelector;
     PlaylistWidget      *playlistWidget;
 
     bool                 playlistEmbeddedFlag;
     bool                 videoEmbeddedFlag;
+    bool                 alwaysVideoFlag;
+    bool                 visualSelectorEnabled;
+    bool                 notificationEnabled;
 
     InputManager        *main_input_manager;
-    InputSlider         *slider;
     input_thread_t      *p_input;    ///< Main input associated to the playlist
 
     QLabel              *timeLabel;
+    QLabel              *speedLabel;
     QLabel              *nameLabel;
+
+    void customEvent( QEvent *);
+public slots:
+    void undockPlaylist();
+    void toggleMenus();
+    void togglePlaylist();
+    void toggleUpdateSystrayMenu();
+    void toggleAdvanced();
 private slots:
+    void updateOnTimer();
     void setStatus( int );
     void setName( QString );
+    void setVLCWindowsTitle( QString title = "" );
     void setDisplay( float, int, int );
-    void updateOnTimer();
-    void play();
-    void stop();
-    void prev();
-    void next();
-    void playlist();
-    void updateVolume( int sliderVolume );
-};
-
-
-class VolumeClickHandler : public QObject
-{
-public:
-    VolumeClickHandler( MainInterface *_m ) :QObject(_m) {m = _m; }
-    virtual ~VolumeClickHandler() {};
-    bool eventFilter( QObject *obj, QEvent *e )
-    {
-        if (e->type() == QEvent::MouseButtonPress )
-        {
-            if( obj->objectName() == "volLowLabel" )
-            {
-                m->ui.volumeSlider->setValue( 0 );
-            }
-            else
-                m->ui.volumeSlider->setValue( 100 );
-            return true;
-        }
-        return false;
-    }
-private:
-    MainInterface *m;
+#if 0
+    void visual();
+#endif
+    void handleSystrayClick( QSystemTrayIcon::ActivationReason );
+    void updateSystrayMenu( int );
+    void updateSystrayTooltipName( QString );
+    void updateSystrayTooltipStatus( int );
+    void showSpeedMenu( QPoint );
+    void showTimeMenu( QPoint );
 };
 
 #endif