Qt4 : buttons size and various fixes. Remove dead code and avoid duplication.

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index d04705bcd6ca5a9b8b3b1e3d96fc0ea052a328f5..a334c9834ec09b4b5bcdf29c017eb2e7d0f59555 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -225,11 +225,6 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() );
     layout->addWidget( snapshotButton );
     snapshotButton->setMaximumWidth( 35 );
-
-    fullscreenButton = new QPushButton( "F" );
-    BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
-    layout->addWidget( fullscreenButton );
-    fullscreenButton->setMaximumWidth( 35 );
 }
 
 AdvControlsWidget::~AdvControlsWidget()
@@ -245,7 +240,7 @@ void AdvControlsWidget::enableInput( bool enable )
 void AdvControlsWidget::enableVideo( bool enable )
 {
     snapshotButton->setEnabled( enable );
-    fullscreenButton->setEnabled( enable );
+    //fullscreenButton->setEnabled( enable );
 }
 
 void AdvControlsWidget::normal()
@@ -282,12 +277,12 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i ) :
     slowerButton = new QPushButton( "S" );
     BUTTON_SET_ACT( slowerButton, "S", qtr( "Slower" ), slower() );
     controlLayout->addWidget( slowerButton, 0, 0 );
-    slowerButton->setMaximumSize( QSize( 26, 26 ) );
+    slowerButton->setMaximumSize( QSize( 26, 20 ) );
 
     fasterButton = new QPushButton( "F" );
     BUTTON_SET_ACT( fasterButton, "F", qtr( "Faster" ), faster() );
     controlLayout->addWidget( fasterButton, 0, 16 );
-    fasterButton->setMaximumSize( QSize( 26, 26 ) );
+    fasterButton->setMaximumSize( QSize( 26, 20 ) );
 
     /** Disc and Menus handling */
     discFrame = new QFrame( this );
@@ -330,8 +325,8 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i ) :
     /* Play */
     QPushButton *playButton = new QPushButton;
     playButton->setSizePolicy( sizePolicy );
-    playButton->setMaximumSize( QSize( 26, 26 ) );
-    playButton->setIconSize( QSize( 20, 20 ) );
+    playButton->setMaximumSize( QSize( 45, 45 ) );
+    playButton->setIconSize( QSize( 30, 30 ) );
 
     controlLayout->addWidget( playButton, 2, 0, 2, 2 );
 
@@ -381,14 +376,14 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i ) :
     fullscreenButton = new QPushButton( "F" );
     BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
     fullscreenButton->setMaximumSize( QSize( 26, 26 ) );
-    controlLayout->addWidget( fullscreenButton, 3, 11 );
+    controlLayout->addWidget( fullscreenButton, 3, 10 );
 
     /** Playlist Button **/
     playlistButton = new QPushButton;
-    playlistButton->setMaximumSize( QSize( 45, 45 ) );
-    playlistButton->setIconSize( QSize( 30, 30 ) );
+    playlistButton->setMaximumSize( QSize( 26, 26 ) );
+    playlistButton->setIconSize( QSize( 20, 20 ) );
 
-    controlLayout->addWidget( playlistButton, 3, 10 );
+    controlLayout->addWidget( playlistButton, 3, 11 );
 
     /** extended Settings **/
     QPushButton *extSettingsButton = new QPushButton( "F" );

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 4cd40ba6c6d14c180c5f4fd2c84064fb4ca99df7..e6e9e90cdba8bc20dbf6d3ded6fb2a36a1780d46 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -111,7 +111,7 @@ public:
 private:
     intf_thread_t *p_intf;
     QPushButton *normalButton;
-    QPushButton *fullscreenButton, *snapshotButton;
+    QPushButton *snapshotButton;
 private slots:
     void normal();
     void snapshot();