1 files changed, 7 insertions, 4 deletions

diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 013ab66..2616b7b 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -8,48 +8,51 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "config.h"
 #include "datebookmonth.h"
 #include "datebookdb.h"
 #include "resource.h"
 #include <qpe/qpeapplication.h>
 
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
 #include <qvaluestack.h>
 #include <qwhatsthis.h>
 
+static const QColor s_colorNormalLight = QColor(255, 150, 150);
+static const QColor s_colorRepeatLight = QColor(150, 150, 255);
+static const QColor s_colorHolidayLight= QColor(150, 255, 150);
 
 DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name )
     : QHBox( parent, name )
 {
     setBackgroundMode( PaletteButton );
 
     begin = new QToolButton( this );
     begin->setFocusPolicy(NoFocus);
     begin->setPixmap( Resource::loadPixmap( "start" ) );
     begin->setAutoRaise( TRUE );
     begin->setFixedSize( begin->sizeHint() );
     QWhatsThis::add( begin, tr("Show January in the selected year") );
 
     back = new QToolButton( this );
     back->setFocusPolicy(NoFocus);
     back->setPixmap( Resource::loadPixmap( "back" ) );
     back->setAutoRaise( TRUE );
     back->setFixedSize( back->sizeHint() );
     QWhatsThis::add( back, tr("Show the previous month") );
 
     month = new QComboBox( FALSE, this );
     for ( int i = 0; i < 12; ++i )
 	month->insertItem( Calendar::nameOfMonth( i + 1 ) );
 
@@ -589,62 +592,62 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
 		eLine = w - 1;
 	    else {
 		eLine = (t - 8) * (w - 8);
 		if (eLine)
 		    eLine /= 8;
 		eLine += 4;
 	    }
 	    if (!ev.hasRepeat()) {
 		normalLine.push(sLine);
 		normalLine.push(eLine);
 	    } else {
 		repeatLine.push(sLine);
 		repeatLine.push(eLine);
 	    }
 	}
     }
 
     // draw the background
     if (normalAllDay || repeatAllDay || travelAllDay || holidayAllDay) {
 	p->save();
 
 	if (normalAllDay)
 	    if (repeatAllDay) {
 		p->fillRect( 0, 0, cr.width(), cr.height() / 2,
-			colorNormalLight );
+			s_colorNormalLight );
 		p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2,
 			colorRepeatLight );
 	    } else {
 			if (!holidayAllDay) {
 		p->fillRect( 0, 0, cr.width(), cr.height(),
-			colorNormalLight );
+			s_colorNormalLight );
 			} else {
 		p->fillRect( 0, 0, cr.width(), cr.height(),
-			QColor(0,220,0) );
+			s_colorHolidayLight );
 			}
 	    } else if (repeatAllDay) {
 		p->fillRect( 0, 0, cr.width(), cr.height(),
-			colorRepeatLight );
+			s_colorRepeatLight );
 		}
     } else {
 	p->fillRect( 0, 0, cr.width(),
 		cr.height(), selected
 		?  g.brush( QColorGroup::Highlight )
 		: g.brush( QColorGroup::Base ) );
     }
 
     // The lines
     // now for the lines.
     int h = 5;
     int y = cr.height() / 2 - h;
 
     while(normalLine.count() >= 2) {
 	int x2 = normalLine.pop();
 	int x1 = normalLine.pop();
 	if (x2 < x1 + 2)
 	    x2 = x1 + 2;
 	p->fillRect(x1, y, x2 - x1, h, colorNormal);
     }
 
     y += h;
 
     while(repeatLine.count() >= 2) {