[vlc-devel] commit: Revert "(qt4) Define reverse playback direction button in qt4 interface (not visible yet )." (Christophe Mutricy )
git version control
git at videolan.org
Tue Nov 25 23:31:58 CET 2008
vlc | branch: 0.9-bugfix | Christophe Mutricy <xtophe at videolan.org> | Tue Nov 25 22:27:58 2008 +0000| [64e2fdc488430c36e786c7554d32fd45c5f9144a] | committer: Christophe Mutricy
Revert "(qt4) Define reverse playback direction button in qt4 interface (not visible yet)."
This reverts commit 552963d528623bd92fd68220fdb8b105ea5f69c2.
New features that are not self-contained and modify src/ are not
welcomed in -bugfix branches without pre-existent consensus.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=64e2fdc488430c36e786c7554d32fd45c5f9144a
---
modules/gui/qt4/components/interface_widgets.cpp | 24 +--------------------
modules/gui/qt4/components/interface_widgets.hpp | 3 +-
modules/gui/qt4/input_manager.cpp | 14 ------------
modules/gui/qt4/input_manager.hpp | 2 -
4 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index c14c419..6fca0ca 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -57,7 +57,6 @@
#include <math.h>
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
-#define I_REVERSE_TOOLTIP N_("Reverse\nRevert playback direction")
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
@@ -642,14 +641,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
sizePolicy.setHorizontalStretch( 0 );
sizePolicy.setVerticalStretch( 0 );
- /* Reverse */
- reverseButton = new QPushButton;
- reverseButton->setSizePolicy( sizePolicy );
- reverseButton->setMaximumSize( QSize( 32, 32 ) );
- reverseButton->setMinimumSize( QSize( 32, 32 ) );
- reverseButton->setIconSize( QSize( 26, 26 ) );
- reverseButton->setFocusPolicy( Qt::NoFocus );
-
/* Play */
playButton = new QPushButton;
playButton->setSizePolicy( sizePolicy );
@@ -685,7 +676,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
/* Add this block to the main layout */
- BUTTON_SET_ACT_I( reverseButton, "", reverse_b, qtr( I_REVERSE_TOOLTIP ), reverse() );
BUTTON_SET_ACT_I( playButton, "", play_b, qtr( I_PLAY_TOOLTIP ), play() );
BUTTON_SET_ACT_I( prevButton, "" , previous_b,
qtr( "Previous media in the playlist" ), prev() );
@@ -768,10 +758,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
controlLayout->addWidget( discFrame, 1, 8, 2, 3, Qt::AlignBottom );
controlLayout->addWidget( telexFrame, 1, 8, 2, 5, Qt::AlignBottom );
- controlLayout->addWidget( reverseButton, 2, 0, 2, 2, Qt::AlignBottom );
- controlLayout->setColumnMinimumWidth( 2, 10 );
- controlLayout->setColumnStretch( 2, 0 );
-
controlLayout->addWidget( playButton, 2, 0, 2, 2, Qt::AlignBottom );
controlLayout->setColumnMinimumWidth( 2, 10 );
controlLayout->setColumnStretch( 2, 0 );
@@ -854,11 +840,6 @@ void ControlsWidget::stop()
THEMIM->stop();
}
-void ControlsWidget::reverse()
-{
- THEMIM->reverse();
-}
-
void ControlsWidget::play()
{
if( THEPL->current.i_size == 0 )
@@ -1064,9 +1045,8 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
fsLayout->addWidget( fasterButton, 0, 12 );
/* Second line */
- fsLayout->addWidget( reverseButton, 1, 0, 1, 2);
- fsLayout->addWidget( playButton, 1, 0, 1, 3 );
- fsLayout->addLayout( controlButLayout, 1, 3 );
+ fsLayout->addWidget( playButton, 1, 0, 1, 2 );
+ fsLayout->addLayout( controlButLayout, 1, 2 );
fsLayout->addWidget( discFrame, 1, 3 );
fsLayout->addWidget( telexFrame, 1, 4 );
diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 25c23ba..5bfcd1f 100644
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -186,7 +186,7 @@ protected:
QGridLayout *controlLayout;
InputSlider *slider;
QPushButton *prevSectionButton, *nextSectionButton, *menuButton;
- QPushButton *playButton, *reverseButton, *fullscreenButton, *extSettingsButton;
+ QPushButton *playButton, *fullscreenButton, *extSettingsButton;
QPushButton *telexTransparent, *telexOn;
QSpinBox *telexPage;
QToolButton *slowerButton, *fasterButton;
@@ -200,7 +200,6 @@ protected:
bool b_telexTransparent;
bool b_telexEnabled;
protected slots:
- void reverse();
void play();
void stop();
void prev();
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 46d87b7..62d91be 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -543,15 +543,6 @@ void InputManager::telexSetTransparency()
emit toggleTelexTransparency();
}
-void InputManager::reverse()
-{
- if( hasInput() )
- {
- int i_rate = var_GetInteger( p_input, "rate" );
- var_SetInteger( p_input, "rate", -i_rate );
- }
-}
-
void InputManager::slower()
{
if( hasInput() )
@@ -684,11 +675,6 @@ void MainInputManager::customEvent( QEvent *event )
}
/* Playlist Control functions */
-void MainInputManager::reverse()
-{
- getIM()->reverse();
-}
-
void MainInputManager::stop()
{
playlist_Stop( THEPL );
diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index d267816..0d0798d 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -103,7 +103,6 @@ public slots:
void setInput( input_thread_t * ); ///< Our controlled input changed
void sliderUpdate( float ); ///< User dragged the slider. We get new pos
void togglePlayPause();
- void reverse();
void slower();
void faster();
void normalRate();
@@ -168,7 +167,6 @@ private:
public slots:
bool teletextState();
void togglePlayPause();
- void reverse();
void stop();
void next();
void prev();
More information about the vlc-devel
mailing list