vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sun Jan 2 22:49:57 2011 +0200| [ce0ed241eef5765b734add730f0b3d6c5be2231d] | committer: Rémi Denis-Courmont
Remove Christian references Then again, many developers have Christian first names (most noticeably "Christophe"). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce0ed241eef5765b734add730f0b3d6c5be2231d --- modules/gui/qt4/components/interface_widgets.cpp | 4 ++-- modules/gui/qt4/dialogs/help.cpp | 4 ++-- modules/gui/qt4/main_interface.cpp | 4 ++-- modules/gui/qt4/qt4.cpp | 6 +++--- modules/gui/qt4/qt4.hpp | 8 +++----- modules/gui/qt4/vlc.qrc | 4 ++-- share/Makefile.am | 6 +++--- .../128x128/{vlc-christmas.png => vlc-xmas.png} | Bin 14399 -> 14399 bytes .../32x32/{vlc-christmas.xpm => vlc-xmas.xpm} | 2 +- .../48x48/{vlc-christmas.png => vlc-xmas.png} | Bin 3085 -> 3085 bytes 10 files changed, 18 insertions(+), 20 deletions(-) diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index 084a89c..1a8deb5 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -212,8 +212,8 @@ void BackgroundWidget::updateArt( const QString& url ) } else { /* Xmas joke */ - if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY ) - pixmapUrl = QString( ":/logo/vlc128-christmas.png" ); + if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ) + pixmapUrl = QString( ":/logo/vlc128-xmas.png" ); else pixmapUrl = QString( ":/logo/vlc128.png" ); } diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index 76a631e..1c95350 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -102,8 +102,8 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) ui.introduction->setText( qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE ) ); - if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY ) - ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) ); + if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ) + ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128-xmas.png" ) ); else ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128.png" ) ); diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 139ce17..2931d4f 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -942,8 +942,8 @@ void MainInterface::showBuffering( float f_cache ) void MainInterface::createSystray() { QIcon iconVLC; - if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY ) - iconVLC = QIcon( ":/logo/vlc128-christmas.png" ); + if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ) + iconVLC = QIcon( ":/logo/vlc128-xmas.png" ); else iconVLC = QIcon( ":/logo/vlc128.png" ); sysTray = new QSystemTrayIcon( iconVLC, this ); diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index ecfb769..30c1f1e 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -44,7 +44,7 @@ #endif #include "../../../share/icons/32x32/vlc.xpm" -#include "../../../share/icons/32x32/vlc-christmas.xpm" +#include "../../../share/icons/32x32/vlc-xmas.xpm" #include <vlc_plugin.h> #ifdef WIN32 /* For static builds */ @@ -479,8 +479,8 @@ static void *Thread( void *obj ) /* Icon setting, Mac uses icon from .icns */ #ifndef Q_WS_MAC - if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY ) - app.setWindowIcon( QIcon(vlc_christmas_xpm) ); + if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ) + app.setWindowIcon( QIcon(vlc_xmas_xpm) ); else app.setWindowIcon( QIcon(vlc_xpm) ); #endif diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp index 21f0a56..918986e 100644 --- a/modules/gui/qt4/qt4.hpp +++ b/modules/gui/qt4/qt4.hpp @@ -131,11 +131,9 @@ static inline QString QVLCUserDir( vlc_userdir_t type ) } /* After this day of the year, the usual VLC cone is replaced by another cone - * wearing a Santa hat. - * Warning: can panic users (virus changed my icons!!), and cause religious - * trolls (VLC is a supporter of catholicism!!) - * Note, this icon doesn't represent an endorsment of Coca-Cola company + * wearing a Father Xmas hat. + * Note this icon doesn't represent an endorsment of Coca-Cola company. */ -#define QT_CHRISTMAS_TROLL_DAY 354 +#define QT_XMAS_JOKE_DAY 354 #endif diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc index d0a826c..91befcf 100644 --- a/modules/gui/qt4/vlc.qrc +++ b/modules/gui/qt4/vlc.qrc @@ -3,8 +3,8 @@ <file alias="vlc128.png" >../../../share/icons/128x128/vlc.png</file> <file alias="vlc16.png" >../../../share/icons/16x16/vlc.png</file> <file alias="vlc48.png" >../../../share/icons/48x48/vlc.png</file> - <file alias="vlc128-christmas.png" >../../../share/icons/128x128/vlc-christmas.png</file> - <file alias="vlc48-christmas.png" >../../../share/icons/48x48/vlc-christmas.png</file> + <file alias="vlc128-xmas.png" >../../../share/icons/128x128/vlc-xmas.png</file> + <file alias="vlc48-xmas.png" >../../../share/icons/48x48/vlc-xmas.png</file> </qresource> <qresource prefix="/menu" > <file alias="help" >pixmaps/menus/help_16px.png</file> diff --git a/share/Makefile.am b/share/Makefile.am index b491900..4e63432 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -15,9 +15,9 @@ dist_appdata_DATA = vlc.desktop dist_vlcdata_DATA = icons/vlc.ico dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \ - icons/32x32/vlc-christmas.xpm -dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png -dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png + icons/32x32/vlc-xmas.xpm +dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-xmas.png +dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-xmas.png dist_icons256_DATA = icons/256x256/vlc.png nobase_dist_vlcdata_SCRIPTS = \ diff --git a/share/icons/128x128/vlc-christmas.png b/share/icons/128x128/vlc-xmas.png similarity index 100% rename from share/icons/128x128/vlc-christmas.png rename to share/icons/128x128/vlc-xmas.png diff --git a/share/icons/32x32/vlc-christmas.xpm b/share/icons/32x32/vlc-xmas.xpm similarity index 99% rename from share/icons/32x32/vlc-christmas.xpm rename to share/icons/32x32/vlc-xmas.xpm index bf2a01b..cc1dd4f 100644 --- a/share/icons/32x32/vlc-christmas.xpm +++ b/share/icons/32x32/vlc-xmas.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char *vlc_christmas_xpm[] = { +static const char *vlc_xmas_xpm[] = { /* columns rows colors chars-per-pixel */ "32 32 174 2", " c #00AE00390021", diff --git a/share/icons/48x48/vlc-christmas.png b/share/icons/48x48/vlc-xmas.png similarity index 100% rename from share/icons/48x48/vlc-christmas.png rename to share/icons/48x48/vlc-xmas.png _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits