Various strings change and capitalisation changes to match the guidelines.

[vlc] / modules / gui / qt4 / components / interface_widgets.cpp

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 207699ed46a3da8cfa48e9f77af6f789bf4be1e1..1c740112259ddccb768cc85dba7370b6ec061258 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -28,6 +28,8 @@
 # include "config.h"
 #endif
 
+#include <vlc_vout.h>
+
 #include "dialogs_provider.hpp"
 #include "components/interface_widgets.hpp"
 #include "main_interface.hpp"
@@ -35,7 +37,6 @@
 #include "menus.hpp"
 #include "util/input_slider.hpp"
 #include "util/customwidgets.hpp"
-#include <vlc_vout.h>
 
 #include <QLabel>
 #include <QSpacerItem>
@@ -47,11 +48,14 @@
 #include <QPalette>
 #include <QResizeEvent>
 #include <QDate>
+
 #ifdef Q_WS_X11
 # include <X11/Xlib.h>
 # include <qx11info_x11.h>
 #endif
 
+#include <math.h>
+
 /**********************************************************************
  * Video Widget. A simple frame on which video is drawn
  * This class handles resize issues
@@ -83,8 +87,6 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
     connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)),
              this, SLOT(SetSizing(unsigned int, unsigned int )) );
 #endif
-
-
 }
 
 void VideoWidget::paintEvent(QPaintEvent *ev)
@@ -120,7 +122,7 @@ VideoWidget::~VideoWidget()
  * Request the video to avoid the conflicts
  **/
 void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
-                           unsigned int *pi_width, unsigned int *pi_height )
+                            unsigned int *pi_width, unsigned int *pi_height )
 {
     msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
     emit askVideoWidgetToShow( *pi_width, *pi_height );
@@ -203,8 +205,7 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i )
 }
 
 BackgroundWidget::~BackgroundWidget()
-{
-}
+{}
 
 void BackgroundWidget::resizeEvent( QResizeEvent * event )
 {
@@ -250,7 +251,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
 
     layout->addItem( new QSpacerItem( 40,20,
                               QSizePolicy::Expanding, QSizePolicy::Minimum ) );
-    layout->addWidget( new QLabel( qtr( "Current visualization:" ) ) );
+    layout->addWidget( new QLabel( qtr( "Current visualization" ) ) );
 
     current = new QLabel( qtr( "None" ) );
     layout->addWidget( current );
@@ -263,8 +264,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
 }
 
 VisualSelector::~VisualSelector()
-{
-}
+{}
 
 void VisualSelector::prev()
 {
@@ -316,7 +316,7 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     frameButton->setMaximumSize( QSize( 26, 26 ) );
     frameButton->setIconSize( QSize( 20, 20 ) );
     advLayout->addWidget( frameButton );
-    BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by Frame" ), frame() );
+    BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by frame" ), frame() );
 #endif
 
     recordButton = new QPushButton( "R" );
@@ -616,7 +616,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 
     /** extended Settings **/
     extSettingsButton = new QPushButton;
-    BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ),
+    BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended settings" ),
             extSettings() );
     setupSmallButton( extSettingsButton );
     controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
@@ -1211,22 +1211,24 @@ SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) :
     speedSlider->setOrientation( Qt::Vertical );
     speedSlider->setTickPosition( QSlider::TicksRight );
 
-    speedSlider->setRange( -100, 100 );
-    speedSlider->setSingleStep( 10 );
-    speedSlider->setPageStep( 20 );
-    speedSlider->setTickInterval( 20 );
+    speedSlider->setRange( -24, 24 );
+    speedSlider->setSingleStep( 1 );
+    speedSlider->setPageStep( 1 );
+    speedSlider->setTickInterval( 12 );
 
     CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
 
     QToolButton *normalSpeedButton = new QToolButton( this );
     normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
     normalSpeedButton->setAutoRaise( true );
-    normalSpeedButton->setText( "N" );
+    normalSpeedButton->setText( "1x" );
     normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) );
 
     CONNECT( normalSpeedButton, clicked(), this, resetRate() );
 
     QVBoxLayout *speedControlLayout = new QVBoxLayout;
+    speedControlLayout->setLayoutMargins( 4, 4, 4, 4, 4 );
+    speedControlLayout->setSpacing( 4 );
     speedControlLayout->addWidget( speedSlider );
     speedControlLayout->addWidget( normalSpeedButton );
     setLayout( speedControlLayout );
@@ -1240,10 +1242,6 @@ void SpeedControlWidget::setEnable( bool b_enable )
     speedSlider->setEnabled( b_enable );
 }
 
-#define RATE_SLIDER_MAXIMUM 3.0
-#define RATE_SLIDER_MINIMUM 0.3
-#define RATE_SLIDER_LENGTH 100.0
-
 void SpeedControlWidget::updateControls( int rate )
 {
     if( speedSlider->isSliderDown() )
@@ -1252,32 +1250,16 @@ void SpeedControlWidget::updateControls( int rate )
         return;
     }
 
-    int sliderValue;
-    double speed = INPUT_RATE_DEFAULT / (double)rate;
+    double value = 12 * log( (double)INPUT_RATE_DEFAULT / rate ) / log( 2 );
+    int sliderValue = (int) ( ( value > 0 ) ? value + .5 : value - .5 );
 
-    if( rate >= INPUT_RATE_DEFAULT )
+    if( sliderValue < speedSlider->minimum() )
     {
-        if( speed < RATE_SLIDER_MINIMUM )
-        {
-            sliderValue = speedSlider->minimum();
-        }
-        else
-        {
-            sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH
-                                        / ( 1.0 - RATE_SLIDER_MAXIMUM ) );
-        }
+        sliderValue = speedSlider->minimum();
     }
-    else
+    else if( sliderValue > speedSlider->maximum() )
     {
-        if( speed > RATE_SLIDER_MAXIMUM )
-        {
-            sliderValue = speedSlider->maximum();
-        }
-        else
-        {
-            sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH
-                                        / ( RATE_SLIDER_MAXIMUM - 1.0 ) );
-        }
+        sliderValue = speedSlider->maximum();
     }
 
     //Block signals to avoid feedback loop
@@ -1288,18 +1270,8 @@ void SpeedControlWidget::updateControls( int rate )
 
 void SpeedControlWidget::updateRate( int sliderValue )
 {
-    int rate;
-
-    if( sliderValue < 0.0 )
-    {
-        rate = (int)(INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH /
-            ( sliderValue * ( 1.0 - RATE_SLIDER_MINIMUM ) + RATE_SLIDER_LENGTH ));
-    }
-    else
-    {
-        rate = (int)(INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH /
-            ( sliderValue * ( RATE_SLIDER_MAXIMUM - 1.0 ) + RATE_SLIDER_LENGTH ));
-    }
+    double speed = pow( 2, (double)sliderValue / 12 );
+    int rate = INPUT_RATE_DEFAULT / speed;
 
     THEMIM->getIM()->setRate(rate);
 }