Qt4 - Actually implement double-click on speed does reset the speed... Don't laugh...

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 0418cf4430360eaead2c1b4ab5fcc18dbfa99898..ed780dc20b777da8d54595ee3578db6433023515 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -839,11 +839,6 @@ void SpeedControlWidget::setEnable( bool b_enable )
     speedSlider->setEnabled( b_enable );
 }
 
-void SpeedControlWidget::mouseDoubleClickEvent( QMouseEvent * event )
-{
-    resetRate();
-}
-
 #define RATE_SLIDER_MAXIMUM 3.0
 #define RATE_SLIDER_MINIMUM 0.3
 #define RATE_SLIDER_LENGTH 100.0

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index ba82a6068736e3164a5560cba84225f14f947ef7..f2fea47aedab9bba7547c21d2f3ec474230087d1 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -36,6 +36,7 @@
 
 #include "qt4.hpp"
 #include "main_interface.hpp"
+#include "input_manager.hpp"
 
 #include <QWidget>
 #include <QFrame>
@@ -238,6 +239,21 @@ signals:
     void timeLabelDoubleClicked();
 };
 
+class SpeedLabel : public QLabel
+{
+    Q_OBJECT
+public:
+    SpeedLabel( intf_thread_t *_p_intf, const QString text ): QLabel( text)
+    { p_intf = _p_intf; }
+
+protected:
+    virtual void mouseDoubleClickEvent ( QMouseEvent * event )
+    {
+        THEMIM->getIM()->setRate( INPUT_RATE_DEFAULT );
+    }
+private:
+    intf_thread_t *p_intf;
+};
 
 /******************** Speed Control Widgets ****************/
 class SpeedControlWidget : public QFrame
@@ -247,8 +263,6 @@ public:
     SpeedControlWidget( intf_thread_t *);
     virtual ~SpeedControlWidget();
     void updateControls( int );
-protected:
-    virtual void mouseDoubleClickEvent( QMouseEvent * event );
 private:
     intf_thread_t *p_intf;
     QSlider *speedSlider;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index ab5ec4ab1644c877295346fe87acca6a74d134ca..dafdf8b21ba39e4a1eabbb9ee686186b9f11056a 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -324,7 +324,7 @@ inline void MainInterface::createStatusBar()
     nameLabel = new QLabel;
     nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
                                       | Qt::TextSelectableByKeyboard );
-    speedLabel = new QLabel( "1.00x" );
+    speedLabel = new SpeedLabel( p_intf, "1.00x" );
     speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
 
     /* Styling those labels */