Committing in .

Modified Files:
	taskbar/launcherview.cpp
Log Message:
	Checked in whardier's launcherview changes.

1 files changed, 6 insertions, 6 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 68e3245..ed39720 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -81,143 +81,143 @@ public:
 	    bsy = c;
 	    if ( o ) o->repaint();
 	    if ( c ) c->repaint();
 	}
     }
 
     bool inKeyEvent() const { return ike; }
     void keyPressEvent(QKeyEvent* e)
     {
 	ike = TRUE;
 	if ( e->key() == Key_F33 ) {
 	    // "OK" button
 	    returnPressed(currentItem());
 	}
 	QIconView::keyPressEvent(e);
 	ike = FALSE;
     }
 
     void addItem(AppLnk* app, bool resort=TRUE);
     bool removeLink(const QString& linkfile);
 
     QStringList mimeTypes() const;
     QStringList categories() const;
 
     void clear()
     {
 	mimes.clear();
 	cats.clear();
 	QIconView::clear();
 	hidden.clear();
     }
 
     void addCatsAndMimes(AppLnk* app)
     {
 	// 	QStringList c = app->categories();
 	// 	for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
 	// 	    cats.replace(*cit,(void*)1);
 	// 	}
 	QString maj=app->type();
 	int sl=maj.find('/');
 	if (sl>=0) {
 	    QString k = maj.left(sl);
 	    mimes.replace(k,(void*)1);
 	}
     }
 
     void drawBackground( QPainter *p, const QRect &r )
     {
-	//	int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0;
-	int backgroundMode = 2;
+	int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0;
+	//int backgroundMode = 2;
 
 	if ( backgroundMode == 1 ) {
 
 	    // Double buffer the background
 	    static QPixmap *bg = NULL;
 	    static QColor bgColor;
 
 	    if ( (bg == NULL) || (bgColor != colorGroup().button()) ) {
 		// Create a new background double buffer
 		if (bg == NULL)
 		    bg = new QPixmap( width(), height() );
 		bgColor = colorGroup().button();
 		QPainter painter( bg );
 
-		painter.fillRect( QRect( 0, 0, width(), height() ), QBrush( white ) );
+		painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110));
 
 		// Overlay the Qtopia logo in the center
-		QImage logo = Resource::loadImage( "qpe-logo" );
+		QImage logo = Resource::loadImage( "qpe-background" );
 		if ( !logo.isNull() )
 		    painter.drawImage( (width() - logo.width()) / 2,
 				       (height() - logo.height()) / 2, logo );
 	    }
 
 	    // Draw the double buffer to the widget (it is tiled for when the icon view is large)
 	    p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
 						(r.y() + contentsY()) % bg->height() ) );
 	} else if ( backgroundMode == 2 ) {
 	    static QPixmap *bg = 0;
 	    static QColor bgColor;
 	    if ( !bg || (bgColor != colorGroup().background()) ) {
 		bgColor = colorGroup().background();
 		bg = new QPixmap( width(), 9 );
 		QPainter painter( bg );
 		for ( int i = 0; i < 3; i++ ) {
-		    painter.setPen( white );
+		    painter.setPen( colorGroup().background().light(130) );
 		    painter.drawLine( 0, i*3, width()-1, i*3 );
 		    painter.drawLine( 0, i*3+1, width()-1, i*3+1 );
 		    painter.setPen( colorGroup().background().light(105) );
 		    painter.drawLine( 0, i*3+2, width()-1, i*3+2 );
 		}
 	    }
 	    p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
 						(r.y() + contentsY()) % bg->height() ) );
 	} else {
-	    p->fillRect( r, QBrush( white ) );
+	    p->fillRect( r, QBrush( colorGroup().background().light(110) ) );
 	}
     }
 
     void hideOrShowItems(bool resort);
 
     void setTypeFilter(const QString& typefilter, bool resort)
     {
 	tf = QRegExp(typefilter,FALSE,TRUE);
 	hideOrShowItems(resort);
     }
 
     void setCategoryFilter( int catfilter, bool resort )
     {
 	Categories cat;
 	cat.load( categoryFileName() );
 	QString str;
 	if ( catfilter == -2 )
 	    cf = 0;
 	else
 	    cf = catfilter;
 	hideOrShowItems(resort);
     }
 
     enum SortMethod { Name, Date, Type };
 
     void setSortMethod( SortMethod m )
     {
 	if ( sortmeth != m ) {
 	    sortmeth = m;
 	    sort();
 	}
     }
 
     int compare(const AppLnk* a, const AppLnk* b)
     {
 	switch (sortmeth) {
 	case Name:
 	    return a->name().compare(b->name());
 	case Date: {
 	    QFileInfo fa(a->linkFile());
 	    if ( !fa.exists() ) fa.setFile(a->file());
 	    QFileInfo fb(b->linkFile());
 	    if ( !fb.exists() ) fb.setFile(b->file());
 	    return fa.lastModified().secsTo(fb.lastModified());
 	}
 	case Type:
 	    return a->type().compare(b->type());
 	}