Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index c6d9f9d0cfad6c5f155f15fc3d0375a117b1d3d8..fa9cf2efdb54d19bf95de9425e1c6a494b3567a9 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -5,6 +5,7 @@
  * $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,18 +19,18 @@
  *
  * 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 "qt4.hpp"
-#include <vlc_aout.h>
-#include "ui/main_interface.h"
 #include "util/qvlcframe.hpp"
 
-#include <QSize>
+#include <vlc_aout.h>
+
+#include <QSystemTrayIcon>
 
 class QSettings;
 class QCloseEvent;
@@ -37,13 +38,15 @@ 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 SpeedControlWidget;
+class QMenu;
+class QSize;
 
 class MainInterface : public QVLCMW
 {
@@ -51,11 +54,16 @@ class MainInterface : public QVLCMW
 public:
     MainInterface( intf_thread_t *);
     virtual ~MainInterface();
+
     void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
                         int *pi_y, unsigned int *pi_width,
                         unsigned int *pi_height );
-    void releaseVideo( void *);
+    void releaseVideo( void * );
     int controlVideo( void *p_window, int i_query, va_list args );
+
+    QSystemTrayIcon *getSysTray() { return sysTray; };
+    QMenu *getSysTrayMenu() { return systrayMenu; };
+    int getControlsVisibilityStatus();
 protected:
     void resizeEvent( QResizeEvent * );
     void dropEvent( QDropEvent *);
@@ -63,83 +71,82 @@ protected:
     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;
+    QMenu                *speedControlMenu;
+    SpeedControlWidget  *speedControl;
+
+    bool                 need_components_update;
 
-    bool need_components_update;
     void calculateInterfaceSize();
     void handleMainUi( QSettings* );
+    void handleSystray();
     void doComponentsUpdate();
+    void createSystray();
 
     /* Video */
     VideoWidget         *videoWidget;
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
 
-    bool embeddedPlaylistWasActive;
-    bool videoIsActive;
-    QSize savedVideoSize;
-
+    bool                 embeddedPlaylistWasActive;
+    bool                 videoIsActive;
+    QSize                savedVideoSize;
 
     BackgroundWidget    *bgWidget;
     VisualSelector      *visualSelector;
-    ControlsWidget      *advControls;
     PlaylistWidget      *playlistWidget;
 
     bool                 playlistEmbeddedFlag;
     bool                 videoEmbeddedFlag;
     bool                 alwaysVideoFlag;
-    bool                 advControlsEnabled;
     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;
+ 
+    bool                 b_remainingTime;
 
     void customEvent( QEvent *);
 public slots:
     void undockPlaylist();
-    void playlist();
+    void toggleMenus();
+    void togglePlaylist();
+    void toggleUpdateSystrayMenu();
+    void toggleAdvanced();
 private slots:
-    void setNavigation( int );
+    void updateOnTimer();
+
     void setStatus( int );
+    void setRate( int );
     void setName( QString );
-    void setDisplay( float, int, int );
-    void updateOnTimer();
-    void play();
-    void stop();
-    void prev();
-    void next();
+    void setVLCWindowsTitle( QString title = "" );
+    void setDisplayPosition( float, int, int );
+    void toggleTimeDisplay();
+    void setElapsedTime();
+    void setRemainTime();
+#if 0
     void visual();
-    void advanced();
-    void updateVolume( int sliderVolume );
-};
-
-
-class VolumeClickHandler : public QObject
-{
-public:
-    VolumeClickHandler( intf_thread_t *_p_intf, MainInterface *_m ) :QObject(_m)
-    {m = _m; p_intf = _p_intf; }
-    virtual ~VolumeClickHandler() {};
-    bool eventFilter( QObject *obj, QEvent *e )
-    {
-        if (e->type() == QEvent::MouseButtonPress )
-        {
-            aout_VolumeMute( p_intf, NULL );
-            return true;
-        }
-        return false;
-    }
-private:
-    MainInterface *m;
-    intf_thread_t *p_intf;
+#endif
+    void handleSystrayClick( QSystemTrayIcon::ActivationReason );
+    void updateSystrayMenu( int );
+    void updateSystrayTooltipName( QString );
+    void updateSystrayTooltipStatus( int );
+    void showSpeedMenu( QPoint );
+    void showTimeMenu( QPoint );
 };
 
 #endif