Qt4 - InfoPanels: correct a slot, correct slightly the layout.

[vlc] / modules / gui / qt4 / components / interface_widgets.hpp

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 16a1dd4866051347ef3c6ad8b21481bff8bfaa15..760084103da402f2a934c48c77cb30f7997cc855 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.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
@@ -27,6 +28,7 @@
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 
+#include <vlc_aout.h>
 #include "qt4.hpp"
 
 #include <QWidget>
@@ -60,6 +62,10 @@ private:
     QWidget *frame;
     intf_thread_t *p_intf;
     vlc_mutex_t lock;
+signals:
+    void askResize();
+private slots:
+    void SetMinSize();
 };
 
 /******************** Background Widget ****************/
@@ -79,6 +85,8 @@ private:
     int DrawBackground();
     int CleanBackground();
     intf_thread_t *p_intf;
+private slots:
+    void setArt( QString );
 };
 
 class VisualSelector : public QFrame
@@ -96,39 +104,109 @@ private slots:
 };
 
 class QPushButton;
-class ControlsWidget : public QFrame
+class AdvControlsWidget : public QFrame
 {
     Q_OBJECT
 public:
-    ControlsWidget( intf_thread_t *);
-    virtual ~ControlsWidget();
+    AdvControlsWidget( intf_thread_t *);
+    virtual ~AdvControlsWidget();
     void enableInput( bool );
     void enableVideo( bool );
 private:
     intf_thread_t *p_intf;
-    QPushButton *slowerButton, *normalButton, *fasterButton;
-    QPushButton *fullscreenButton, *snapshotButton;
+    QPushButton *normalButton, *recordButton, *ABButton;
+    QPushButton *snapshotButton, *frameButton;
 private slots:
-    void faster();
-    void slower();
     void normal();
     void snapshot();
+    void frame();
+    void fromAtoB();
+    void record();
+};
+
+class InputSlider;
+class QSlider;
+class QGridLayout;
+class VolumeClickHandler;
+class ControlsWidget : public QFrame
+{
+    Q_OBJECT
+public:
+    ControlsWidget( intf_thread_t *, bool );
+    virtual ~ControlsWidget();
+
+    QPushButton *playlistButton;
+    QSlider *volumeSlider;
+    void setStatus( int );
+    void enableInput( bool );
+    void enableVideo( bool );
+public slots:
+    void setNavigation( int );
+    void updateOnTimer();
+protected:
+    friend class MainInterface;
+    friend class VolumeClickHandler;
+private:
+    intf_thread_t       *p_intf;
+    QFrame              *discFrame;
+    QGridLayout         *controlLayout;
+    InputSlider         *slider;
+    QPushButton         *prevSectionButton, *nextSectionButton, *menuButton;
+    QPushButton         *playButton, *fullscreenButton;
+    QPushButton         *slowerButton, *fasterButton;
+    AdvControlsWidget   *advControls;
+
+    bool                 b_advancedVisible;
+private slots:
+    void play();
+    void stop();
+    void prev();
+    void next();
+    void updateVolume( int );
     void fullscreen();
+    void extSettings();
+    void prefs();
+    void faster();
+    void slower();
+    void toggleAdvanced();
+signals:
+    void advancedControlsToggled( bool );
+};
+
+class VolumeClickHandler : public QObject
+{
+public:
+    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 );
+            return true;
+        }
+        return false;
+    }
+private:
+    ControlsWidget *m;
+    intf_thread_t *p_intf;
 };
 
 
 /******************** Playlist Widgets ****************/
 #include <QModelIndex>
+#include <QSplitter>
 class QSignalMapper;
 class PLSelector;
 class PLPanel;
 class QPushButton;
 
-class PlaylistWidget : public BasePlaylistWidget
+class PlaylistWidget : public QSplitter
 {
     Q_OBJECT;
 public:
-    PlaylistWidget( intf_thread_t * );
+    PlaylistWidget( intf_thread_t *_p_i ) ;
     virtual ~PlaylistWidget();
     QSize widgetSize;
     virtual QSize sizeHint() const;
@@ -138,10 +216,13 @@ private:
     QPushButton *addButton;
     QLabel *art;
     QString prevArt;
+protected:
+     intf_thread_t *p_intf;
 private slots:
     void setArt( QString );
 signals:
     void rootChanged( int );
+    void artSet( QString );
 };
 
 #endif