[vlc-commits] Qt: orange cone mode!
Jean-Baptiste Kempf
git at videolan.org
Mon Apr 11 18:49:47 CEST 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Apr 11 18:46:08 2011 +0200| [0cc5ec0b46febadfab855f68857ff6247972d2e2] | committer: Jean-Baptiste Kempf
Qt: orange cone mode!
</joke>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0cc5ec0b46febadfab855f68857ff6247972d2e2
---
modules/gui/qt4/Modules.am | 1 +
modules/gui/qt4/util/input_slider.cpp | 6 +++++-
modules/gui/qt4/vlc.qrc | 1 +
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 2778be5..6f2bfaa 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -103,6 +103,7 @@ DEPS_res = \
pixmaps/eject.png \
pixmaps/faster.png \
pixmaps/go-next.png \
+ pixmaps/progress.png \
pixmaps/menus/help_16px.png \
pixmaps/menus/info_16px.png \
pixmaps/menus/messages_16px.png \
diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index ea3a9c3..34e03d9 100644
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -241,7 +241,11 @@ void InputSlider::paintEvent( QPaintEvent *event )
if ( option.sliderPosition > minimum() && option.sliderPosition <= maximum() ) {
painter.setPen( Qt::black );
- painter.setBrush( foregroundGradient );
+ // painter.setBrush( foregroundGradient );
+
+ QBrush brush;
+ brush.setTexture( QPixmap( ":/progress" ) );
+ painter.setBrush( brush );
painter.drawRoundedRect( barRect.adjusted( 1, 1, -1, -1 ), barCorner, barCorner );
}
diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index 8811c74..803e066 100644
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -95,6 +95,7 @@
<file alias="go-next">pixmaps/go-next.png</file>
<file alias="new.png">pixmaps/profile_new.png</file>
<file alias="lock">pixmaps/lock.png</file>
+ <file alias="progress">pixmaps/progress.png</file>
</qresource>
<qresource prefix="/prefsmenu">
<file alias="cone_audio_64">pixmaps/prefs/spref_cone_Audio_64.png</file>
More information about the vlc-commits
mailing list