Qt4 - time left implementation. Do it better, faster, with also a middle click, and...

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 61edabbdd17c5f45b09f290ffac1434c6a334fbc..0605da2ce568622fa9d4522a691ba2e0e7c405a5 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -212,7 +212,7 @@ class TimeLabel : public QLabel
     Q_OBJECT
     void mousePressEvent( QMouseEvent *event )
     {
-        if( event->button() == Qt::LeftButton ) emit timeLabelClicked();
+        emit timeLabelClicked();
     }
     void mouseDoubleClickEvent( QMouseEvent *event )
     {

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 93e2a98150ef4a7c40d7c8a3fb9160fb8c915a60..5cb24e1ae111acdbef00538fa8890050c7d31842 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -146,7 +146,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     nameLabel = new QLabel;
     speedLabel = new QLabel( "1.00x" );
     speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
-    timeLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
 
     /* Styling those labels */
     timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
@@ -163,9 +162,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
        - right-clicking and clicking just toggle between remaining and
          elapsed time.*/
     CONNECT( timeLabel, timeLabelClicked(), this, toggleTimeDisplay() );
-    CONNECT( timeLabel, customContextMenuRequested( QPoint ),
-             this, toggleTimeDisplay() );
     CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
+    CONNECT( timeLabel, timeLabelDoubleClicked(), this, toggleTimeDisplay() );
 
     /* Speed Label behaviour:
        - right click gives the vertical speed slider */