[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdelibs-phonon/phonon/ui (silent)
From:       Matthias Kretz <kretz () kde ! org>
Date:       2006-02-08 21:07:08
Message-ID: 1139432828.779475.24581.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 507265 by mkretz:

SVN_SILENT: rename Fader to Slider


 M  +2 -2      Makefile.am  
 M  +10 -10    mediacontrols.cpp  
 D             volumefader.cpp  
 D             volumefader.h  
 A             volumeslider.cpp   volumefader.cpp#503838 [License: LGPL (v2)]
 A             volumeslider.h   volumefader.h#503838 [License: LGPL (v2)]


--- branches/work/kdelibs-phonon/phonon/ui/Makefile.am #507264:507265
@@ -23,10 +23,10 @@
 
 phononincludedir = $(includedir)/phonon/ui
 phononinclude_HEADERS = videowidget.h seekslider.h mediacontrols.h \
-						volumefader.h
+						volumeslider.h
 
 libphononui_la_SOURCES = factory.cpp videowidget.cpp videowidgethelper.cpp \
-						 seekslider.cpp mediacontrols.cpp volumefader.cpp
+						 seekslider.cpp mediacontrols.cpp volumeslider.cpp
 libphononui_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_LDFLAGS) \
 			  $(USER_LDFLAGS) -version-info 0:0:0 -no-undefined
 libphononui_la_LIBADD = $(top_builddir)/phonon/libphononcore.la \
                $(top_builddir)/phonon/ifaces/ui/libphononifacesui.la
--- branches/work/kdelibs-phonon/phonon/ui/mediacontrols.cpp #507264:507265
@@ -26,7 +26,7 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 #include "seekslider.h"
-#include "volumefader.h"
+#include "volumeslider.h"
 
 namespace Phonon
 {
@@ -43,7 +43,7 @@
 			, stopButton( 0 )
 			, loopButton( 0 )
 			, seekSlider( 0 )
-			, volumeFader( 0 )
+			, volumeSlider( 0 )
 			, media( 0 )
 		{
 		}
@@ -54,7 +54,7 @@
 		QToolButton* stopButton;
 		QToolButton* loopButton;
 		SeekSlider*  seekSlider;
-		VolumeFader* volumeFader;
+		VolumeSlider* volumeSlider;
 		AbstractMediaProducer* media;
 };
 
@@ -78,16 +78,16 @@
 	d->seekSlider = new SeekSlider( this );
 	d->seekSlider->setEnabled( false );
 
-	d->volumeFader = new VolumeFader( this );
-	d->volumeFader->setOrientation( Qt::Horizontal );
-	d->volumeFader->hide();
+	d->volumeSlider = new VolumeSlider( this );
+	d->volumeSlider->setOrientation( Qt::Horizontal );
+	d->volumeSlider->hide();
 
 	d->layout = new QHBoxLayout( this );
 	d->layout->addWidget( d->playButton );
 	d->layout->addWidget( d->pauseButton );
 	d->layout->addWidget( d->stopButton );
 	d->layout->addWidget( d->seekSlider );
-	d->layout->addWidget( d->volumeFader );
+	d->layout->addWidget( d->volumeSlider );
 	d->layout->addStretch();
 }
 
@@ -103,7 +103,7 @@
 
 bool MediaControls::isVolumeControlVisible() const
 {
-	return d->volumeFader->isVisible();
+	return d->volumeSlider->isVisible();
 }
 
 bool MediaControls::isLoopControlVisible() const
@@ -129,7 +129,7 @@
 
 void MediaControls::setAudioOutput( AudioOutput* audioOutput )
 {
-	d->volumeFader->setAudioOutput( audioOutput );
+	d->volumeSlider->setAudioOutput( audioOutput );
 }
 
 void MediaControls::setSeekSliderVisible( bool vis )
@@ -139,7 +139,7 @@
 
 void MediaControls::setVolumeControlVisible( bool vis )
 {
-	d->volumeFader->setVisible( vis );
+	d->volumeSlider->setVisible( vis );
 }
 
 void MediaControls::setLoopControlVisible( bool vis )


[prev in list] [next in list] [prev in thread] [next in thread]