Qt4 - Extended Panels. try to fix the sizing ...

[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 5bb8505e695cbdea1ee138cb09ed588304883598..9ef01c11ac7d7c81cf2862eb6a794cd0b5d2ee2b 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -26,6 +26,10 @@
 #ifndef _INTFWIDGETS_H_
 #define _INTFWIDGETS_H_
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 
@@ -52,45 +56,40 @@ public:
 
     void *request( vout_thread_t *, int *, int *,
                    unsigned int *, unsigned int * );
-    void release( void * );
-    int control( void *, int, va_list );
-
-    int i_video_height, i_video_width;
-    vout_thread_t *p_vout;
+    void  release( void * );
+    int   control( void *, int, va_list );
 
-    QSize widgetSize;
-    QSize sizeHint() const;
 private:
-    QWidget *frame;
     intf_thread_t *p_intf;
+    vout_thread_t *p_vout;
+
     vlc_mutex_t lock;
+
 signals:
-    void askResize();
     void askVideoWidgetToShow();
+    //void askResize();
+
 public slots:
     void SetSizing( unsigned int, unsigned int );
 };
 
 /******************** Background Widget ****************/
-class BackgroundWidget : public QFrame
+class BackgroundWidget : public QWidget
 {
     Q_OBJECT
 public:
     BackgroundWidget( intf_thread_t * );
     virtual ~BackgroundWidget();
-    QSize widgetSize;
-    QSize sizeHint() const;
-    bool b_need_update;
+
 private:
     QPalette plt;
     QLabel *label;
-    virtual void resizeEvent( QResizeEvent *e );
     virtual void contextMenuEvent( QContextMenuEvent *event );
     intf_thread_t *p_intf;
-    int i_runs;
+
 public slots:
     void toggle(){ TOGGLEV( this ); }
-    void update( input_thread_t * );
+    void update( QString );
 };
 
 class VisualSelector : public QFrame
@@ -128,7 +127,9 @@ private:
 
 private slots:
     void snapshot();
+#if 0
     void frame();
+#endif
     void fromAtoB();
     void record();
     void AtoBLoop( float, int, int );
@@ -149,7 +150,6 @@ class ControlsWidget : public QFrame
 public:
     /* p_intf, advanced control visible or not, blingbling or not */
     ControlsWidget( intf_thread_t *, MainInterface*, bool, bool );
-//    QSize sizeHint() const;
     virtual ~ControlsWidget();
 
     QPushButton *playlistButton;
@@ -158,7 +158,6 @@ public:
     void enableVideo( bool );
 public slots:
     void setNavigation( int );
-    void updateOnTimer();
 protected:
     friend class MainInterface;
     friend class VolumeClickHandler;
@@ -182,6 +181,8 @@ private slots:
     void prev();
     void next();
     void updateVolume( int );
+    void updateVolume( void );
+    void updateInput();
     void fullscreen();
     void extSettings();
     void faster();