[vlc-commits] Qt: menus: fix faster/slower icons
Francois Cartegnie
git at videolan.org
Sat Sep 24 17:30:25 CEST 2011
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Sep 23 23:28:20 2011 +0200| [1ad23782dd12171220d956b8ab5db1ebb67b7790] | committer: Francois Cartegnie
Qt: menus: fix faster/slower icons
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ad23782dd12171220d956b8ab5db1ebb67b7790
---
modules/gui/qt4/Modules.am | 2 ++
modules/gui/qt4/menus.cpp | 4 ++--
modules/gui/qt4/pixmaps/faster2.png | Bin 0 -> 458 bytes
modules/gui/qt4/pixmaps/slower2.png | Bin 0 -> 520 bytes
modules/gui/qt4/vlc.qrc | 2 ++
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index a754412..e3c9310 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -104,6 +104,7 @@ DEPS_res = \
pixmaps/clear.png \
pixmaps/eject.png \
pixmaps/faster.png \
+ pixmaps/faster2.png \
pixmaps/go-next.png \
pixmaps/menus/help_16px.png \
pixmaps/menus/info_16px.png \
@@ -150,6 +151,7 @@ DEPS_res = \
pixmaps/sample_minimal.png \
pixmaps/sample_skins.png \
pixmaps/slower.png \
+ pixmaps/slower2.png \
pixmaps/space.png \
pixmaps/stop.png \
pixmaps/stop_16px.png \
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 88e8078..e6cef19 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -794,7 +794,7 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf )
action = menu->addAction( qtr( "&Faster" ), THEMIM->getIM(),
SLOT( faster() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/toolbar/faster") );
+ action->setIcon( QIcon( ":/toolbar/faster2") );
#endif
action->setData( STATIC_ENTRY );
@@ -813,7 +813,7 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf )
action = menu->addAction( qtr( "Slo&wer" ), THEMIM->getIM(),
SLOT( slower() ) );
#ifndef __APPLE__ /* No icons in menus in Mac */
- action->setIcon( QIcon( ":/toolbar/slower") );
+ action->setIcon( QIcon( ":/toolbar/slower2") );
#endif
action->setData( STATIC_ENTRY );
diff --git a/modules/gui/qt4/pixmaps/faster2.png b/modules/gui/qt4/pixmaps/faster2.png
new file mode 100644
index 0000000..e0742f6
Binary files /dev/null and b/modules/gui/qt4/pixmaps/faster2.png differ
diff --git a/modules/gui/qt4/pixmaps/slower2.png b/modules/gui/qt4/pixmaps/slower2.png
new file mode 100644
index 0000000..8328b55
Binary files /dev/null and b/modules/gui/qt4/pixmaps/slower2.png differ
diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index 473e959..98d094b 100644
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -63,6 +63,8 @@
<file alias="tv">pixmaps/toolbar/tv.png</file>
<file alias="tvtelx">pixmaps/toolbar/tvtelx.png</file>
<file alias="space">pixmaps/space.png</file>
+ <file alias="slower2">pixmaps/slower2.png</file>
+ <file alias="faster2">pixmaps/faster2.png</file>
</qresource>
<qresource prefix="/buttons/playlist">
<file alias="playlist_add">pixmaps/playlist/add.png</file>
More information about the vlc-commits
mailing list