added better configurable background image support

1 files changed, 2 insertions, 3 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 7f86ce1..6354bb7 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -68,131 +68,130 @@ public:
     QIconViewItem* busyItem() const { return bsy; }
 
     void updateCategoriesAndMimeTypes();
 
     void doAutoScroll()
     {
   // We don't want rubberbanding (yet)
     }
 
     void setBusy(bool on)
     {
   QIconViewItem *c = on ? currentItem() : 0;
   if ( bsy != c ) {
       QIconViewItem* o = bsy;
       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 )
     {
   Config config("qpe");
   config.setGroup("Appearance");
-  QString backgroundImage = config.readEntry("BackgroundImage");
-
-  if (backgroundImage.isNull()) backgroundImage="launcher/opie-background";
+  QString backgroundImage = config.readEntry("BackgroundImage","launcher/opie-background");
+    //  if (backgroundImage.isNull()) backgroundImage="launcher/opie-background";
   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() ), colorGroup().background().light(110));
                 // Overlay the Qtopia logo in the center
                 QImage logo;
     if (QFile::exists(backgroundImage)) {
                 logo = QImage(backgroundImage);
     } else {
     logo = Resource::loadImage(backgroundImage );
     }
     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( 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( 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 )
     {