Skip to content

V
vlc-2-2
Commit f5a08fa8 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

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

qt4: special icon made by Geoffrey Roussel alias akem/meka is displayed in the last days of the year.
parent 6586a8ab
Show whitespace changes
Inline Side-by-side
Showing with 251 additions and 7 deletions
THANKS
View file @ f5a08fa8
...@@ -84,6 +84,7 @@ Fouzia Bourai <fbourai at cerist dot dz> - Arabic localisation ...@@ -84,6 +84,7 @@ Fouzia Bourai <fbourai at cerist dot dz> - Arabic localisation
François Seingier <francois.seingier at club-internet.fr> - TTL setting in the wx stream output dialog François Seingier <francois.seingier at club-internet.fr> - TTL setting in the wx stream output dialog
Frank Chao <frank0624 at gmail.com> - Chinese Traditional translation Frank Chao <frank0624 at gmail.com> - Chinese Traditional translation
Fumio Nakayama <endymion at ca2.so-net.ne.jp> - Japanese translation Fumio Nakayama <endymion at ca2.so-net.ne.jp> - Japanese translation
Geoffrey Roussel <meka321 at hotmail dot com> - Christmas easter egg Artwork
Georgi Chorbadzhiyski <gf at unixsol dot org> - HTTP access error handling fix Georgi Chorbadzhiyski <gf at unixsol dot org> - HTTP access error handling fix
Gisle Vanem <giva at bgnet dot no> - gettieoffay under win32 Gisle Vanem <giva at bgnet dot no> - gettieoffay under win32
Glen Gray <slaine at slaine do rog> - RTSP keepalive Glen Gray <slaine at slaine do rog> - RTSP keepalive
......
modules/gui/qt4/components/interface_widgets.cpp
View file @ f5a08fa8
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <QMenu> #include <QMenu>
#include <QPalette> #include <QPalette>
#include <QResizeEvent> #include <QResizeEvent>
#include <QDate>
/********************************************************************** /**********************************************************************
* Video Widget. A simple frame on which video is drawn * Video Widget. A simple frame on which video is drawn
...@@ -149,6 +150,9 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) : ...@@ -149,6 +150,9 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) :
label->setMaximumWidth( MAX_BG_SIZE ); label->setMaximumWidth( MAX_BG_SIZE );
label->setMinimumHeight( MIN_BG_SIZE ); label->setMinimumHeight( MIN_BG_SIZE );
label->setMinimumWidth( MIN_BG_SIZE ); label->setMinimumWidth( MIN_BG_SIZE );
if( QDate::currentDate().dayOfYear() >= 354 )
label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
else
label->setPixmap( QPixmap( ":/vlc128.png" ) ); label->setPixmap( QPixmap( ":/vlc128.png" ) );
QHBoxLayout *backgroundLayout = new QHBoxLayout( this ); QHBoxLayout *backgroundLayout = new QHBoxLayout( this );
...@@ -168,6 +172,9 @@ void BackgroundWidget::update( input_thread_t *p_input ) ...@@ -168,6 +172,9 @@ void BackgroundWidget::update( input_thread_t *p_input )
{ {
if( !p_input || p_input->b_dead ) if( !p_input || p_input->b_dead )
{ {
if( QDate::currentDate().dayOfYear() >= 354 )
label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
else
label->setPixmap( QPixmap( ":/vlc128.png" ) ); label->setPixmap( QPixmap( ":/vlc128.png" ) );
return; return;
} }
...@@ -179,7 +186,12 @@ void BackgroundWidget::update( input_thread_t *p_input ) ...@@ -179,7 +186,12 @@ void BackgroundWidget::update( input_thread_t *p_input )
QString url = qfu( psz_arturl ); QString url = qfu( psz_arturl );
QString arturl = url.replace( "file://",QString("" ) ); QString arturl = url.replace( "file://",QString("" ) );
if( arturl.isNull() ) if( arturl.isNull() )
{
if( QDate::currentDate().dayOfYear() >= 354 )
label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
else
label->setPixmap( QPixmap( ":/vlc128.png" ) ); label->setPixmap( QPixmap( ":/vlc128.png" ) );
}
else else
{ {
label->setPixmap( QPixmap( arturl ) ); label->setPixmap( QPixmap( arturl ) );
......
modules/gui/qt4/dialogs/help.cpp
View file @ f5a08fa8
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QEvent> #include <QEvent>
#include <QFileDialog> #include <QFileDialog>
#include <QDate>
HelpDialog *HelpDialog::instance = NULL; HelpDialog *HelpDialog::instance = NULL;
...@@ -90,6 +91,9 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) ...@@ -90,6 +91,9 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
QLabel *introduction = new QLabel( QLabel *introduction = new QLabel(
qtr( "Information about VLC media player." ) ); qtr( "Information about VLC media player." ) );
QLabel *iconVLC = new QLabel; QLabel *iconVLC = new QLabel;
if( QDate::currentDate().dayOfYear() >= 354 )
iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );
else
iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) ); iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) );
layout->addWidget( iconVLC, 0, 0, 1, 1 ); layout->addWidget( iconVLC, 0, 0, 1, 1 );
layout->addWidget( introduction, 0, 1, 1, 7 ); layout->addWidget( introduction, 0, 1, 1, 7 );
...@@ -119,6 +123,9 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf ) ...@@ -119,6 +123,9 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
infoLabel->setWordWrap( infoLabel ); infoLabel->setWordWrap( infoLabel );
QLabel *iconVLC2 = new QLabel; QLabel *iconVLC2 = new QLabel;
if( QDate::currentDate().dayOfYear() >= 354 )
iconVLC2->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
else
iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) ); iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) );
infoLayout->addWidget( iconVLC2 ); infoLayout->addWidget( iconVLC2 );
infoLayout->addWidget( infoLabel ); infoLayout->addWidget( infoLabel );
......
modules/gui/qt4/main_interface.cpp
View file @ f5a08fa8
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <QToolBar> #include <QToolBar>
#include <QGroupBox> #include <QGroupBox>
#include <QDate>
#include <assert.h> #include <assert.h>
#include <vlc_keys.h> #include <vlc_keys.h>
...@@ -868,7 +869,11 @@ void MainInterface::updateOnTimer() ...@@ -868,7 +869,11 @@ void MainInterface::updateOnTimer()
**/ **/
void MainInterface::createSystray() void MainInterface::createSystray()
{ {
QIcon iconVLC = QIcon( QPixmap( ":/vlc128.png" ) ); QIcon iconVLC;
if( QDate::currentDate().dayOfYear() >= 354 )
iconVLC = QIcon( QPixmap( ":/vlc128-christmas.png" ) );
else
iconVLC = QIcon( QPixmap( ":/vlc128.png" ) );
sysTray = new QSystemTrayIcon( iconVLC, this ); sysTray = new QSystemTrayIcon( iconVLC, this );
sysTray->setToolTip( qtr( "VLC media player" )); sysTray->setToolTip( qtr( "VLC media player" ));
......
modules/gui/qt4/qt4.cpp
View file @ f5a08fa8
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <QApplication> #include <QApplication>
#include <QLocale> #include <QLocale>
#include <QTranslator> #include <QTranslator>
#include <QDate>
#include "qt4.hpp" #include "qt4.hpp"
#include <vlc_os_specific.h> #include <vlc_os_specific.h>
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
#endif #endif
#include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32.xpm"
#include "../../../share/vlc32x32-christmas.xpm"
/***************************************************************************** /*****************************************************************************
* Local prototypes. * Local prototypes.
...@@ -262,6 +264,9 @@ static void Init( intf_thread_t *p_intf ) ...@@ -262,6 +264,9 @@ static void Init( intf_thread_t *p_intf )
/* Start the QApplication here */ /* Start the QApplication here */
QApplication *app = new QApplication( argc, argv , true ); QApplication *app = new QApplication( argc, argv , true );
if( QDate::currentDate().dayOfYear() >= 354 )
app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
else
app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
p_intf->p_sys->p_app = app; p_intf->p_sys->p_app = app;
......
modules/gui/qt4/res.qrc
View file @ f5a08fa8
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<file alias="vlc128.png">../../../share/vlc128x128.png</file> <file alias="vlc128.png">../../../share/vlc128x128.png</file>
<file alias="vlc16.png">../../../share/vlc16x16.png</file> <file alias="vlc16.png">../../../share/vlc16x16.png</file>
<file alias="vlc48.png">../../../share/vlc48x48.png</file> <file alias="vlc48.png">../../../share/vlc48x48.png</file>
<file alias="vlc128-christmas.png">../../../share/vlc128x128-christmas.png</file>
<file alias="vlc48-christmas.png">../../../share/vlc48x48-christmas.png</file>
<file>pixmaps/advprefs_audio.png</file> <file>pixmaps/advprefs_audio.png</file>
<file>pixmaps/advprefs_codec.png</file> <file>pixmaps/advprefs_codec.png</file>
<file>pixmaps/advprefs_extended.png</file> <file>pixmaps/advprefs_extended.png</file>
......
share/vlc32x32-christmas.xpm 0 → 100644
View file @ f5a08fa8
/* XPM */
static const char *vlc_christmas_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 174 2",
" c #00AE00390021",
". c #07EC00000000",
"X c #07A507A707AC",
"o c #1C7913BF0E6A",
"O c #3AC51615008F",
"+ c #3EC317D80000",
"@ c #251D1EC51AD9",
"# c #302C308F30CC",
"$ c #444A1A9000C0",
"% c #50EC1EB20000",
"& c #56A62163015C",
"* c #598F221B0000",
"= c #642326260000",
"- c #680C27770000",
"; c #6A7828BF004A",
": c #74572C660051",
"> c #79EB2E840000",
", c #7D8230480094",
"< c #69473CBE212C",
"1 c #418E41A841B8",
"2 c #514F507B4FF8",
"3 c #72F85A7E4B3B",
"4 c #6B305B5E5231",
"5 c #7C997DB77E69",
"6 c #8589007E0080",
"7 c #9C1C019301A3",
"8 c #95760BF20C61",
"9 c #99B00C780CE2",
"0 c #9A1018151858",
"q c #A11C004B004C",
"w c #ADE403190337",
"e c #AADF0F0C0F8B",
"r c #B37F0209021A",
"t c #B6CA0B8A0BCF",
"y c #B9790AB50B12",
"u c #AEB81E741F6F",
"i c #850633D601A2",
"p c #8B7136080155",
"a c #8DFD3D9F0BF8",
"s c #9256379E0000",
"d c #953E39880115",
"f c #9ADF3AFA003E",
"g c #A1EB3DF10001",
"h c #A8ED20762184",
"j c #C19300000000",
"k c #CC7600CD00D4",
"l c #D258007E0082",
"z c #D87400000000",
"x c #C10E17591840",
"c c #D7681769183E",
"v c #E08C00080008",
"b c #EBD201380142",
"n c #F40400000000",
"m c #FA1F00000000",
"M c #F80B0C6D0C95",
"N c #E350121812BE",
"B c #E9851179119F",
"V c #EC091D7A1E6D",
"C c #CB2E2CCD2E66",
"Z c #DDD22D212E20",
"A c #CD162F2430AE",
"S c #C5ED3CF73D37",
"D c #CEE23AE63CB2",
"F c #D7B53459360A",
"G c #DB77310B3167",
"H c #E2C9236A24AB",
"J c #F2BE24EA2633",
"K c #FADE2530260A",
"L c #F73739943B98",
"P c #AE8643910164",
"I c #AFC54911096E",
"U c #B546454F0000",
"Y c #BC9C46700000",
"T c #B47849C7072C",
"R c #BD094B43043B",
"E c #B6864CA609D9",
"W c #BA894E140978",
"Q c #C6304BBA00D1",
"! c #CAC34D8A0000",
"~ c #C777500C05D3",
"^ c #CE8553100638",
"/ c #C7DC53E80BF1",
"( c #C9D654480B67",
") c #DFB959E0071B",
"_ c #D6A85794085B",
"` c #DD9B5CF60BFF",
"' c #E54056E70000",
"] c #E11B59BD0490",
"[ c #E90A59360000",
"{ c #F4425D3900E8",
"} c #DF5861D813CD",
"| c #EFAE64890DC5",
" . c #F74863550608",
".. c #E15C60AA0FDE",
"X. c #E931690F16E8",
"o. c #EB356C9B1A1B",
"O. c #C39B60A22353",
"+. c #EFAE7F0826CB",
"@. c #ED6A7B3A295A",
"#. c #A2005EAD5EF6",
"$. c #94176CFC54B9",
"%. c #AA957CB16032",
"&. c #DBC24D3D4DAC",
"*. c #E300427744A2",
"=. c #FCD442F0455B",
"-. c #E8D1547754E3",
";. c #DB7C7C1C40D8",
":. c #D2056F716FD0",
">. c #F249692C6A1A",
",. c #E4E674EE75C2",
"<. c #FCA088F02B7A",
"1. c #FA6485783021",
"2. c #FF4B8EEE3019",
"3. c #F7B392483CC2",
"4. c #FFC495D2380D",
"5. c #FFFF99D73C29",
"6. c #F5E38A40466F",
"7. c #FEA09F80429D",
"8. c #F349962A5016",
"9. c #F66CAB555325",
"0. c #FFFAB0B15943",
"q. c #D41694496CF4",
"w. c #FFFFC0946887",
"e. c #FFFFD4A47C39",
"r. c #879087918791",
"t. c #903F918F925E",
"y. c #BFBD9EE98A82",
"u. c #BAEABC42BD17",
"i. c #F35E87C8886B",
"p. c #F8A78A438C1F",
"a. c #EFA798A89966",
"s. c #F3A29B1C9C18",
"d. c #F68ABA388CE9",
"f. c #E75EB5419625",
"g. c #C196B303AA93",
"h. c #FFFFCFDE8222",
"j. c #FF6AC5B1976F",
"k. c #FFFFE1DC8802",
"l. c #FFFFE4168849",
"z. c #FFFFEB5492BD",
"x. c #E722C937B6A0",
"c. c #F3F1CBAEB1E1",
"v. c #FFC6E164BC3B",
"b. c #C2DCC3B7C43E",
"n. c #DDDCDCBBDDD5",
"m. c #EF8BC53AC589",
"M. c #F977CBFBCC98",
"N. c #FDA1D918C15E",
"B. c #EC6CDF54D740",
"V. c #EE31DEDBDF78",
"C. c #F94CD8ACD91F",
"Z. c #FC5CE17BCE4E",
"A. c #FFFFF3D5CA4F",
"S. c #FE5AE66FD52C",
"D. c #F642E47FD991",
"F. c #FFFFF8A5DD1C",
"G. c #E697E3C4E4C5",
"H. c #EFBEE51DE5BD",
"J. c #ED99EC3CECCF",
"K. c #F4B6E5FAE6A8",
"L. c #FC11E418E4B7",
"P. c #F0C1EEABEF68",
"I. c #FC25EDD3EAE4",
"U. c #FFFFF7A8E343",
"Y. c #FF5DF573ED44",
"T. c #FFFCFA01F000",
"R. c #F14CEFF3F08D",
"E. c #F5FEF491F50D",
"W. c #F91DF76BF7FB",
"Q. c #FFF1F970F51E",
"!. c #F9BCF85AF8E9",
"~. c #F851F888F9DF",
"^. c #FDEBFD6CFDA5",
"/. c None",
/* pixels */
"/./././././././././././././././././././././././././././././././.",
"/././././././././././././././././.=.L H H J V /././././././././.",
"/././././././././././././././.F x c N k l w r w 0 m.^.^././././.",
"/././././././././././././.D u e r k l w k q 7 6 #.L.J.J.W./././.",
"/./././././././././././.*.h 9 r l b n r 6 y Z ,.C.W.G.J.G./././.",
"/./././././././././././.C 8 w k b m n l 7 /./.^.^.J.J.G.G./././.",
"/./././././././././.^.p.A w j v n m n z r /./.^.^.E.P.E././././.",
"/././././././././.^.^.L.s.&.G B M K b k t /././.^.^.!./././././.",
"/././././././././.^.^.!.!.L.M.a.i.>.-.S :.I././././././././././.",
"/././././././././.^.E.W.E.^.^.E.E.K.K.V.H.E.W./././././././././.",
"/././././././././.^.E.E.J.W.^.W.!.E.W.E.R.E.E./././././././././.",
"/./././././././././.!.W.E.W.!.!.!.!.E.!.!.E.!./././././././././.",
"/././././././././././.^.E.n.!.^.!.^.~.^.!.P././././././././././.",
"/././././././././././././.4 g.B.Y.T.S.c.D./././././././././././.",
"/./././././././././././.O & a O.8.h.1.) /./././././././././././.",
"/./././././././././././.+ = d Y @.e.<.' Q /././././././././././.",
"/./././././././././././.O ; f Y @.k.7.| ;./././././././././././.",
"/././././././././././. @ 3 %.q.d.A.v.N.I./././././././././././.",
"/././././././././././. # 5 u.J.^.^.^.^.^.J././././././././././.",
"/././././././././././.X 1 r.b.J.^.^.^.^.^.E././././././././././.",
"/./././././././././.+ o 2 t.b.E.^.^.^.^.Q.f.a /././././././././.",
"/././././././././.* $ $ < $.y.x.Z.U.F.j.6.` f , /./././././././.",
"/./././././././.$ = $ % : s P / @.e.z.2.{ ' U i /./././././././.",
"/./././././././.* - $ * > d P Q o.w.l.4. .[ ! p i /././././././.",
"/./././././././.- : ; - , f P Q X.0.e.5. .[ U i p /././././././.",
"/././././././.% : > i p d g U Q ..3.9.+.] ! d i p /././././././.",
"/././././././.; s f f I W R ~ ^ _ ` ` ..} ( T E W R /./././././.",
"/././././././.+ - : : > , i i i p p p i i i i p d /././././././.",
"/././././././. . /./././././././.",
"/./././././././././././././././././././././././././././././././.",
"/./././././././././././././././././././././././././././././././.",
"/./././././././././././././././././././././././././././././././."
};
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