Commit ce0ed241 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove Christian references

Then again, many developers have Christian first names (most noticeably
"Christophe").
parent 1e76bf48
......@@ -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" );
}
......
......@@ -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" ) );
......
......@@ -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 );
......
......@@ -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
......
......@@ -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
......@@ -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>
......
......@@ -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 = \
......
/* 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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment