- fixed bg image location

1 files changed, 1 insertions, 1 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 047fe45..c2bde53 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -610,193 +610,193 @@ void LauncherView::updateTools()
     catmb->setAllCategories( TRUE );
 
     connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
 }
 
 void LauncherView::sortBy(int s)
 {
     icons->setSortMethod((LauncherIconView::SortMethod)s);
 }
 
 void LauncherView::showType(int t)
 {
     if ( t >= (int)typelist.count() ) {
 	icons->setTypeFilter("",TRUE);
     } else {
 	QString ty = typelist[t];
 	if ( !ty.contains('/') )
 	    ty += "/*";
 	icons->setTypeFilter(ty,TRUE);
     }
 }
 
 void LauncherView::showCategory( int c )
 {
     icons->setCategoryFilter( c, TRUE );
 }
 
 void LauncherView::setViewMode( ViewMode m )
 {
     if ( vmode != m ) {
 	bool bigIcons = m == Icon;
 	icons->viewport()->setUpdatesEnabled( FALSE );
 	icons->setBigIcons( bigIcons );
 	switch ( m ) {
 	    case List:
 		icons->setItemTextPos( QIconView::Right );
 		break;
 	    case Icon:
 		icons->setItemTextPos( QIconView::Bottom );
 		break;
 	}
 	icons->hideOrShowItems( FALSE );
 	icons->viewport()->setUpdatesEnabled( TRUE );
 	vmode = m;
     }
 }
 
 void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
 {
     if ( !bgCache )
 	bgCache = new QMap<QString,BgPixmap*>;
     if ( bgCache->contains( bgName ) )
 	(*bgCache)[bgName]->ref--;
 
     switch ( t ) {
 	case Ruled: {
 	    bgName = QString("Ruled_%1").arg(colorGroup().background().name()); // No tr
 	    QPixmap bg;
 	    if ( bgCache->contains( bgName ) ) {
 		(*bgCache)[bgName]->ref++;
 		bg = (*bgCache)[bgName]->pm;
 	    } else {
 		bg.resize( width(), 9 );
 		QPainter painter( &bg );
 		for ( int i = 0; i < 3; i++ ) {
 		    painter.setPen( white );
 		    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 );
 		}
 		painter.end();
 		bgCache->insert( bgName, new BgPixmap(bg) );
 	    }
 	    icons->setBackgroundPixmap( bg );
 	    break;
 	}
 
 	case SolidColor:
 	    icons->setBackgroundPixmap( QPixmap() );
 	    if ( val.isEmpty() ) {
 		icons->setBackgroundColor( colorGroup().base() );
 	    } else {
 		icons->setBackgroundColor( val );
 	    }
 	    bgName = "";
 	    break;
 
 	case Image:
 	    bgName = val;
 	    if ( bgCache->contains( bgName ) ) {
 		(*bgCache)[bgName]->ref++;
 		icons->setBackgroundPixmap( (*bgCache)[bgName]->pm );
 	    } else {
 		qDebug( "Loading image: %s", val.latin1() );
-		QPixmap bg( Resource::loadPixmap( "wallpaper/" + val ) );
+		QPixmap bg( Resource::loadPixmap( val ) );
 		if ( bg.isNull() ) {
 		    QImageIO imgio;
 		    imgio.setFileName( bgName );
 		    QSize ds = qApp->desktop()->size();
 		    QString param( "Scale( %1, %2, ScaleMin )" ); // No tr
 		    imgio.setParameters( param.arg(ds.width()).arg(ds.height()).latin1() );
 		    imgio.read();
 		    bg = imgio.image();
 		}
 		bgCache->insert( bgName, new BgPixmap(bg) );
 		icons->setBackgroundPixmap( bg );
 	    }
 	    break;
     }
 
     // remove unreferenced backgrounds.
     QMap<QString,BgPixmap*>::Iterator it = bgCache->begin();
     while ( it != bgCache->end() ) {
 	QMap<QString,BgPixmap*>::Iterator curr = it;
 	++it;
 	if ( (*curr)->ref == 0 ) {
 	    delete (*curr);
 	    bgCache->remove( curr );
 	}
     }
 
     bgType = t;
     icons->viewport()->update();
 }
 
 void LauncherView::setTextColor( const QColor &tc )
 {
     textCol = tc;
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, tc );
     icons->setPalette( QPalette(cg,cg,cg) );
     icons->viewport()->update();
 }
 
 void LauncherView::setViewFont( const QFont &f )
 {
     icons->setFont( f );
 }
 
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
     QVBox::resizeEvent( e );
     if ( e->size().width() != e->oldSize().width() )
 	sort();
 }
 
 void LauncherView::populate( AppLnkSet *folder, const QString& typefilter )
 {
     icons->clear();
     internalPopulate( folder, typefilter );
 }
 
 QString LauncherView::getAllDocLinkInfo() const
 {
     return icons->getAllDocLinkInfo();
 }
 
 void LauncherView::selectionChanged()
 {
     QIconViewItem* item = icons->currentItem();
     if ( item && item->isSelected() ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( icons->inKeyEvent() ) // not for mouse press
 	    emit clicked( appLnk );
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::returnPressed( QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	emit clicked( appLnk );
     }
 }
 
 void LauncherView::itemClicked( int btn, QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( btn == LeftButton ) {
 	    // Make sure it's the item we execute that gets highlighted
 	    icons->setCurrentItem( item );
 	    emit clicked( appLnk );
 	}
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::itemPressed( int btn, QIconViewItem *item )
 {