Qt4 - SpeedSlider, use an AutoRaise button for the Normal Rate.

Remove and unneeded member in the class.

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 7760b53c6b53fb7f033dd51f07214ffefc29a2ab..5342ea4899ca9227a43ef105255aadcbf863ae40 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -822,17 +822,18 @@ SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) :
 
     CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
 
-    normalSpeedButton = new QPushButton( "N" );
+    QToolButton *normalSpeedButton = new QToolButton( this );
     normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
-    normalSpeedButton->setFlat( true );
+    normalSpeedButton->setAutoRaise( true );
+    normalSpeedButton->setText( "N" );
     normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) );
 
     CONNECT( normalSpeedButton, clicked(), this, resetRate() );
 
     QVBoxLayout *speedControlLayout = new QVBoxLayout;
-    speedControlLayout->addWidget(speedSlider);
-    speedControlLayout->addWidget(normalSpeedButton);
-    setLayout(speedControlLayout);
+    speedControlLayout->addWidget( speedSlider );
+    speedControlLayout->addWidget( normalSpeedButton );
+    setLayout( speedControlLayout );
 }
 
 SpeedControlWidget::~SpeedControlWidget()

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 3a079c63bd2c2b4ecebba914ecd22bbbdf21ea2a..544cb005d03dab8c60d9a41ad9d6452c467169ae 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -243,7 +243,6 @@ public:
 private:
     intf_thread_t *p_intf;
     QSlider *speedSlider;
-    QPushButton *normalSpeedButton;
 private slots:
     void updateRate( int );
     void resetRate();