Qt: move to Stack Widget, part 2

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/gui/qt4/components/controller.cpp

@@ -584,8 +584,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
                                 QWidget *_parent ) :
                                 AbstractController( _p_i, _parent )
 {
-    setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum );
-
     /* advanced Controls handling */
     b_advancedVisible = b_advControls;
 

modules/gui/qt4/components/interface_widgets.cpp

@@ -301,10 +301,10 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i )
     /* A cone in the middle */
     label = new QLabel;
     label->setMargin( 5 );
-    label->setMaximumHeight( MAX_BG_SIZE );
+/*    label->setMaximumHeight( MAX_BG_SIZE );
     label->setMaximumWidth( MAX_BG_SIZE );
     label->setMinimumHeight( MIN_BG_SIZE );
-    label->setMinimumWidth( MIN_BG_SIZE );
+    label->setMinimumWidth( MIN_BG_SIZE );*/
     label->setAlignment( Qt::AlignCenter );
     if( QDate::currentDate().dayOfYear() >= 354 )
         label->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) );
@@ -549,10 +549,10 @@ CoverArtLabel::CoverArtLabel( QWidget *parent, intf_thread_t *_p_i )
     setContextMenuPolicy( Qt::ActionsContextMenu );
     CONNECT( this, updateRequested(), this, askForUpdate() );
 
-    setMinimumHeight( 128 );
+    /*setMinimumHeight( 128 );
     setMinimumWidth( 128 );
     setMaximumHeight( 128 );
-    setMaximumWidth( 128 );
+    setMaximumWidth( 128 );*/
     setScaledContents( false );
     setAlignment( Qt::AlignCenter );
 

modules/gui/qt4/main_interface.hpp

@@ -53,12 +53,18 @@ class SpeedControlWidget;
 class QVBoxLayout;
 class QMenu;
 class QSize;
+class QStackedWidget;
 
 enum {
     CONTROLS_VISIBLE  = 0x1,
     CONTROLS_HIDDEN   = 0x2,
     CONTROLS_ADVANCED = 0x4,
 };
+enum {
+    BACKG_TAB,
+    VIDEO_TAB,
+    PLAYL_TAB,
+};
 
 typedef enum pl_dock_e {
     PL_UNDOCKED,
@@ -118,6 +124,10 @@ private:
     void initSystray();
     bool isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
 
+    void showTab( int i_tab );
+    void showVideo() { showTab( VIDEO_TAB ); }
+    void showBg() { showTab( BACKG_TAB ); }
+
     QSettings           *settings;
 #ifndef HAVE_MAEMO
     QSystemTrayIcon     *sysTray;
@@ -128,7 +138,7 @@ private:
     ControlsWidget      *controls;
     InputControlsWidget *inputC;
     FullscreenControllerWidget *fullscreenControls;
-
+    QStackedWidget      *stackCentralW;
     /* Video */
     VideoWidget         *videoWidget;