[vlc-devel] [PATCH] Increase global awareness about our Lord and Saviour
Rémi Denis-Courmont
remi at remlab.net
Sun Apr 1 22:42:28 CEST 2012
Le dimanche 1 avril 2012 19:35:34 Rafaël Carré, vous avez écrit :
> His words and icons should be present in our lives at any time of the year.
April 1st is not the 92th day of non-leap years.
And I think we should show this on Easter instead. Best of luck with the
computation, ahaha.
> ---
> modules/gui/qt4/components/interface_widgets.cpp | 2 +-
> modules/gui/qt4/dialogs/help.cpp | 2 +-
> modules/gui/qt4/main_interface.cpp | 2 +-
> modules/gui/qt4/qt4.cpp | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/modules/gui/qt4/components/interface_widgets.cpp
> b/modules/gui/qt4/components/interface_widgets.cpp index 0ca799a..44408b7
> 100644
> --- a/modules/gui/qt4/components/interface_widgets.cpp
> +++ b/modules/gui/qt4/components/interface_widgets.cpp
> @@ -208,7 +208,7 @@ void BackgroundWidget::updateArt( const QString& url )
> }
> else
> { /* Xmas joke */
> - if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY &&
> var_InheritBool( p_intf, "qt-icon-change" ) ) + if( (
> QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ||
> QDate::currentDate().dayOfYear() == 92 ) && var_InheritBool( p_intf,
> "qt-icon-change" ) ) 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 da515b8..c9cd66e 100644
> --- a/modules/gui/qt4/dialogs/help.cpp
> +++ b/modules/gui/qt4/dialogs/help.cpp
> @@ -98,7 +98,7 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf)
> ui.introduction->setText(
> qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE ) );
>
> - if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY &&
> var_InheritBool( p_intf, "qt-icon-change" ) ) + if(
> (QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ||
> QDate::currentDate().dayOfYear() == 92 ) && var_InheritBool( p_intf,
> "qt-icon-change" ) ) 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 8d952d2..6fd0330 100644
> --- a/modules/gui/qt4/main_interface.cpp
> +++ b/modules/gui/qt4/main_interface.cpp
> @@ -1014,7 +1014,7 @@ void MainInterface::showBuffering( float f_cache )
> void MainInterface::createSystray()
> {
> QIcon iconVLC;
> - if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY &&
> var_InheritBool( p_intf, "qt-icon-change" ) ) + if(
> (QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ||
> QDate::currentDate().dayOfYear() == 92) && var_InheritBool( p_intf,
> "qt-icon-change" )) iconVLC = QIcon( ":/logo/vlc128-xmas.png" );
> else
> iconVLC = QIcon( ":/logo/vlc128.png" );
> diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
> index 73e84d5..7b0bcd0 100644
> --- a/modules/gui/qt4/qt4.cpp
> +++ b/modules/gui/qt4/qt4.cpp
> @@ -470,7 +470,7 @@ static void *Thread( void *obj )
>
> /* Icon setting, Mac uses icon from .icns */
> #ifndef Q_WS_MAC
> - if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY &&
> var_InheritBool( p_intf, "qt-icon-change" ) ) + if(
> (QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ||
> QDate::currentDate().dayOfYear() == 92 ) && var_InheritBool( p_intf,
> "qt-icon-change" ) ) app.setWindowIcon( QIcon(vlc_xmas_xpm) );
> else
> app.setWindowIcon( QIcon(vlc_xpm) );
--
Rémi Denis-Courmont
http://www.remlab.net/
http://fi.linkedin.com/in/remidenis
More information about the vlc-devel
mailing list