vlc | branch: master | Ludovic Fauvet <[email protected]> | Fri Jun 21 13:55:37 
2013 +0200| [a7d3284e7ed2676c78b519397f3a15473c214f3d] | committer: Ludovic 
Fauvet

Qt: use the theme icons for the system tray too

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a7d3284e7ed2676c78b519397f3a15473c214f3d
---

 modules/gui/qt4/main_interface.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp 
b/modules/gui/qt4/main_interface.cpp
index 3799383..6d80a11 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1049,9 +1049,9 @@ void MainInterface::createSystray()
 {
     QIcon iconVLC;
     if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && 
var_InheritBool( p_intf, "qt-icon-change" ) )
-        iconVLC =  QIcon( ":/logo/vlc128-xmas.png" );
+        iconVLC = QIcon::fromTheme( "vlc-xmas", QIcon( 
":/logo/vlc128-xmas.png" ) );
     else
-        iconVLC =  QIcon( ":/logo/vlc128.png" );
+        iconVLC = QIcon::fromTheme( "vlc", QIcon( ":/logo/vlc256.png" ) );
     sysTray = new QSystemTrayIcon( iconVLC, this );
     sysTray->setToolTip( qtr( "VLC media player" ));
 

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to