Qt: more of the same simplifications and warnings

[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 7b9e2b92b69a5654022458edd587e4aeed8a98e5..a2ce18f0916568aa5b97a6182b61efcd0308ce02 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -35,6 +35,8 @@
 
 #include "components/controller.hpp"
 #include "components/controller_widget.hpp"
+#include "dialogs_provider.hpp"
+#include "components/info_panels.hpp"
 
 #include <QWidget>
 #include <QFrame>
@@ -46,14 +48,11 @@ class QPixmap;
 class QHBoxLayout;
 class QMenu;
 class QSlider;
-class ReparentableWidget;
 
 /******************** Video Widget ****************/
 class VideoWidget : public QFrame
 {
     Q_OBJECT
-friend class ReparentableWidget;
-
 public:
     VideoWidget( intf_thread_t * );
     virtual ~VideoWidget();
@@ -61,7 +60,7 @@ public:
     WId request( int *, int *, unsigned int *, unsigned int *, bool );
     void  release( void );
     int   control( void *, int, va_list );
-    void SetFullScreen( bool, bool );
+    void  sync( void );
 
 protected:
     virtual QPaintEngine *paintEngine() const
@@ -72,11 +71,9 @@ protected:
 private:
     intf_thread_t *p_intf;
 
-    QWidget *reparentable;
+    QWidget *stable;
     QLayout *layout;
-    virtual bool eventFilter ( QObject * watched, QEvent * event );
 signals:
-    void keyPressed( QKeyEvent * );
     void sizeChanged( int, int );
 
 public slots:
@@ -90,11 +87,13 @@ class BackgroundWidget : public QWidget
 public:
     BackgroundWidget( intf_thread_t * );
     void setExpandstoHeight( bool b_expand ) { b_expandPixmap = b_expand; }
+    void setWithArt( bool b_withart_ ) { b_withart = b_withart_; };
 private:
+    intf_thread_t *p_intf;
     QString pixmapUrl;
     bool b_expandPixmap;
+    bool b_withart;
     virtual void contextMenuEvent( QContextMenuEvent *event );
-    intf_thread_t *p_intf;
 protected:
     void paintEvent( QPaintEvent *e );
     static const int MARGIN = 5;
@@ -141,9 +140,11 @@ private:
     bool b_remainingTime;
     int cachedLength;
     QTimer *bufTimer;
-    float bufVal;
+
     bool buffering;
     bool showBuffering;
+    float bufVal;
+
     char psz_length[MSTRTIME_MAX_SIZE];
     char psz_time[MSTRTIME_MAX_SIZE];
     void toggleTimeDisplay();
@@ -206,6 +207,15 @@ public:
     CoverArtLabel( QWidget *parent, intf_thread_t * );
     virtual ~CoverArtLabel();
 
+protected:
+    virtual void mouseDoubleClickEvent( QMouseEvent *event )
+    {
+        if( qobject_cast<MetaPanel *>(this->window()) == NULL )
+        {
+            THEDP->mediaInfoDialog();
+        }
+        event->accept();
+    }
 private:
     intf_thread_t *p_intf;