- fixed the default bg type

1 files changed, 2 insertions, 2 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index dc81c9e..1bd1156 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -74,387 +74,387 @@
 #endif
 
 #include <qpe/storage.h>
 #include "mediummountgui.h"
 
 namespace {
   QStringList configToMime( Config *cfg ){
     QStringList mimes;
     bool tmpMime = true;
     cfg->setGroup("mimetypes" );
     tmpMime = cfg->readBoolEntry("all" ,true);
     if( tmpMime ){
       mimes << QString::null;
       return mimes;
     }else{
       tmpMime = cfg->readBoolEntry("audio", true );
       if(tmpMime )
         mimes.append("audio/*" );
 
       tmpMime = cfg->readBoolEntry("image", true );
       if(tmpMime )
         mimes.append("image/*" );
 
       tmpMime = cfg->readBoolEntry("text", true );
       if(tmpMime )
         mimes.append("text/*");
 
       tmpMime = cfg->readBoolEntry("video", true );
       if(tmpMime )
         mimes.append("video/*" );
     }
     return mimes;
   }
 
 }
 
 
 
 //#define SHOW_ALL
 
 class CategoryTab : public QTab
 {
 public:
     CategoryTab( const QIconSet &icon, const QString &text=QString::null )
         : QTab( icon, text )
     {
     }
 
     QColor bgColor;
     QColor fgColor;
 };
 
 //===========================================================================
 
 CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
     QVBox( parent )
 {
     categoryBar = 0;
     stack = 0;
 }
 
 void CategoryTabWidget::prevTab()
 {
     if ( categoryBar ) {
         int n = categoryBar->count();
         int tab = categoryBar->currentTab();
         if ( tab >= 0 )
             categoryBar->setCurrentTab( (tab - 1 + n)%n );
     }
 }
 
 void CategoryTabWidget::nextTab()
 {
     if ( categoryBar ) {
         int n = categoryBar->count();
         int tab = categoryBar->currentTab();
         categoryBar->setCurrentTab( (tab + 1)%n );
     }
 }
 
 void CategoryTabWidget::addItem( const QString& linkfile )
 {
     int i=0;
     AppLnk *app = new AppLnk(linkfile);
     if ( !app->isValid() ) {
         delete app;
         app=0;
     }
     if ( !app || !app->file().isEmpty() ) {
         // A document
         delete app;
         app = new DocLnk(linkfile);
         if ( app->fileKnown() ) {
             ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
         } else {
             ((LauncherView*)(stack->widget(ids.count()-1)))->sort();
             delete app;
         }
         return;
     }
     // An application
     for ( QStringList::Iterator it=ids.begin(); it!=ids.end(); ++it) {
         if ( !(*it).isEmpty() ) {
             QRegExp tf(*it,FALSE,TRUE);
             if ( tf.match(app->type()) >= 0 ) {
                 ((LauncherView*)stack->widget(i))->addItem(app);
                 return;
             }
             i++;
         }
     }
 
     QCopEnvelope e("QPE/TaskBar","reloadApps()");
 }
 
 void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
         AppLnkSet* docFolder, const QList<FileSystem> &fs)
 {
     delete categoryBar;
     categoryBar = new CategoryTabBar( this );
     QPalette pal = categoryBar->palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
 
     delete stack;
     stack = new QWidgetStack(this);
     tabs=0;
 
     ids.clear();
 
     Config cfg("Launcher");
 
     QStringList types = rootFolder->types();
     for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
         if ( !(*it).isEmpty() ) {
             (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
             setTabAppearance( *it, cfg );
         }
     }
     QListIterator<AppLnk> it( rootFolder->children() );
     AppLnk* l;
     while ( (l=it.current()) ) {
         if ( l->type() == "Separator" ) { // No tr
             rootFolder->remove(l);
             delete l;
         } else {
             int i=0;
             for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
                 if ( *it == l->type() )
                     ((LauncherView*)stack->widget(i))->addItem(l,FALSE);
                 i++;
             }
         }
         ++it;
     }
     rootFolder->detachChildren();
     for (int i=0; i<tabs; i++)
         ((LauncherView*)stack->widget(i))->sort();
 
     // all documents
     QImage img( Resource::loadImage( "DocsIcon" ) );
     QPixmap pm;
     pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
     docview = newView( "Documents", // No tr
         pm, tr("Documents"));
     docview->populate( docFolder, QString::null );
     docFolder->detachChildren();
     docview->setFileSystems(fs);
     docview->setToolsEnabled(TRUE);
     setTabAppearance( "Documents", cfg ); // No tr
 
     connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
 
     ((LauncherView*)stack->widget(0))->setFocus();
 
     categoryBar->show();
     stack->show();
 }
 
 void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
 {
     QString grp( "Tab %1" ); // No tr
     cfg.setGroup( grp.arg(id) );
     LauncherView *v = view( id );
     int idx = ids.findIndex( id );
     CategoryTab *tab = (CategoryTab *)categoryBar->tab( idx );
 
     // View
     QString view = cfg.readEntry( "View", "Icon" );
     if ( view == "List" ) // No tr
         v->setViewMode( LauncherView::List );
-    QString bgType = cfg.readEntry( "BackgroundType", "Ruled" );
+    QString bgType = cfg.readEntry( "BackgroundType", "Image" );
     if ( bgType == "Image" ) { // No tr
-        QString pm = cfg.readEntry( "BackgroundImage", "wallpaper/marble" );
+        QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
         v->setBackgroundType( LauncherView::Image, pm );
     } else if ( bgType == "SolidColor" ) {
         QString c = cfg.readEntry( "BackgroundColor" );
         v->setBackgroundType( LauncherView::SolidColor, c );
     }
     QString textCol = cfg.readEntry( "TextColor" );
     if ( textCol.isEmpty() )
         v->setTextColor( QColor() );
     else
         v->setTextColor( QColor(textCol) );
     QStringList font = cfg.readListEntry( "Font", ',' );
     if ( font.count() == 4 )
         v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
 
     // Tabs
     QString tabCol = cfg.readEntry( "TabColor" );
     if ( tabCol.isEmpty() )
         tab->bgColor = QColor();
     else
         tab->bgColor = QColor(tabCol);
     QString tabTextCol = cfg.readEntry( "TabTextColor" );
     if ( tabTextCol.isEmpty() )
         tab->fgColor = QColor();
     else
         tab->fgColor = QColor(tabTextCol);
 }
 
 void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs)
 {
     docview->populate( docFolder, QString::null );
     docFolder->detachChildren();
     docview->setFileSystems(fs);
     docview->updateTools();
 }
 
 void CategoryTabWidget::tabProperties()
 {
     LauncherView *view = (LauncherView*)stack->widget( categoryBar->currentTab() );
     QPopupMenu *m = new QPopupMenu( this );
     m->insertItem( tr("Icon View"), LauncherView::Icon );
     m->insertItem( tr("List View"), LauncherView::List );
     m->setItemChecked( (int)view->viewMode(), TRUE );
     int rv = m->exec( QCursor::pos() );
     if ( rv >= 0 && rv != view->viewMode() ) {
         view->setViewMode( (LauncherView::ViewMode)rv );
     }
 
     delete m;
 }
 
 QString CategoryTabWidget::getAllDocLinkInfo() const
 {
     return docview->getAllDocLinkInfo();
 }
 
 LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label )
 {
     LauncherView* view = new LauncherView( stack );
     connect( view, SIGNAL(clicked(const AppLnk*)),
             this, SIGNAL(clicked(const AppLnk*)));
     connect( view, SIGNAL(rightPressed(AppLnk*)),
             this, SIGNAL(rightPressed(AppLnk*)));
     ids.append(id);
     categoryBar->addTab( new CategoryTab( pm, label ) );
     stack->addWidget( view, tabs++ );
     return view;
 }
 
 void CategoryTabWidget::updateLink(const QString& linkfile)
 {
     int i=0;
     LauncherView* view;
     while ((view = (LauncherView*)stack->widget(i++))) {
         if ( view->removeLink(linkfile) )
             break;
     }
     addItem(linkfile);
     docview->updateTools();
 }
 
 void CategoryTabWidget::paletteChange( const QPalette &p )
 {
     QVBox::paletteChange( p );
     QPalette pal = palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
     categoryBar->update();
 }
 
 void CategoryTabWidget::setBusy(bool on)
 {
     if ( on )
         ((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
     else
         for (int i=0; i<tabs; i++)
             ((LauncherView*)stack->widget(i))->setBusy(FALSE);
 }
 
 LauncherView *CategoryTabWidget::view( const QString &id )
 {
     int idx = ids.findIndex( id );
     return (LauncherView *)stack->widget(idx);
 }
 
 //===========================================================================
 
 CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name )
     : QTabBar( parent, name )
 {
     setFocusPolicy( NoFocus );
     connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) );
 }
 
 CategoryTabBar::~CategoryTabBar()
 {
 }
 
 void CategoryTabBar::layoutTabs()
 {
     if ( !count() )
         return;
 
 //    int percentFalloffTable[] = { 100, 70, 40, 12, 6, 3, 1, 0 };
     int available = width()-1;
     QFontMetrics fm = fontMetrics();
     int hiddenTabWidth = -7;
     int middleTab = currentTab();
     int hframe, vframe, overlap;
     style().tabbarMetrics( this, hframe, vframe, overlap );
     int x = 0;
     QRect r;
     QTab *t;
     int required = 0;
     int eventabwidth = (width()-1)/count();
     enum Mode { HideBackText, Pack, Even } mode=Even;
     for ( int i = 0; i < count(); i++ ) {
         t = tab(i);
         int iw = fm.width( t->text() ) + hframe - overlap;
         if ( i != middleTab ) {
             available -= hiddenTabWidth + hframe - overlap;
             if ( t->iconSet() != 0 )
                 available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
         }
         if ( t->iconSet() != 0 )
             iw += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
         required += iw;
         // As space gets tight, packed looks better than even. "10" must be at least 0.
         if ( iw >= eventabwidth-10 )
             mode = Pack;
     }
     if ( mode == Pack && required > width()-1 )
         mode = HideBackText;
     for ( int i = 0; i < count(); i++ ) {
         t = tab(i);
         if ( mode != HideBackText ) {
             int w = fm.width( t->text() );
             int ih = 0;
             if ( t->iconSet() != 0 ) {
                 w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
                 ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
             }
             int h = QMAX( fm.height(), ih );
             h = QMAX( h, QApplication::globalStrut().height() );
 
             h += vframe;
             w += hframe;
 
             QRect tr(x, 0,
                 mode == Even ? eventabwidth : w * (width()-1)/required, h);
             t->setRect(tr);
             x += tr.width() - overlap;
             r = r.unite(tr);
         } else if ( i != middleTab ) {
             int w = hiddenTabWidth;
             int ih = 0;
             if ( t->iconSet() != 0 ) {
                 w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
                 ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
             }
             int h = QMAX( fm.height(), ih );
             h = QMAX( h, QApplication::globalStrut().height() );
 
             h += vframe;
             w += hframe;
 
             t->setRect( QRect(x, 0, w, h) );
             x += t->rect().width() - overlap;
             r = r.unite( t->rect() );
         } else {
             int ih = 0;
             if ( t->iconSet() != 0 ) {