Changeset f5a08fa8831935ee37056a6832c2c6b90bf55a48

Show
Ignore:
Timestamp:
12/21/07 01:58:18 (7 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1198198698 +0000
git-parent:

[6586a8ab643eb5bc459a5085ea99ed946a476f54]

git-author:
Rafaël Carré <funman@videolan.org> 1198198698 +0000
Message:

qt4: special icon made by Geoffrey Roussel alias akem/meka is displayed in the last days of the year.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • THANKS

    r7d6fd3c rf5a08fa  
    8585Frank Chao <frank0624 at gmail.com> - Chinese Traditional translation 
    8686Fumio Nakayama <endymion at ca2.so-net.ne.jp> - Japanese translation 
     87Geoffrey Roussel <meka321 at hotmail dot com> - Christmas easter egg Artwork 
    8788Georgi Chorbadzhiyski <gf at unixsol dot org> - HTTP access error handling fix 
    8889Gisle Vanem <giva at bgnet dot no>  - gettieoffay under win32 

  • modules/gui/qt4/components/interface_widgets.cpp

    rf651c3b rf5a08fa  
    4343#include <QPalette> 
    4444#include <QResizeEvent> 
     45#include <QDate> 
    4546 
    4647/********************************************************************** 
    …… 
    150151    label->setMinimumHeight( MIN_BG_SIZE ); 
    151152    label->setMinimumWidth( MIN_BG_SIZE ); 
    152     label->setPixmap( QPixmap( ":/vlc128.png" ) ); 
     153    if( QDate::currentDate().dayOfYear() >= 354 ) 
     154        label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); 
     155    else 
     156        label->setPixmap( QPixmap( ":/vlc128.png" ) ); 
    153157 
    154158    QHBoxLayout *backgroundLayout = new QHBoxLayout( this ); 
    …… 
    169173    if( !p_input || p_input->b_dead ) 
    170174    { 
    171         label->setPixmap( QPixmap( ":/vlc128.png" ) ); 
     175        if( QDate::currentDate().dayOfYear() >= 354 ) 
     176            label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); 
     177        else 
     178            label->setPixmap( QPixmap( ":/vlc128.png" ) ); 
    172179        return; 
    173180    } 
    …… 
    180187    QString arturl = url.replace( "file://",QString("" ) ); 
    181188    if( arturl.isNull() ) 
    182         label->setPixmap( QPixmap( ":/vlc128.png" ) ); 
     189    { 
     190        if( QDate::currentDate().dayOfYear() >= 354 ) 
     191            label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); 
     192        else 
     193            label->setPixmap( QPixmap( ":/vlc128.png" ) ); 
     194    } 
    183195    else 
    184196    { 

  • modules/gui/qt4/dialogs/help.cpp

    r77c834e rf5a08fa  
    4444#include <QEvent> 
    4545#include <QFileDialog> 
     46#include <QDate> 
    4647 
    4748 
    …… 
    9192            qtr( "Information about VLC media player." ) ); 
    9293    QLabel *iconVLC = new QLabel; 
    93     iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) ); 
     94    if( QDate::currentDate().dayOfYear() >= 354 ) 
     95        iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) ); 
     96    else 
     97        iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) ); 
    9498    layout->addWidget( iconVLC, 0, 0, 1, 1 ); 
    9599    layout->addWidget( introduction, 0, 1, 1, 7 ); 
    …… 
    120124 
    121125    QLabel *iconVLC2 = new QLabel; 
    122     iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) ); 
     126    if( QDate::currentDate().dayOfYear() >= 354 ) 
     127        iconVLC2->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); 
     128    else 
     129        iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) ); 
    123130    infoLayout->addWidget( iconVLC2 ); 
    124131    infoLayout->addWidget( infoLabel ); 

  • modules/gui/qt4/main_interface.cpp

    r6be497d rf5a08fa  
    5151#include <QToolBar> 
    5252#include <QGroupBox> 
     53#include <QDate> 
    5354 
    5455#include <assert.h> 
    …… 
    869870void MainInterface::createSystray() 
    870871{ 
    871     QIcon iconVLC =  QIcon( QPixmap( ":/vlc128.png" ) ); 
     872    QIcon iconVLC; 
     873    if( QDate::currentDate().dayOfYear() >= 354 ) 
     874        iconVLC =  QIcon( QPixmap( ":/vlc128-christmas.png" ) ); 
     875    else 
     876        iconVLC =  QIcon( QPixmap( ":/vlc128.png" ) ); 
    872877    sysTray = new QSystemTrayIcon( iconVLC, this ); 
    873878    sysTray->setToolTip( qtr( "VLC media player" )); 

  • modules/gui/qt4/qt4.cpp

    r5ace50e rf5a08fa  
    2626#include <QLocale> 
    2727#include <QTranslator> 
     28#include <QDate> 
    2829 
    2930#include "qt4.hpp" 
    …… 
    3839 
    3940#include "../../../share/vlc32x32.xpm" 
     41#include "../../../share/vlc32x32-christmas.xpm" 
    4042 
    4143/***************************************************************************** 
    …… 
    263265    /* Start the QApplication here */ 
    264266    QApplication *app = new QApplication( argc, argv , true ); 
    265     app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); 
     267    if( QDate::currentDate().dayOfYear() >= 354 ) 
     268        app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) ); 
     269    else 
     270        app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); 
    266271    p_intf->p_sys->p_app = app; 
    267272 

  • modules/gui/qt4/res.qrc

    r94b8b91 rf5a08fa  
    66  <file alias="vlc16.png">../../../share/vlc16x16.png</file> 
    77  <file alias="vlc48.png">../../../share/vlc48x48.png</file> 
     8  <file alias="vlc128-christmas.png">../../../share/vlc128x128-christmas.png</file> 
     9  <file alias="vlc48-christmas.png">../../../share/vlc48x48-christmas.png</file> 
    810  <file>pixmaps/advprefs_audio.png</file> 
    911  <file>pixmaps/advprefs_codec.png</file>