Qt4: Split the controllers from the rest of the interface widgets.

modules/gui/qt4/Modules.am

@@ -38,6 +38,7 @@ nodist_SOURCES_qt4 = \
 		components/simple_preferences.moc.cpp \
 		components/open_panels.moc.cpp \
 		components/interface_widgets.moc.cpp \
+		components/controller.moc.cpp \
 		components/playlist/playlist_model.moc.cpp \
 		components/playlist/playlist_item.moc.cpp \
 		components/playlist/playlist.moc.cpp \
@@ -191,6 +192,7 @@ SOURCES_qt4 = 	qt4.cpp \
 		components/simple_preferences.cpp \
 		components/open_panels.cpp \
 		components/interface_widgets.cpp \
+		components/controller.cpp \
 		components/playlist/playlist_model.cpp \
 		components/playlist/playlist_item.cpp \
 		components/playlist/standardpanel.cpp \
@@ -227,6 +229,7 @@ noinst_HEADERS = \
 	components/simple_preferences.hpp \
 	components/open_panels.hpp \
 	components/interface_widgets.hpp \
+	components/controller.hpp \
 	components/playlist/playlist_model.hpp \
 	components/playlist/playlist_item.hpp \
 	components/playlist/panels.hpp \

modules/gui/qt4/components/controller.hpp

+/*****************************************************************************
+ * interface_widgets.hpp : Custom widgets for the main interface
+ ****************************************************************************
+ * Copyright (C) 2006 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
+ *          Rafaël Carré <funman@videolanorg>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef _CONTROLLER_H_
+#define _CONTROLLER_H_
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_interface.h>
+
+#include "qt4.hpp"
+#include "main_interface.hpp"
+#include "input_manager.hpp"
+
+#include <QWidget>
+#include <QFrame>
+
+class QPixmap;
+class QLabel;
+class QHBoxLayout;
+
+/* Advanced Button Bar */
+class QPushButton;
+class AdvControlsWidget : public QFrame
+{
+    Q_OBJECT
+public:
+    AdvControlsWidget( intf_thread_t *, bool );
+    virtual ~AdvControlsWidget();
+
+    void enableInput( bool );
+    void enableVideo( bool );
+
+private:
+    intf_thread_t *p_intf;
+    QPushButton *recordButton, *ABButton;
+    QPushButton *snapshotButton, *frameButton;
+
+    static mtime_t timeA, timeB;
+    int i_last_input_id;
+
+private slots:
+    void snapshot();
+#if 0
+    void frame();
+#endif
+    void fromAtoB();
+    void record();
+    void AtoBLoop( float, int, int );
+    void setIcon();
+
+signals:
+    void timeChanged();
+};
+
+/* Button Bar */
+class InputSlider;
+class QSlider;
+class QGridLayout;
+class VolumeClickHandler;
+class SoundSlider;
+class QAbstractSlider;
+class QToolButton;
+
+class ControlsWidget : public QFrame
+{
+    Q_OBJECT
+public:
+    /* p_intf, advanced control visible or not, blingbling or not */
+    ControlsWidget( intf_thread_t *_p_i, MainInterface *_p_mi,
+        bool b_advControls, bool b_shiny, bool b_fsCreation = false);
+    virtual ~ControlsWidget();
+
+    QPushButton *playlistButton;
+    void setStatus( int );
+    void enableInput( bool );
+public slots:
+    void setNavigation( int );
+protected:
+    friend class MainInterface;
+    friend class VolumeClickHandler;
+protected:
+    intf_thread_t       *p_intf;
+    QWidget             *discFrame;
+    QWidget             *telexFrame;
+    QGridLayout         *controlLayout;
+    InputSlider         *slider;
+    QPushButton         *prevSectionButton, *nextSectionButton, *menuButton;
+    QPushButton         *playButton, *fullscreenButton, *extSettingsButton;
+    QPushButton         *telexTransparent, *telexOn;
+    QSpinBox            *telexPage;
+    QToolButton         *slowerButton, *fasterButton;
+    QHBoxLayout         *controlButLayout;
+    AdvControlsWidget   *advControls;
+    QLabel              *volMuteLabel;
+    QAbstractSlider     *volumeSlider;
+    VolumeClickHandler  *hVolLabel;
+
+    bool                 b_advancedVisible;
+    bool                 b_telexTransparent;
+    bool                 b_telexEnabled;
+protected slots:
+    void play();
+    void stop();
+    void prev();
+    void next();
+    void updateVolume( int );
+    void updateVolume( void );
+    void updateInput();
+    void fullscreen();
+    void extSettings();
+    void faster();
+    void slower();
+    void toggleAdvanced();
+    void toggleTeletext();
+    void toggleTeletextTransparency();
+    void enableTeletext( bool );
+    void enableVideo( bool );
+signals:
+    void advancedControlsToggled( bool );
+};
+
+/* on WIN32 hide() for fullscreen controller doesnt work, so it have to be
+   done by trick with setting the opacity of window */
+#ifdef WIN32
+    #define WIN32TRICK
+#endif
+
+/* to trying transparency with fullscreen controller on windows enable that */
+/* it can be enabled on-non windows systems,
+   but it will be transparent only with composite manager */
+#ifndef WIN32
+    #define HAVE_TRANSPARENCY 1
+#else
+    #define HAVE_TRANSPARENCY 0
+#endif
+
+/* Default value of opacity for FS controller */
+#define DEFAULT_OPACITY 0.75
+
+/***********************************
+ * Fullscreen controller
+ ***********************************/
+class FullscreenControllerWidget : public ControlsWidget
+{
+    Q_OBJECT
+public:
+    FullscreenControllerWidget( intf_thread_t *, MainInterface*, bool, bool );
+    virtual ~FullscreenControllerWidget();
+
+    /* */
+    void attachVout( vout_thread_t *p_vout );
+    void detachVout();
+    void fullscreenChanged( vout_thread_t *, bool b_fs, int i_timeout );
+    vout_thread_t *p_vout;
+
+    int i_mouse_last_move_x;
+    int i_mouse_last_move_y;
+
+protected:
+    friend class MainInterface;
+    friend class VolumeClickHandler;
+
+    virtual void mouseMoveEvent( QMouseEvent *event );
+    virtual void mousePressEvent( QMouseEvent *event );
+    virtual void enterEvent( QEvent *event );
+    virtual void leaveEvent( QEvent *event );
+    virtual void keyPressEvent( QKeyEvent *event );
+
+private slots:
+    void showFSC();
+    void planHideFSC();
+    void hideFSC();
+
+    void slowHideFSC();
+
+
+private:
+    QTimer *p_hideTimer;
+#if HAVE_TRANSPARENCY
+    QTimer *p_slowHideTimer;
+#endif
+
+    int i_mouse_last_x;
+    int i_mouse_last_y;
+
+    bool b_mouse_over;
+
+    bool b_slow_hide_begin;
+    int  i_slow_hide_timeout;
+
+#ifdef WIN32TRICK
+    bool b_fscHidden;
+#endif
+
+    virtual void customEvent( QEvent *event );
+
+
+    /* Shared variable between FSC and VLC (protected by a lock) */
+    vlc_mutex_t lock;
+    bool        b_fullscreen;
+    int         i_hide_timeout;  /* FSC hiding timeout, same as mouse hiding timeout */
+};
+
+#endif

modules/gui/qt4/components/interface_widgets.hpp

@@ -36,15 +36,16 @@
 
 #include "qt4.hpp"
 #include "main_interface.hpp"
-#include "input_manager.hpp"
+#include "components/controller.hpp"
 
 #include <QWidget>
 #include <QFrame>
+#include <QLabel>
+#include <QMouseEvent>
 
 class ResizeEvent;
 class QPalette;
 class QPixmap;
-class QLabel;
 class QHBoxLayout;
 
 /******************** Video Widget ****************/
@@ -63,6 +64,15 @@ public:
     int   control( void *, int, va_list );
 
     virtual QSize sizeHint() const;
+
+protected:
+    virtual QPaintEngine *paintEngine() const
+    {
+        return NULL;
+    }
+
+    virtual void paintEvent(QPaintEvent *);
+
 private:
     intf_thread_t *p_intf;
     vout_thread_t *p_vout;
@@ -75,13 +85,6 @@ signals:
 public slots:
     void SetSizing( unsigned int, unsigned int );
 
-protected:
-    virtual QPaintEngine *paintEngine() const
-    {
-        return NULL;
-    }
-
-    virtual void paintEvent(QPaintEvent *);
 };
 
 /******************** Background Widget ****************/
@@ -98,6 +101,7 @@ private:
     virtual void contextMenuEvent( QContextMenuEvent *event );
     intf_thread_t *p_intf;
     virtual void resizeEvent( QResizeEvent * event );
+
 public slots:
     void toggle(){ TOGGLEV( this ); }
     void updateArt( input_item_t* );
@@ -119,216 +123,19 @@ private slots:
 };
 #endif
 
-/* Advanced Button Bar */
-class QPushButton;
-class AdvControlsWidget : public QFrame
-{
-    Q_OBJECT
-public:
-    AdvControlsWidget( intf_thread_t *, bool );
-    virtual ~AdvControlsWidget();
-
-    void enableInput( bool );
-    void enableVideo( bool );
-
-private:
-    intf_thread_t *p_intf;
-    QPushButton *recordButton, *ABButton;
-    QPushButton *snapshotButton, *frameButton;
-
-    static mtime_t timeA, timeB;
-    int i_last_input_id;
-
-private slots:
-    void snapshot();
-#if 0
-    void frame();
-#endif
-    void fromAtoB();
-    void record();
-    void AtoBLoop( float, int, int );
-    void setIcon();
-
-signals:
-    void timeChanged();
-};
-
-/* Button Bar */
-class InputSlider;
-class QSlider;
-class QGridLayout;
-class VolumeClickHandler;
-class SoundSlider;
-class QAbstractSlider;
-class QToolButton;
-
-class ControlsWidget : public QFrame
-{
-    Q_OBJECT
-public:
-    /* p_intf, advanced control visible or not, blingbling or not */
-    ControlsWidget( intf_thread_t *_p_i, MainInterface *_p_mi,
-        bool b_advControls, bool b_shiny, bool b_fsCreation = false);
-    virtual ~ControlsWidget();
-
-    QPushButton *playlistButton;
-    void setStatus( int );
-    void enableInput( bool );
-public slots:
-    void setNavigation( int );
-protected:
-    friend class MainInterface;
-    friend class VolumeClickHandler;
-protected:
-    intf_thread_t       *p_intf;
-    QWidget             *discFrame;
-    QWidget             *telexFrame;
-    QGridLayout         *controlLayout;
-    InputSlider         *slider;
-    QPushButton         *prevSectionButton, *nextSectionButton, *menuButton;
-    QPushButton         *playButton, *fullscreenButton, *extSettingsButton;
-    QPushButton         *telexTransparent, *telexOn;
-    QSpinBox            *telexPage;
-    QToolButton         *slowerButton, *fasterButton;
-    QHBoxLayout         *controlButLayout;
-    AdvControlsWidget   *advControls;
-    QLabel              *volMuteLabel;
-    QAbstractSlider     *volumeSlider;
-    VolumeClickHandler  *hVolLabel;
-
-    bool                 b_advancedVisible;
-    bool                 b_telexTransparent;
-    bool                 b_telexEnabled;
-protected slots:
-    void play();
-    void stop();
-    void prev();
-    void next();
-    void updateVolume( int );
-    void updateVolume( void );
-    void updateInput();
-    void fullscreen();
-    void extSettings();
-    void faster();
-    void slower();
-    void toggleAdvanced();
-    void toggleTeletext();
-    void toggleTeletextTransparency();
-    void enableTeletext( bool );
-    void enableVideo( bool );
-signals:
-    void advancedControlsToggled( bool );
-};
-
-/* on WIN32 hide() for fullscreen controller doesnt work, so it have to be
-   done by trick with setting the opacity of window */
-#ifdef WIN32
-    #define WIN32TRICK
-#endif
-
-/* to trying transparency with fullscreen controller on windows enable that */
-/* it can be enabled on-non windows systems,
-   but it will be transparent only with composite manager */
-#ifndef WIN32
-    #define HAVE_TRANSPARENCY 1
-#else
-    #define HAVE_TRANSPARENCY 0
-#endif
-
-/* Default value of opacity for FS controller */
-#define DEFAULT_OPACITY 0.75
-
-/***********************************
- * Fullscreen controller
- ***********************************/
-class FullscreenControllerWidget : public ControlsWidget
-{
-    Q_OBJECT
-public:
-    FullscreenControllerWidget( intf_thread_t *, MainInterface*, bool, bool );
-    virtual ~FullscreenControllerWidget();
-
-    /* */
-    void attachVout( vout_thread_t *p_vout );
-    void detachVout();
-    void fullscreenChanged( vout_thread_t *, bool b_fs, int i_timeout );
-    vout_thread_t *p_vout;
-
-    int i_mouse_last_move_x;
-    int i_mouse_last_move_y;
-
-protected:
-    friend class MainInterface;
-    friend class VolumeClickHandler;
-
-    virtual void mouseMoveEvent( QMouseEvent *event );
-    virtual void mousePressEvent( QMouseEvent *event );
-    virtual void enterEvent( QEvent *event );
-    virtual void leaveEvent( QEvent *event );
-    virtual void keyPressEvent( QKeyEvent *event );
-
-private slots:
-    void showFSC();
-    void planHideFSC();
-    void hideFSC();
-
-    void slowHideFSC();
-
-
-private:
-    QTimer *p_hideTimer;
-#if HAVE_TRANSPARENCY
-    QTimer *p_slowHideTimer;
-#endif
-
-    int i_mouse_last_x;
-    int i_mouse_last_y;
-
-    bool b_mouse_over;
-
-    bool b_slow_hide_begin;
-    int  i_slow_hide_timeout;
-
-#ifdef WIN32TRICK
-    bool b_fscHidden;
-#endif
-
-    virtual void customEvent( QEvent *event );
-
-
-    /* Shared variable between FSC and VLC (protected by a lock) */
-    vlc_mutex_t lock;
-    bool        b_fullscreen;
-    int         i_hide_timeout;  /* FSC hiding timeout, same as mouse hiding timeout */
-};
-
-
 #define VOLUME_MAX 200
 class VolumeClickHandler : public QObject
 {
 public:
-    VolumeClickHandler( intf_thread_t *_p_intf, ControlsWidget *_m ) :QObject(_m)
+    VolumeClickHandler( intf_thread_t *_p_intf, ControlsWidget *_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 );
-            audio_volume_t i_volume;
-            aout_VolumeGet( p_intf, &i_volume );
-            m->updateVolume( i_volume *  VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
-            return true;
-        }
-        return false;
-    }
+    virtual bool eventFilter( QObject *obj, QEvent *e );
 private:
     ControlsWidget *m;
     intf_thread_t *p_intf;
 };
 
-#include <QLabel>
-#include <QMouseEvent>
 class TimeLabel : public QLabel
 {
     Q_OBJECT
@@ -344,14 +151,14 @@ protected:
         toggleTimeDisplay();
         emit timeLabelDoubleClicked();
     }
-private slots:
-    void setDisplayPosition( float pos, int time, int length );
 private:
     intf_thread_t *p_intf;
     bool b_remainingTime;
     void toggleTimeDisplay();
 signals:
     void timeLabelDoubleClicked();
+private slots:
+    void setDisplayPosition( float pos, int time, int length );
 };
 
 class SpeedLabel : public QLabel

modules/gui/qt4/main_interface.cpp

@@ -34,6 +34,7 @@
 #include "util/customwidgets.hpp"
 #include "dialogs_provider.hpp"
 #include "components/interface_widgets.hpp"
+#include "components/controller.hpp"
 #include "components/playlist/playlist.hpp"
 #include "dialogs/extended.hpp"
 #include "dialogs/playlist.hpp"