-Make it compile

-apply Opie patches
-prepare BusyIndicator changes
-add QCOP method for showing the desktop and going to the next tab

3 files changed, 929 insertions, 1443 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index b612aa2..35d404a 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -18,26 +18,21 @@
 **
 **********************************************************************/
 
-// WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
-//      have this class.
-#define QTOPIA_INTERNAL_FSLP
-
-//#include <opie/ofiledialog.h>
-#include <opie/ofileselector.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
-#include <qpe/applnk.h>
-#include <qpe/config.h>
-#include <qpe/global.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/mimetype.h>
-#include <qpe/storage.h>
-#include <qpe/palmtoprecord.h>
-
-#include <qpe/version.h>
+#include <qtopia/global.h>
+#ifdef Q_WS_QWS
+#include <qtopia/qcopenvelope_qws.h>
+#endif
+#include <qtopia/resource.h>
+#include <qtopia/applnk.h>
+#include <qtopia/config.h>
+#include <qtopia/global.h>
+#include <qtopia/qpeapplication.h>
+#include <qtopia/mimetype.h>
+#include <qtopia/private/categories.h>
+#include <qtopia/custom.h>
 
 #include <qdir.h>
-#ifdef QWS
+#ifdef Q_WS_QWS
 #include <qwindowsystem_qws.h>
 #endif
 #include <qtimer.h>
@@ -57,342 +52,262 @@
 #include <qtextstream.h>
 #include <qpopupmenu.h>
 
-#include <opie/owait.h>
-
+#include "startmenu.h"
+#include "taskbar.h"
 
+#include "serverinterface.h"
 #include "launcherview.h"
 #include "launcher.h"
-#include "syncdialog.h"
-#include "desktop.h"
-#include <qpe/lnkproperties.h>
-//#include "mrulist.h"
-#include "qrsync.h"
+#include "server.h"
+
+#define QTOPIA_INTERNAL_FSLP
+#include <qtopia/lnkproperties.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <assert.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
+#include <unistd.h>
 #include <stdio.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #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;
-  }
+#ifdef Q_WS_QWS
+#include <qkeyboard_qws.h>
+#include <qpe/lnkproperties.h>
+#endif
 
-}
 
+static bool isVisibleWindow( int );
+//===========================================================================
+
+LauncherTabWidget::LauncherTabWidget( Launcher* parent ) :
+    QVBox( parent )
+{
+    docLoadingWidgetEnabled = false;
+    docLoadingWidget = 0;
+    docLoadingWidgetProgress = 0;
+    launcher = parent;
+    categoryBar = new LauncherTabBar( 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 );
+    stack = new QWidgetStack(this);
+    connect( categoryBar, SIGNAL(selected(int)), this, SLOT(raiseTabWidget()) );
+    categoryBar->show();
+    stack->show();
 
+#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
+    QCopChannel *channel = new QCopChannel( "QPE/Launcher", this );
+    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+             this, SLOT(launcherMessage(const QCString&, const QByteArray&)) );
+    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
+	     this, SLOT(appMessage(const QCString&, const QByteArray&)));
+#endif
 
-//#define SHOW_ALL
+    createDocLoadingWidget();
+}
 
-class CategoryTab : public QTab
+void LauncherTabWidget::createDocLoadingWidget()
 {
-public:
-    CategoryTab( const QIconSet &icon, const QString &text=QString::null )
-  : QTab( icon, text )
-    {
-    }
+    // Construct the 'doc loading widget' shown when finding documents
 
-    QColor bgColor;
-    QColor fgColor;
-};
+    // ### LauncherView class needs changing to be more generic so
+    // this widget can change its background similar to the iconviews
+    // so the background for this matches
+    docLoadingWidget = new LauncherView( stack );
+    docLoadingWidget->hideIcons();
+    QVBox *docLoadingVBox = new QVBox( docLoadingWidget );
 
-//===========================================================================
+    docLoadingVBox->setSpacing( 20 );
+    docLoadingVBox->setMargin( 10 );
 
-CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
-    QVBox( parent )
-{
-    categoryBar = 0;
-    stack = 0;
-}
+    QWidget *space1 = new QWidget( docLoadingVBox );
+    docLoadingVBox->setStretchFactor( space1, 1 );
 
-void CategoryTabWidget::prevTab()
-{
-    if ( categoryBar ) {
-  int n = categoryBar->count();
-  int tab = categoryBar->currentTab();
-  if ( tab >= 0 )
-            categoryBar->setCurrentTab( (tab - 1 + n)%n );
-    }
+    QLabel *waitPixmap = new QLabel( docLoadingVBox );
+    waitPixmap->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, waitPixmap->sizePolicy().hasHeightForWidth() ) );
+    waitPixmap->setPixmap( Resource::loadPixmap( "bigwait" ) );
+    waitPixmap->setAlignment( int( QLabel::AlignCenter ) );
+
+    QLabel *textLabel = new QLabel( docLoadingVBox );
+    textLabel->setText( tr( "<b>Finding Documents...</b>" ) );
+    textLabel->setAlignment( int( QLabel::AlignCenter ) );
+
+    docLoadingWidgetProgress = new QProgressBar( docLoadingVBox );
+    docLoadingWidgetProgress->setProgress( 0 );
+    docLoadingWidgetProgress->setCenterIndicator( TRUE );
+    docLoadingWidgetProgress->setBackgroundMode( NoBackground ); // No flicker
+    setProgressStyle();
+
+    QWidget *space2 = new QWidget( docLoadingVBox );
+    docLoadingVBox->setStretchFactor( space2, 1 );
+
+    Config cfg("Launcher");
+    cfg.setGroup( "Tab Documents" ); // No tr
+    setTabViewAppearance( docLoadingWidget, cfg );
+
+    stack->addWidget( docLoadingWidget, 0 );
 }
 
-void CategoryTabWidget::nextTab()
+void LauncherTabWidget::initLayout()
 {
-    if ( categoryBar ) {
-  int n = categoryBar->count();
-        int tab = categoryBar->currentTab();
-  categoryBar->setCurrentTab( (tab + 1)%n );
-    }
+    layout()->activate();
+    docView()->setFocus();
+    categoryBar->showTab("Documents");
 }
 
-
-void CategoryTabWidget::showTab(const QString& id)
+void LauncherTabWidget::appMessage(const QCString& message, const QByteArray&)
 {
-    if ( categoryBar ) {
-  int idx = ids.findIndex( id );
-  categoryBar->setCurrentTab( idx );
-    }
+    if ( message == "nextView()" )
+	categoryBar->nextTab();
 }
 
-void CategoryTabWidget::addItem( const QString& linkfile )
+void LauncherTabWidget::raiseTabWidget()
 {
-//     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()");
+    if ( categoryBar->currentView() == docView()
+	 && docLoadingWidgetEnabled ) {
+	stack->raiseWidget( docLoadingWidget );
+	docLoadingWidget->updateGeometry();
+    } else {
+	stack->raiseWidget( categoryBar->currentView() );
+    }
 }
 
-void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
- AppLnkSet* /*docFolder*/, const QList<FileSystem> & /*fs*/)
+void LauncherTabWidget::tabProperties()
 {
-   QString current;
-    if ( categoryBar ) {
-        int c = categoryBar->currentTab();
-        if ( c >= 0 ) current = ids[c];
+    LauncherView *view = categoryBar->currentView();
+    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 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");
+    delete m;
+}
 
-    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;
+void LauncherTabWidget::deleteView( const QString& id )
+{
+    LauncherTab *t = categoryBar->launcherTab(id);
+    if ( t ) {
+	stack->removeWidget( t->view );
+	delete t->view;
+	categoryBar->removeTab( t );
     }
-    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() );
-
-    //ljpotter
-     CategoryTab *catTab ;
-     catTab = new CategoryTab( pm, "Documents" );
-        
-     categoryBar->addTab( catTab );
-
-     fileSel = new DocumentTab( stack, 4, 0, "/","");
-     stack->addWidget( fileSel, tabs++ );
+}
 
-     //     fileSel->hide();     
+LauncherView* LauncherTabWidget::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*)));
 
-     connect( fileSel, SIGNAL( fileSelected( const DocLnk & )),
-              this, SLOT(clickie(const DocLnk&)) );
-        
-//       connect( fileSel, SIGNAL( fileSelected( const QString & )),
-//                this, SLOT(clickie(const QString&)) );
+    int n = categoryBar->count();
+    stack->addWidget( view, n );
 
-     connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
+    LauncherTab *tab = new LauncherTab( id, view, pm, label );
+    categoryBar->insertTab( tab, n-1 );
 
-    ((LauncherView*)stack->widget(0))->setFocus();
+    if ( id == "Documents" )
+	docview = view;
 
-    cfg. setGroup ( "GUI" );
-    setBusyIndicatorType ( cfg. readEntry ( "BusyType", QString::null ));
+    qDebug("inserting %s at %d", id.latin1(), n-1 );
 
-    if ( !current.isNull() ) {
-        showTab(current);
-    }
+    Config cfg("Launcher");
+    setTabAppearance( tab, cfg );
 
-    categoryBar->show();
-    stack->show();
+    cfg.setGroup( "GUI" );
+    view->setBusyIndicatorType( cfg.readEntry( "BusyType", QString::null ) );
 
+    return view;
+}
 
-    QCopEnvelope e("QPE/TaskBar","reloadApps()");
+LauncherView *LauncherTabWidget::view( const QString &id )
+{
+    LauncherTab *t = categoryBar->launcherTab(id);
+    if ( !t )
+	return 0;
+    return t->view;
 }
 
-void CategoryTabWidget::clickie(const DocLnk &lnk) {
-   lnk.execute();
-   //   fileSel->reparse();
+LauncherView *LauncherTabWidget::docView()
+{
+    return docview;
 }
 
-void CategoryTabWidget::clickie(const QString &appStr) {
-//     DocLnk lnk(appStr);
-//     lnk.execute();
+void LauncherTabWidget::setLoadingWidgetEnabled( bool v )
+{
+    if ( v != docLoadingWidgetEnabled && docLoadingWidget ) {
+	docLoadingWidgetEnabled = v;
+	raiseTabWidget();
+    }
 }
 
-void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
+void LauncherTabWidget::setLoadingProgress( int percent )
 {
-    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 );
+    docLoadingWidgetProgress->setProgress( (percent / 4) * 4 );
+}
 
+// ### this function could more to LauncherView
+void LauncherTabWidget::setTabViewAppearance( LauncherView *v, Config &cfg )
+{
     // View
     QString view = cfg.readEntry( "View", "Icon" );
     if ( view == "List" ) // No tr
-  v->setViewMode( LauncherView::List );
+	v->setViewMode( LauncherView::List );
     QString bgType = cfg.readEntry( "BackgroundType", "Image" );
     if ( bgType == "Image" ) { // No tr
-  QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
-  v->setBackgroundType( LauncherView::Image, pm );
+	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 c = cfg.readEntry( "BackgroundColor" );
+	v->setBackgroundType( LauncherView::SolidColor, c );
+    } else {
+	v->setBackgroundType( LauncherView::Ruled, QString::null );
     }
     QString textCol = cfg.readEntry( "TextColor" );
     if ( textCol.isEmpty() )
-  v->setTextColor( QColor() );
+	v->setTextColor( QColor() );
     else
-  v->setTextColor( QColor(textCol) );
+	v->setTextColor( QColor(textCol) );
+//    bool customFont = cfg.readBoolEntry( "CustomFont", FALSE );
+
+
     QStringList font = cfg.readListEntry( "Font", ',' );
     if ( font.count() == 4 )
-  v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
+        v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
+
+    // ### FIXME TabColor TabTextColor
+
+}
+
+// ### Could move to LauncherTab
+void LauncherTabWidget::setTabAppearance( LauncherTab *tab, Config &cfg )
+{
+    cfg.setGroup( QString( "Tab %1" ).arg(tab->type) ); // No tr
+
+    setTabViewAppearance( tab->view, cfg );
 
     // Tabs
     QString tabCol = cfg.readEntry( "TabColor" );
     if ( tabCol.isEmpty() )
-  tab->bgColor = QColor();
+	tab->bgColor = QColor();
     else
-  tab->bgColor = QColor(tabCol);
+	tab->bgColor = QColor(tabCol);
     QString tabTextCol = cfg.readEntry( "TabTextColor" );
     if ( tabTextCol.isEmpty() )
-  tab->fgColor = QColor();
+	tab->fgColor = QColor();
     else
-  tab->fgColor = QColor(tabTextCol);
+	tab->fgColor = QColor(tabTextCol);
 }
 
-//void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
-//{
-   //     docFolder->detachChildren();
-//}
-
-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 "";
-}
-
-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;
-    //qApp->processEvents();
-    while ((view = (LauncherView*)stack->widget(i++))) {
-	if ( view->removeLink(linkfile) )
-	    break;
-    }
-    addItem(linkfile);
-    docview->updateTools();
-}
-
-void CategoryTabWidget::paletteChange( const QPalette &p )
+void LauncherTabWidget::paletteChange( const QPalette &p )
 {
     QVBox::paletteChange( p );
     QPalette pal = palette();
@@ -402,486 +317,236 @@ void CategoryTabWidget::paletteChange( const QPalette &p )
     categoryBar->update();
 }
 
-void CategoryTabWidget::setBusy(bool on)
+void LauncherTabWidget::styleChange( QStyle & )
 {
-    if ( on )
-  ((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
-    else
-  for (int i=0; i<tabs-1; i++)
-      ((LauncherView*)stack->widget(i))->setBusy(FALSE);
+    QTimer::singleShot( 0, this, SLOT(setProgressStyle()) );
 }
 
-LauncherView *CategoryTabWidget::view( const QString &id )
+void LauncherTabWidget::setProgressStyle()
 {
-    int idx = ids.findIndex( id );
-    return (LauncherView *)stack->widget(idx);
+    if (docLoadingWidgetProgress) {
+	docLoadingWidgetProgress->setFrameShape( QProgressBar::Box );
+	docLoadingWidgetProgress->setFrameShadow( QProgressBar::Plain );
+	docLoadingWidgetProgress->setMargin( 1 );
+	docLoadingWidgetProgress->setLineWidth( 1 );
+    }
 }
 
-void CategoryTabWidget::setBusyIndicatorType ( const QString &type )
+void LauncherTabWidget::setBusy(bool on)
 {
-  for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it )
-    view ( *it )-> setBusyIndicatorType ( type );
+    if ( on )
+	currentView()->setBusy(TRUE);
+    else {
+	for ( int i = 0; i < categoryBar->count(); i++ ) {
+	    LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view;
+	    view->setBusy( FALSE );
+	}
+    }
 }
 
-//===========================================================================
-
-CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name )
-    : QTabBar( parent, name )
-{
-    setFocusPolicy( NoFocus );
-    connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) );
+void LauncherTabWidget::setBusyIndicatorType( const QString& str ) {
+    for (int i = 0; i < categoryBar->count(); i++ ) {
+        LauncherView* view = static_cast<LauncherTab*>( categoryBar->tab(i) )->view;
+        view->setBusyIndicatorType( str );
+    }
 }
 
-CategoryTabBar::~CategoryTabBar()
+LauncherView *LauncherTabWidget::currentView(void)
 {
+    return (LauncherView*)stack->visibleWidget();
 }
 
-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 ) {
-    ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
-      }
-      int h = QMAX( fm.height(), ih );
-      h = QMAX( h, QApplication::globalStrut().height() );
-
-      h += vframe;
-
-      t->setRect( QRect(x, 0, available, h) );
-      x += t->rect().width() - overlap;
-      r = r.unite( t->rect() );
-  }
-    }
-
-    QRect rr = tab(count()-1)->rect();
-    rr.setRight(width()-1);
-    tab(count()-1)->setRect( rr );
 
-    for ( t = tabList()->first(); t; t = tabList()->next() ) {
-       QRect tr = t->rect();
-       tr.setHeight( r.height() );
-       t->setRect( tr );
-    }
 
-    update();
-}
-
-
-void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
+void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray &data)
 {
-    CategoryTabBar *that = (CategoryTabBar *) this;
-    CategoryTab *ct = (CategoryTab *)t;
-    QPalette pal = palette();
-    bool setPal = FALSE;
-    if ( ct->bgColor.isValid() ) {
-  pal.setColor( QPalette::Active, QColorGroup::Background, ct->bgColor );
-  pal.setColor( QPalette::Active, QColorGroup::Button, ct->bgColor );
-  pal.setColor( QPalette::Inactive, QColorGroup::Background, ct->bgColor );
-  pal.setColor( QPalette::Inactive, QColorGroup::Button, ct->bgColor );
-  that->setUpdatesEnabled( FALSE );
-  that->setPalette( pal );
-  setPal = TRUE;
-    }
-#if QT_VERSION >= 300
-    QStyle::SFlags flags = QStyle::Style_Default;
-    if ( selected )
-        flags |= QStyle::Style_Selected;
-    style().drawControl( QStyle::CE_TabBarTab, p, this, t->rect(),
-                         colorGroup(), flags, QStyleOption(t) );
-#else
-    style().drawTab( p, this, t, selected );
-#endif
-
-    QRect r( t->rect() );
-    QFont f( font() );
-    if ( selected )
-  f.setBold( TRUE );
-    p->setFont( f );
-
-    if ( ct->fgColor.isValid() ) {
-  pal.setColor( QPalette::Active, QColorGroup::Foreground, ct->fgColor );
-  pal.setColor( QPalette::Inactive, QColorGroup::Foreground, ct->fgColor );
-  that->setUpdatesEnabled( FALSE );
-  that->setPalette( pal );
-  setPal = TRUE;
-    }
-    int iw = 0;
-    int ih = 0;
-    if ( t->iconSet() != 0 ) {
-  iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
-  ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
-    }
-    int w = iw + p->fontMetrics().width( t->text() ) + 4;
-    int h = QMAX(p->fontMetrics().height() + 4, ih );
-    paintLabel( p, QRect( r.left() + (r.width()-w)/2 - 3,
-        r.top() + (r.height()-h)/2, w, h ), t,
-#if QT_VERSION >= 300
-          t->identifier() == keyboardFocusTab()
-#else
-          t->identitifer() == keyboardFocusTab()
-#endif
-    );
-    if ( setPal ) {
-  that->unsetPalette();
-  that->setUpdatesEnabled( TRUE );
+    QDataStream stream( data, IO_ReadOnly );
+    if ( msg == "setTabView(QString,int)" ) {
+	QString id;
+	stream >> id;
+	int mode;
+	stream >> mode;
+	if ( view(id) )
+	    view(id)->setViewMode( (LauncherView::ViewMode)mode );
+    } else if ( msg == "setTabBackground(QString,int,QString)" ) {
+	QString id;
+	stream >> id;
+	int mode;
+	stream >> mode;
+	QString pixmapOrColor;
+	stream >> pixmapOrColor;
+	if ( view(id) )
+	    view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
+	if ( id == "Documents" )
+	    docLoadingWidget->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
+    } else if ( msg == "setTextColor(QString,QString)" ) {
+	QString id;
+	stream >> id;
+	QString color;
+	stream >> color;
+	if ( view(id) )
+	    view(id)->setTextColor( QColor(color) );
+	if ( id == "Documents" )
+	    docLoadingWidget->setTextColor( QColor(color) );
+    } else if ( msg == "setFont(QString,QString,int,int,int)" ) {
+	QString id;
+	stream >> id;
+	QString fam;
+	stream >> fam;
+	int size;
+	stream >> size;
+	int weight;
+	stream >> weight;
+	int italic;
+	stream >> italic;
+	if ( view(id) ) {
+	    if ( !fam.isEmpty() ) {
+		view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+		qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
+	    } else {
+		view(id)->clearViewFont();
+	    }
+	}
+    }else if ( msg == "setBusyIndicatorType(QString)" ) {
+        QString type;
+        stream >> type;
+        setBusyIndicatorType( type );
+    }else if ( msg == "home()" ) {
+        if ( isVisibleWindow( static_cast<QWidget*>(parent())->winId() ) ) {
+            if (categoryBar)
+                categoryBar->nextTab();
+        }else
+            static_cast<QWidget*>(parent())->raise();
     }
 }
 
 
-void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
-        QTab* t, bool has_focus ) const
-{
-    QRect r = t->rect();
-    //    if ( t->id != currentTab() )
-    //r.moveBy( 1, 1 );
-    //
-    if ( t->iconSet() ) {
-  // the tab has an iconset, draw it in the right mode
-  QIconSet::Mode mode = (t->isEnabled() && isEnabled()) ? QIconSet::Normal : QIconSet::Disabled;
-  if ( mode == QIconSet::Normal && has_focus )
-      mode = QIconSet::Active;
-  QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
-  int pixw = pixmap.width();
-  int pixh = pixmap.height();
-  p->drawPixmap( r.left() + 6, r.center().y() - pixh / 2 + 1, pixmap );
-  r.setLeft( r.left() + pixw + 5 );
-    }
-
-    QRect tr = r;
 
-    if ( r.width() < 20 )
-  return;
+//---------------------------------------------------------------------------
 
-    if ( t->isEnabled() && isEnabled()  ) {
-#if defined(_WS_WIN32_)
-  if ( colorGroup().brush( QColorGroup::Button ) == colorGroup().brush( QColorGroup::Background ) )
-      p->setPen( colorGroup().buttonText() );
-  else
-      p->setPen( colorGroup().foreground() );
-#else
-  p->setPen( colorGroup().foreground() );
-#endif
-  p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
-    } else {
-  p->setPen( palette().disabled().foreground() );
-  p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
-    }
+Launcher::Launcher()
+    : QMainWindow( 0, "PDA User Interface", QWidget::WStyle_Customize | QWidget::WGroupLeader )
+{
+    tabs = 0;
+    tb = 0;
 }
 
-//---------------------------------------------------------------------------
-
-Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
-    : QMainWindow( parent, name, fl )
+void Launcher::createGUI()
 {
     setCaption( tr("Launcher") );
 
-    syncDialog = 0;
-
     // we have a pretty good idea how big we'll be
     setGeometry( 0, 0, qApp->desktop()->width(), qApp->desktop()->height() );
 
-    tabs = 0;
-    rootFolder = 0;
-    docsFolder = 0;
+    tb = new TaskBar;
+    tabs = new LauncherTabWidget( this );
+    setCentralWidget( tabs );
 
-    int stamp = uidgen.generate(); // this is our timestamp to see which devices we know
-    //uidgen.store( stamp );
-    m_timeStamp = QString::number( stamp  );
+    ServerInterface::dockWidget( tb, ServerInterface::Bottom );
+    tb->show();
 
-    tabs = new CategoryTabWidget( this );
-    setCentralWidget( tabs );
+    qApp->installEventFilter( this );
 
+
+    connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) );
+    connect( qApp, SIGNAL(numLockStateToggle()), this, SLOT(toggleNumLockState()) );
+    connect( qApp, SIGNAL(capsLockStateToggle()), this, SLOT(toggleCapsLockState()) );
+
+    connect( tb, SIGNAL(tabSelected(const QString&)),
+	this, SLOT(showTab(const QString&)) );
     connect( tabs, SIGNAL(selected(const QString&)),
-  this, SLOT(viewSelected(const QString&)) );
+	this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
-  this, SLOT(select(const AppLnk*)));
+	this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
-  this, SLOT(properties(AppLnk*)));
+	this, SLOT(properties(AppLnk*)));
 
-
-#if !defined(QT_NO_COP)
+#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
              this, SLOT(systemMessage( const QCString &, const QByteArray &)) );
-    QCopChannel *channel = new QCopChannel( "QPE/Launcher", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(launcherMessage(const QCString&, const QByteArray&)) );
 #endif
 
-    storage = new StorageInfo( this );
-    connect( storage, SIGNAL( disksChanged() ), SLOT( storageChanged() ) );
-
-    updateTabs();
+    // all documents
+    QImage img( Resource::loadImage( "DocsIcon" ) );
+    QPixmap pm;
+    pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
+    // It could add this itself if it handles docs
+    tabs->newView("Documents", pm, tr("Documents") )->setToolsEnabled( TRUE );
+    QTimer::singleShot( 0, tabs, SLOT( initLayout() ) );
 
-    preloadApps();
+    qApp->setMainWidget( this );
 
-    in_lnk_props = FALSE;
-    got_lnk_change = FALSE;
+    QTimer::singleShot( 500, this, SLOT( makeVisible() ) );
 }
 
 Launcher::~Launcher()
 {
-    delete rootFolder;
-    delete docsFolder;
-}
-
-static bool isVisibleWindow(int wid)
-{
-#ifdef QWS
-    const QList<QWSWindow> &list = qwsServer->clientWindows();
-    QWSWindow* w;
-    for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
-  if ( w->winId() == wid )
-      return !w->isFullyObscured();
-    }
-#endif
-    return FALSE;
+    if ( tb )
+	destroyGUI();
 }
 
-void Launcher::showMaximized()
+void Launcher::makeVisible()
 {
-    if ( isVisibleWindow( winId() ) )
-  doMaximize();
-    else
-  QTimer::singleShot( 20, this, SLOT(doMaximize()) );
+    showMaximized();
 }
 
-void Launcher::doMaximize()
+void Launcher::destroyGUI()
 {
-    QMainWindow::showMaximized();
-    tabs->setMaximumWidth( qApp->desktop()->width() );
+    delete tb;
+    tb = 0;
+    delete tabs;
+    tabs =0;
 }
 
-void Launcher::updateMimeTypes()
+bool Launcher::eventFilter( QObject*, QEvent *ev )
 {
-    MimeType::clear();
-    updateMimeTypes(rootFolder);
+#ifdef QT_QWS_CUSTOM
+    if ( ev->type() == QEvent::KeyPress ) {
+	QKeyEvent *ke = (QKeyEvent *)ev;
+	if ( ke->key() == Qt::Key_F11 ) { // menu key
+	    QWidget *active = qApp->activeWindow();
+	    if ( active && active->isPopup() )
+		active->close();
+	    else {
+		Global::terminateBuiltin("calibrate"); // No tr
+		tb->launchStartMenu();
+	    }
+	    return TRUE;
+	}
+    }
+#else
+    Q_UNUSED(ev);
+#endif
+    return FALSE;
 }
 
-void Launcher::updateMimeTypes(AppLnkSet* folder)
+void Launcher::toggleSymbolInput()
 {
-    for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
-  AppLnk *app = it.current();
-  if ( app->type() == "Folder" ) // No tr
-      updateMimeTypes((AppLnkSet *)app);
-  else {
-      MimeType::registerApp(*app);
-  }
-    }
+    tb->toggleSymbolInput();
 }
 
-/** This is a HACK....
- * Reason: scanning huge mediums, microdirvers for examples
- * consomes time. To avoid that we invented the MediumMountCheck
- *
- * a) the user globally disabled medium checking. We can ignore
- *    all removable medium
- * b) the user enabled medium checking globally and we need to use this mimefilter
- * c) the user enabled medium checking on a per medium bases
- *  c1) we already checked and its not ask again turns
- *  c2) we need to ask and then apply the mimefilter
- */
-void Launcher::loadDocs() // ok here comes a hack belonging to Global::
+void Launcher::toggleNumLockState()
 {
-   OWait *owait = new OWait();
-   Global::statusMessage( tr( "Finding documents" ) );
-
-   owait->show();
-   qApp->processEvents();
-   if(docsFolder) delete docsFolder;
-   docsFolder = new DocLnkSet;
-   DocLnkSet *tmp = 0;
-   QString home = QString(getenv("HOME"))  + "/Documents";
-   tmp = new DocLnkSet( home , QString::null);
-   docsFolder->appendFrom( *tmp );
-   delete tmp;
-
-   // RAM documents
-   StorageInfo storage;
-   const QList<FileSystem> &fileSystems = storage.fileSystems();
-   QListIterator<FileSystem> it ( fileSystems );
-
-   for ( ; it.current(); ++it ) {
-      if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
-         tmp = new DocLnkSet( (*it)->path(), QString::null );
-         docsFolder->appendFrom( *tmp );
-         delete tmp;
-      }
-   }
-
-   Config mediumCfg( "medium");
-   mediumCfg.setGroup("main");
-   // a) -zecke we don't want to check
-   if(!mediumCfg.readBoolEntry("use", true ) ) {
-      owait->hide();
-      delete owait;
-      return;
-   }
-   // find out wich filesystems are new in this round
-   // We will do this by having a timestamp inside each mountpoint
-   // if the current timestamp doesn't match this is a new file system and
-   // come up with our MediumMountGui :) let the hacking begin
-   int stamp = uidgen.generate();
-
-   QString newStamp = QString::number( stamp ); // generates newtime Stamp
-
-   // b)
-   if( mediumCfg.readBoolEntry("global", true ) ){
-      QString mime = configToMime(&mediumCfg).join(";");
-      for( it.toFirst(); it.current(); ++it ){
-         if( (*it)->isRemovable() ){
-            tmp = new DocLnkSet( (*it)->path(), mime );
-            docsFolder->appendFrom( *tmp );
-            delete tmp;
-         }
-      } // done
-      owait->hide();
-      delete owait;
-      return; // save the else
-   }
-   // c) zecke
-   for ( it.toFirst(); it.current(); ++it ) {
-      if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
-         Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File);
-         cfg.setGroup("main");
-         QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
-         /** This medium is uptodate
-          */
-         if( stamp == m_timeStamp ){ // ok we know this card
-            cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp
-            // we need to scan the list now. Hopefully the cache will be there
-            // read the mimetypes from the config and search for documents
-            QStringList mimetypes = configToMime( &cfg);
-            //qApp->processEvents();
-            Global::statusMessage( tr( "Searching documents" ) );
-            tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";")  );
-            docsFolder->appendFrom( *tmp );
-            delete tmp;
-
-         } else { // come up with the gui cause this a new card
-            MediumMountGui medium(&cfg, (*it)->path() );
-            if( medium.check() ){ // we did not ask before or ask again is off
-               /** c2) */
-               if( medium.exec()  ){ // he clicked yes so search it
-                  // speicher
-                  //cfg.read(); // cause of a race we need to reread - fixed
-                  cfg.setGroup("main");
-                  cfg.writeEntry("timestamp", newStamp );
-                  cfg.write();
-
-                  //qApp->processEvents();
-                  tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) );
-                  docsFolder->appendFrom( *tmp );
-                  delete tmp;
-               }// no else
-               /** c1) */
-            } else { // we checked
-               // do something different see what we need to do
-               // let's see if we should check the device
-               cfg.setGroup("main" );
-               bool check = cfg.readBoolEntry("autocheck", true );
-               if( check ){ // find the documents
-
-                  //qApp->processEvents();
-                  Global::statusMessage( tr( "Searching documents" ) );
-                  tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
-                  docsFolder->appendFrom( *tmp );
-                  delete tmp;
-               }
-            }
-         }
-      }
-   }
-   m_timeStamp = newStamp;
-   owait->hide();
-   delete owait;
+    tb->toggleNumLockState();
 }
 
-void Launcher::updateTabs()
+void Launcher::toggleCapsLockState()
 {
-    MimeType::updateApplications(); // ### reads all applnks twice
-    delete rootFolder;
-    rootFolder = new AppLnkSet( MimeType::appsFolderName() );
-
-    loadDocs();
-
-    tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems());
+    tb->toggleCapsLockState();
 }
 
-void Launcher::updateDocs()
+static bool isVisibleWindow(int wid)
 {
-     loadDocs();
-     //    tabs->updateDocs(docsFolder,storage->fileSystems());
+#ifdef Q_WS_QWS
+    const QList<QWSWindow> &list = qwsServer->clientWindows();
+    QWSWindow* w;
+    for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
+	if ( w->winId() == wid )
+	    return !w->isFullyObscured();
+    }
+#endif
+    return FALSE;
 }
 
 void Launcher::viewSelected(const QString& s)
@@ -889,468 +554,204 @@ void Launcher::viewSelected(const QString& s)
     setCaption( s + tr(" - Launcher") );
 }
 
-void Launcher::nextView()
-{
-    tabs->nextTab();
-}
-
 void Launcher::showTab(const QString& id)
 {
-    tabs->showTab(id);
+    tabs->categoryBar->showTab(id);
     raise();
 }
 
 void Launcher::select( const AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) { // No tr
-  // Not supported: flat is simpler for the user
+	// Not supported: flat is simpler for the user
     } else {
-  if ( appLnk->exec().isNull() ) {
-      QMessageBox::information(this,tr("No application"),
-    tr("<p>No application is defined for this document."
-    "<p>Type is %1.").arg(appLnk->type()));
-      return;
-  }
-  tabs->setBusy(TRUE);
-  emit executing( appLnk );
-  appLnk->execute();
+	if ( appLnk->exec().isNull() ) {
+	    int i = QMessageBox::information(this,tr("No application"),
+		tr("<p>No application is defined for this document."
+		"<p>Type is %1.").arg(appLnk->type()), tr("OK"), tr("View as text"), 0, 0, 1);
+
+#if 0
+            /* ### Fixme */
+	    if ( i == 1 )
+		Global::execute(Service::app("Open/text/*"),appLnk->file());
+#endif
+	    return;
+	}
+	tabs->setBusy(TRUE);
+	emit executing( appLnk );
+	appLnk->execute();
     }
 }
 
-void Launcher::externalSelected(const AppLnk *appLnk)
-{
-    tabs->setBusy(TRUE);
-    emit executing( appLnk );
-}
-
 void Launcher::properties( AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) { // No tr
-  // Not supported: flat is simpler for the user
+	// Not supported: flat is simpler for the user
     } else {
-  in_lnk_props = TRUE;
-  got_lnk_change = FALSE;
-  LnkProperties prop(appLnk);
-  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
-  prop.showMaximized();
-  prop.exec();
-  in_lnk_props = FALSE;
-  if ( got_lnk_change ) {
-      updateLink(lnk_change);
-  }
+/* ### libqtopia FIXME also moving docLnks... */
+	LnkProperties prop(appLnk,0 );
+
+	prop.showMaximized();
+	prop.exec();
     }
 }
 
-void Launcher::updateLink(const QString& link)
+void Launcher::storageChanged( const QList<FileSystem> &fs )
 {
-    bool notify_sm = false;
-
-    if (link.isNull()) {
-  updateTabs();
-  notify_sm = true;
-    }
-    else if (link.isEmpty()) {
-  updateDocs();
-    }
-    else {
-  tabs->updateLink(link);
-  notify_sm = true;
-    }
-
-    if ( notify_sm )
-      QCopEnvelope e ( "QPE/TaskBar", "reloadApps()" );
+    // ### update combo boxes if we had a combo box for the storage type
 }
 
 void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 {
- QDataStream stream( data, IO_ReadOnly );
-    if ( msg == "linkChanged(QString)" ) {
-       QString link;
-  stream >> link;
-  if ( in_lnk_props ) {
-      got_lnk_change = TRUE;
-      lnk_change = link;
-  } else {
-      updateLink(link);
-  }
-    } else if ( msg == "busy()" ) {
-  emit busy();
+    QDataStream stream( data, IO_ReadOnly );
+    if ( msg == "busy()" ) {
+	tb->startWait();
     } else if ( msg == "notBusy(QString)" ) {
-  QString app;
-  stream >> app;
-  tabs->setBusy(FALSE);
-  emit notBusy(app);
-    } else if ( msg == "mkdir(QString)" ) {
-  QString dir;
-  stream >> dir;
-  if ( !dir.isEmpty() )
-      mkdir( dir );
-    } else if ( msg == "rdiffGenSig(QString,QString)" ) {
-  QString baseFile, sigFile;
-  stream >> baseFile >> sigFile;
-  QRsync::generateSignature( baseFile, sigFile );
-    } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) {
-  QString baseFile, sigFile, deltaFile;
-  stream >> baseFile >> sigFile >> deltaFile;
-  QRsync::generateDiff( baseFile, sigFile, deltaFile );
-    } else if ( msg == "rdiffApplyPatch(QString,QString)" ) {
-  QString baseFile, deltaFile;
-  stream >> baseFile >> deltaFile;
-  if ( !QFile::exists( baseFile ) ) {
-      QFile f( baseFile );
-      f.open( IO_WriteOnly );
-      f.close();
-  }
-  QRsync::applyDiff( baseFile, deltaFile );
-#ifndef QT_NO_COP
-  QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
-  e << baseFile;
-#endif
-    } else if ( msg == "rdiffCleanup()" ) {
-  mkdir( "/tmp/rdiff" );
-  QDir dir;
-  dir.setPath( "/tmp/rdiff" );
-  QStringList entries = dir.entryList();
-  for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
-      dir.remove( *it );
-    } else if ( msg == "sendHandshakeInfo()" ) {
-  QString home = getenv( "HOME" );
-#ifndef QT_NO_COP
-  QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
-  e << home;
-  int locked = (int) Desktop::screenLocked();
-  e << locked;
-#endif
-    } else if ( msg == "autoStart(QString)" ) {
-        QString appName;
-        stream >> appName;
-        Config cfg( "autostart" );
-        cfg.setGroup( "AutoStart" );
-        if ( appName.compare("clear") == 0){
-            cfg.writeEntry("Apps", "");
-        }
-    } else if ( msg == "autoStart(QString,QString)" ) {
-        QString modifier, appName;
-        stream >> modifier >> appName;
-        Config cfg( "autostart" );
-        cfg.setGroup( "AutoStart" );
-        if ( modifier.compare("add") == 0 ){
-            // only add if appname is entered
-            if (!appName.isEmpty()) {
-                cfg.writeEntry("Apps", appName);
-            }
-        } else if (modifier.compare("remove") == 0 ) {
-            // need to change for multiple entries
-            // actually remove is right now simular to clear, but in future there
-            // should be multiple apps in autostart possible.
-            QString checkName;
-            checkName = cfg.readEntry("Apps", "");
-            if (checkName == appName) {
-                cfg.writeEntry("Apps", "");
-            }
-        }
-        // case the autostart feature should be delayed
-    } else if ( msg == "autoStart(QString,QString,QString)") {
-         QString modifier, appName, delay;
-         stream >> modifier >> appName >> delay;
-        Config cfg( "autostart" );
-        cfg.setGroup( "AutoStart" );
-        if ( modifier.compare("add") == 0 ){
-            // only add it appname is entered
-            if (!appName.isEmpty()) {
-                cfg.writeEntry("Apps", appName);
-                cfg.writeEntry("Delay", delay);
-            }
-        } else {
-        }
+	QString app;
+	stream >> app;
+	tabs->setBusy(FALSE);
+	tb->stopWait(app);
+    } else if (msg == "applyStyle()") {
+	tabs->currentView()->relayout();
     }
-    /*
-     * QtopiaDesktop relies on the major number
-     * to start with 1. We're at 0.9
-     * so wee need to fake at least 1.4 to be able
-     * to sync with QtopiaDesktop1.6
-     */
-    else if ( msg == "sendVersionInfo()" ) {
-  QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" );
-  QString v2 = QString::fromLatin1("1.4");
-  e << v2;
-  //qDebug("version %s\n", line.latin1());
-    } else if ( msg == "sendCardInfo()" ) {
-#ifndef QT_NO_COP
-  QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
-#endif
-  const QList<FileSystem> &fs = storage->fileSystems();
-  QListIterator<FileSystem> it ( fs );
-  QString s;
-  QString homeDir = getenv("HOME");
-  QString hardDiskHome, hardDiskHomePath;
-  for ( ; it.current(); ++it ) {
-      int k4 = (*it)->blockSize()/256;
-      if ( (*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs") {
-    s += (*it)->name() + "=" + (*it)->path() + "/Documents "
-         + QString::number( (*it)->availBlocks() * k4/4 )
-         + "K " + (*it)->options() + ";";
-      } else if ( (*it)->disk() == "/dev/mtdblock1" ||
-          (*it)->disk() == "/dev/mtdblock/1" ) {
-    s += (*it)->name() + "=" + homeDir + "/Documents "
-         + QString::number( (*it)->availBlocks() * k4/4 )
-         + "K " + (*it)->options() + ";";
-      } else if ( (*it)->name().contains( "Hard Disk") &&
-          homeDir.contains( (*it)->path() ) &&
-          (*it)->path().length() > hardDiskHomePath.length() ) {
-    hardDiskHomePath = (*it)->path();
-    hardDiskHome =
-        (*it)->name() + "=" + homeDir + "/Documents "
-        + QString::number( (*it)->availBlocks() * k4/4 )
-        + "K " + (*it)->options() + ";";
-      }
-  }
-  if ( !hardDiskHome.isEmpty() )
-      s += hardDiskHome;
-
-#ifndef QT_NO_COP
-  e << s;
-#endif
-    } else if ( msg == "sendSyncDate(QString)" ) {
-  QString app;
-  stream >> app;
-  Config cfg( "qpe" );
-  cfg.setGroup("SyncDate");
-#ifndef QT_NO_COP
-  QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" );
-  e  << app  << cfg.readEntry( app );
-#endif
-  //qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(),
-  //cfg.readEntry( app ).latin1() );
-    } else if ( msg == "setSyncDate(QString,QString)" ) {
-  QString app, date;
-  stream >> app >> date;
-  Config cfg( "qpe" );
-  cfg.setGroup("SyncDate");
-  cfg.writeEntry( app, date );
-  //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1());
-    } else if ( msg == "startSync(QString)" ) {
-  QString what;
-  stream >> what;
-  delete syncDialog; syncDialog = 0;
-  syncDialog = new SyncDialog( this, "syncProgress", FALSE,
-             WStyle_Tool | WStyle_Customize |
-             Qt::WStyle_StaysOnTop );
-  syncDialog->showMaximized();
-  syncDialog->whatLabel->setText( "<b>" + what + "</b>" );
-  connect( syncDialog->buttonCancel, SIGNAL( clicked() ),
-     SLOT( cancelSync() ) );
-    } else if ( msg == "stopSync()") {
-  delete syncDialog; syncDialog = 0;
-    } else if ( msg == "getAllDocLinks()" ) {
-  loadDocs();
-
-                // directly show updated docs in document tab
-                updateDocs();
-
-                QString contents;
-
-//  Categories cats;
-  for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
-      DocLnk *doc = it.current();
-      QFileInfo fi( doc->file() );
-      if ( !fi.exists() )
-    continue;
-
-      bool fake = !doc->linkFileKnown();
-      if ( !fake ) {
-    QFile f( doc->linkFile() );
-    if ( f.open( IO_ReadOnly ) ) {
-        QTextStream ts( &f );
-        ts.setEncoding( QTextStream::UnicodeUTF8 );
-        contents += ts.read();
-        f.close();
-    } else
-        fake = TRUE;
-      }
-      if (fake) {
-    contents += "[Desktop Entry]\n";
-    contents += "Categories = " + // No tr
-//        cats.labels("Document View",doc->categories()).join(";") + "\n"; // No tr
-      Qtopia::Record::idsToString( doc->categories() ) + "\n";
-    contents += "Name = "+doc->name()+"\n"; // No tr
-    contents += "Type = "+doc->type()+"\n"; // No tr
-      }
-      contents += "File = "+doc->file()+"\n"; // No tr // (resolves path)
-      contents += QString("Size = %1\n").arg( fi.size() ); // No tr
-  }
-
-  //qDebug( "sending length %d", contents.length() );
-#ifndef QT_NO_COP
-  QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
-  e << contents;
-#endif
+}
 
-  //qDebug( "================ \n\n%s\n\n===============",
-  //contents.latin1() );
-
-  delete docsFolder;
-  docsFolder = 0;
-#ifdef QWS
-    } else if ( msg == "setMouseProto(QString)" ) {
-  QString mice;
-  stream >> mice;
-  setenv("QWS_MOUSE_PROTO",mice.latin1(),1);
-  qwsServer->openMouse();
-    } else if ( msg == "setKeyboard(QString)" ) {
-  QString kb;
-  stream >> kb;
-  setenv("QWS_KEYBOARD",kb.latin1(),1);
-  qwsServer->openKeyboard();
-#endif
+// These are the update functions from the server
+void Launcher::typeAdded( const QString& type, const QString& name,
+				    const QPixmap& pixmap, const QPixmap& )
+{
+    tabs->newView( type, pixmap, name );
+    ids.append( type );
+    tb->refreshStartMenu();
+
+    static bool first = TRUE;
+    if ( first ) {
+	first = FALSE;
+        tabs->categoryBar->showTab(type);
     }
+
+    tabs->view( type )->setUpdatesEnabled( FALSE );
+    tabs->view( type )->setSortEnabled( FALSE );
 }
 
-void Launcher::cancelSync()
+void Launcher::typeRemoved( const QString& type )
 {
-#ifndef QT_NO_COP
-    QCopEnvelope e( "QPE/Desktop", "cancelSync()" );
-#endif
+    tabs->view( type )->removeAllItems();
+    tabs->deleteView( type );
+    ids.remove( type );
+    tb->refreshStartMenu();
 }
 
-void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
+void Launcher::applicationAdded( const QString& type, const AppLnk& app )
 {
- QDataStream stream( data, IO_ReadOnly );
-    if ( msg == "setTabView(QString,int)" ) {
-  QString id;
-  stream >> id;
-  int mode;
-  stream >> mode;
-  if ( tabs->view(id) )
-      tabs->view(id)->setViewMode( (LauncherView::ViewMode)mode );
-    } else if ( msg == "setTabBackground(QString,int,QString)" ) {
-  QString id;
-  stream >> id;
-  int mode;
-  stream >> mode;
-  QString pixmapOrColor;
-  stream >> pixmapOrColor;
-  if ( tabs->view(id) )
-      tabs->view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
-    } else if ( msg == "setTextColor(QString,QString)" ) {
-  QString id;
-  stream >> id;
-  QString color;
-  stream >> color;
-  if ( tabs->view(id) )
-      tabs->view(id)->setTextColor( QColor(color) );
-    } else if ( msg == "setFont(QString,QString,int,int,int)" ) {
-  QString id;
-  stream >> id;
-  QString fam;
-  stream >> fam;
-  int size;
-  stream >> size;
-  int weight;
-  stream >> weight;
-  int italic;
-  stream >> italic;
-  if ( tabs->view(id) )
-      if ( !fam. isEmpty ( ))
-    tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
-      else
-    tabs->view(id)->unsetViewFont();
-  qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
-    }
-    else if ( msg == "setBusyIndicatorType(QString)" ) {
-  QString type;
-  stream >> type;
-  tabs->setBusyIndicatorType(type);
-    }
-    else if ( msg == "home()" ) {
-  if ( isVisibleWindow( winId ( )))
-     nextView ( );
-  else
-     raise ( );
+    if ( app.type() == "Separator" )  // No tr
+	return;
 
-    }
+    LauncherView *view = tabs->view( type );
+    if ( view )
+	view->addItem( new AppLnk( app ), FALSE );
+    else
+	qWarning("addAppLnk: No view for type %s. Can't add app %s!",
+				  type.latin1(),app.name().latin1()  );
+
+    MimeType::registerApp( app );
 }
 
-void Launcher::storageChanged()
+void Launcher::applicationRemoved( const QString& type, const AppLnk& app )
 {
-    if ( in_lnk_props ) {
-  got_lnk_change = TRUE;
-  lnk_change = QString::null;
-    } else {
-  updateLink( QString::null );
-    }
+    LauncherView *view = tabs->view( type );
+    if ( view )
+	view->removeLink( app.linkFile() );
+    else
+	qWarning("removeAppLnk: No view for %s!", type.latin1() );
 }
 
+void Launcher::allApplicationsRemoved()
+{
+    MimeType::clear();
+    for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it)
+	tabs->view( (*it) )->removeAllItems();
+}
 
-bool Launcher::mkdir(const QString &localPath)
+void Launcher::documentAdded( const DocLnk& doc )
 {
-    QDir fullDir(localPath);
-    if (fullDir.exists())
-  return true;
-
-    // at this point the directory doesn't exist
-    // go through the directory tree and start creating the direcotories
-    // that don't exist; if we can't create the directories, return false
-
-    QString dirSeps = "/";
-    int dirIndex = localPath.find(dirSeps);
-    QString checkedPath;
-
-    // didn't find any seps; weird, use the cur dir instead
-    if (dirIndex == -1) {
-  //qDebug("No seperators found in path %s", localPath.latin1());
-  checkedPath = QDir::currentDirPath();
-    }
+    tabs->docView()->addItem( new DocLnk( doc ), FALSE );
+}
 
-    while (checkedPath != localPath) {
-  // no more seperators found, use the local path
-  if (dirIndex == -1)
-      checkedPath = localPath;
-  else {
-      // the next directory to check
-      checkedPath = localPath.left(dirIndex) + "/";
-      // advance the iterator; the next dir seperator
-      dirIndex = localPath.find(dirSeps, dirIndex+1);
-  }
-
-  QDir checkDir(checkedPath);
-  if (!checkDir.exists()) {
-      //qDebug("mkdir making dir %s", checkedPath.latin1());
-
-      if (!checkDir.mkdir(checkedPath)) {
-    qDebug("Unable to make directory %s", checkedPath.latin1());
-    return FALSE;
-      }
-  }
+void Launcher::showLoadingDocs()
+{
+    tabs->docView()->hide();
+}
 
-    }
-    return TRUE;
+void Launcher::showDocTab()
+{
+    if ( tabs->categoryBar->currentView() == tabs->docView() )
+	tabs->docView()->show();
 }
 
-void Launcher::preloadApps()
+void Launcher::documentRemoved( const DocLnk& doc )
 {
-    Config cfg("Launcher");
-    cfg.setGroup("Preload");
-    QStringList apps = cfg.readListEntry("Apps",',');
-    for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
-#ifndef QT_NO_COP
-  QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
-#endif
-    }
+    tabs->docView()->removeLink( doc.linkFile() );
 }
 
-DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName)
-   : OFileSelector(parent,mode,selector,dirName,fileName)
+void Launcher::documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc )
 {
-   //setYesCancelVisible(false);
-   //setToolbarVisible(false);
-   //setPermissionBarVisible(false);
-   //setLineEditVisible(false) ;
-   //setChooserVisible( bool chooser );
-  
+    documentRemoved( oldDoc );
+    documentAdded( newDoc );
 }
 
-DocumentTab::~DocumentTab() {
+void Launcher::allDocumentsRemoved()
+{
+    tabs->docView()->removeAllItems();
+}
 
+void Launcher::applicationStateChanged( const QString& name, ApplicationState state )
+{
+    tb->setApplicationState( name, state );
+}
+
+void Launcher::applicationScanningProgress( int percent )
+{
+    switch ( percent ) {
+        case 0: {
+	    for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) {
+		tabs->view( (*it) )->setUpdatesEnabled( FALSE );
+		tabs->view( (*it) )->setSortEnabled( FALSE );
+	    }
+	    break;
+        }
+        case 100: {
+	    for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) {
+		tabs->view( (*it) )->setUpdatesEnabled( TRUE );
+		tabs->view( (*it) )->setSortEnabled( TRUE );
+	    }
+	    break;
+        }
+        default:
+            break;
+    }
+}
+
+void Launcher::documentScanningProgress( int percent )
+{
+    switch ( percent ) {
+        case 0: {
+	    tabs->setLoadingProgress( 0 );
+	    tabs->setLoadingWidgetEnabled( TRUE );
+	    tabs->docView()->setUpdatesEnabled( FALSE );
+	    tabs->docView()->setSortEnabled( FALSE );
+	    break;
+        }
+        case 100: {
+	    tabs->docView()->updateTools();
+	    tabs->docView()->setSortEnabled( TRUE );
+	    tabs->docView()->setUpdatesEnabled( TRUE );
+	    tabs->setLoadingWidgetEnabled( FALSE );
+	    break;
+        }
+        default:
+	    tabs->setLoadingProgress( percent );
+            break;
+    }
 }
 
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 7117e0b..85163b6 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -20,15 +20,15 @@
 
 #include "launcherview.h"
 
-#include <qpe/qpeapplication.h>
-#include <qpe/applnk.h>
-#include <qpe/qpedebug.h>
-#include <qpe/categories.h>
-#include <qpe/categoryselect.h>
-#include <qpe/menubutton.h>
-#include <qpe/mimetype.h>
-#include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtopia/qpeapplication.h>
+#include <qtopia/applnk.h>
+#include <qtopia/qpedebug.h>
+#include <qtopia/private/categories.h>
+#include <qtopia/categoryselect.h>
+#include <qtopia/menubutton.h>
+#include <qtopia/mimetype.h>
+#include <qtopia/resource.h>
+#include <qtopia/qpetoolbar.h>
 //#include <qtopia/private/palmtoprecord.h>
 
 #include <qtimer.h>
@@ -38,12 +38,21 @@
 #include <qfileinfo.h>
 #include <qhbox.h>
 #include <qiconview.h>
+#include <qwidgetstack.h>
 #include <qpainter.h>
 #include <qregexp.h>
 #include <qtoolbutton.h>
 #include <qimage.h>
+#include <qlabel.h>
+#include <qobjectlist.h>
+
+
+// These define how the busy icon is animated and highlighted
+#define BRIGHTEN_BUSY_ICON
+//#define ALPHA_FADE_BUSY_ICON
+//#define USE_ANIMATED_BUSY_ICON_OVERLAY
+#define BOUNCE_BUSY_ICON
 
-#include <cstdlib>
 
 class BgPixmap
 {
@@ -60,6 +69,43 @@ enum BusyIndicatorType {
 
 static QMap<QString,BgPixmap*> *bgCache = 0;
 
+static void cleanup_cache()
+{
+    QMap<QString,BgPixmap*>::Iterator it = bgCache->begin();
+    while ( it != bgCache->end() ) {
+	QMap<QString,BgPixmap*>::Iterator curr = it;
+	++it;
+	delete (*curr);
+	bgCache->remove( curr );
+    }
+    delete bgCache;
+    bgCache = 0;
+}
+
+
+class LauncherItem : public QIconViewItem
+{
+public:
+    LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE );
+    ~LauncherItem();
+
+    AppLnk *appLnk() const { return app; }
+    AppLnk *takeAppLnk() { AppLnk* r=app; app=0; return r; }
+
+    void animateIcon();
+    void resetIcon();
+
+    virtual int compare ( QIconViewItem * i ) const;
+    void paintItem( QPainter *p, const QColorGroup &cg );
+protected:
+    bool isBigIcon;
+    int iteration;
+    AppLnk* app;
+private:
+    void paintAnimatedIcon( QPainter *p );
+};
+
+
 class LauncherIconView : public QIconView {
 public:
     LauncherIconView( QWidget* parent, const char* name=0 ) :
@@ -67,13 +113,13 @@ public:
 	tf(""),
 	cf(0),
 	bsy(0),
+	busyTimer(0),
 	bigIcns(TRUE),
 	bgColor(white)
     {
 	sortmeth = Name;
 	hidden.setAutoDelete(TRUE);
 	ike = FALSE;
-	busytimer = 0;
 	calculateGrid( Bottom );
     }
 
@@ -88,12 +134,17 @@ public:
 	}
 #endif
     }
-    
-    void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; }
 
-    QPixmap* busyPixmap() const { return (QPixmap*)&bpm[abs(busystate)]; }
     QIconViewItem* busyItem() const { return bsy; }
-    void setBigIcons( bool bi ) { bigIcns = bi; }
+#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
+    QPixmap busyPixmap() const { return busyPix; }
+#endif
+    void setBigIcons( bool bi ) {
+	bigIcns = bi;
+#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
+	busyPix.resize(0,0);
+#endif
+    }
 
     void updateCategoriesAndMimeTypes();
 
@@ -104,73 +155,31 @@ public:
 
     void setBusy(bool on)
     {
-	QIconViewItem *c = on ? currentItem() : 0;
-	
-	if ( bsy != c ) {
-	    QIconViewItem *oldbsy = bsy;
-	    bsy = c;
-	
-	    if ( oldbsy )
-		oldbsy-> repaint ( );
-	
-	    if ( busytimer ) {
-		killTimer ( busytimer );
-	        busytimer = 0;
-	    }
-	    
-	    if ( bsy ) {
-		QPixmap *src = bsy-> QIconViewItem::pixmap();
-	    	for ( int i = 0; i <= 5; i++ ) {
-		    QImage img = src->convertToImage();
-		    QRgb* rgb;
-		    int count;
-		    if ( img.depth() == 32 ) {
-			rgb = (QRgb*)img.bits();
-			count = img.bytesPerLine()/sizeof(QRgb)*img.height();
-		    } else {
-			rgb = img.colorTable();
-			count = img.numColors();
-		    }
-		    int rc, gc, bc;
-		    int bs = abs ( i * 10 ) + 25;
-		    colorGroup().highlight().rgb( &rc, &gc, &bc );
-		    rc = rc * bs / 100;
-		    gc = gc * bs / 100;
-		    bc = bc * bs / 100;
-		
-		    for ( int r = 0; r < count; r++, rgb++ ) {
-			int ri = rc + qRed   ( *rgb ) * ( 100 - bs ) / 100;
-			int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100;
-			int bi = bc + qBlue  ( *rgb ) * ( 100 - bs ) / 100;
-			int ai = qAlpha ( *rgb );
-			*rgb = qRgba ( ri, gi, bi, ai );
-		    }
+#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
+	if ( busyPix.isNull() ) {
+	    int size = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
+	    busyPix.convertFromImage( Resource::loadImage( "busy" ).smoothScale( size * 16, size ) );
+	}
+#endif
 
-		    bpm [i].convertFromImage( img );
-		}
-		    
-		if ( busyType == BIT_Blinking ) {
-		    busystate = 0;	
-		    busytimer = startTimer ( 200 );
-		}
-		else {		    
-		    busystate = 3;
-		}
-		timerEvent ( 0 );
+	if ( on ) {
+	    busyTimer = startTimer( 100 );
+	} else {
+	    if ( busyTimer ) {
+	        killTimer( busyTimer );
+		busyTimer = 0;
 	    }
 	}
-    }
 
-    virtual void timerEvent ( QTimerEvent *te )
-    {
-	if ( !te || ( te-> timerId ( ) == busytimer )) {
-	    if ( bsy ) {
-		busystate++;
-		if ( busystate > 5 )
-			busystate = -4;
-			
-		QScrollView::updateContents ( bsy-> pixmapRect ( false ));
-	    }
+	LauncherItem *c = on ? (LauncherItem*)currentItem() : 0;
+
+	if ( bsy != c ) {
+	    LauncherItem *oldBusy = bsy;
+	    bsy = c;
+	    if ( oldBusy )
+		oldBusy->resetIcon();
+	    if ( bsy )
+		bsy->animateIcon();
 	}
     }
 
@@ -178,8 +187,13 @@ public:
     void keyPressEvent(QKeyEvent* e)
     {
 	ike = TRUE;
-	if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space )
-	    returnPressed(currentItem());
+	if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) {
+	    if ( (e->state() & ShiftButton) )
+		emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() );
+	    else
+		returnPressed(currentItem());
+	}
+
 	QIconView::keyPressEvent(e);
 	ike = FALSE;
     }
@@ -213,22 +227,11 @@ public:
 	}
     }
 
+    void setBackgroundOrigin( QWidget::BackgroundOrigin ) {
+    }
+
     void setBackgroundPixmap( const QPixmap &pm ) {
-	if ( pm. isNull ( )) {
-	    bgPixmap = pm;
-	}
-	else {    
-	    // This is need for bg images with alpha channel	
-	
-	    QPixmap tmp ( pm. size ( ), pm. depth ( ));
-    	
-	    QPainter p ( &tmp );
-	    p. fillRect ( 0, 0, pm. width ( ), pm. height ( ), bgColor. isValid ( ) ? bgColor : white );
-	    p. drawPixmap ( 0, 0, pm );    	
-	    p. end ( );
-    
-	   bgPixmap = tmp;
-	}
+	bgPixmap = pm;
     }
 
     void setBackgroundColor( const QColor &c ) {
@@ -238,8 +241,7 @@ public:
     void drawBackground( QPainter *p, const QRect &r )
     {
 	if ( !bgPixmap.isNull() ) {
-	    //p-> fillRect ( r, bgColor );
-	    p->drawTiledPixmap( r, bgPixmap,
+           p->drawTiledPixmap( r, bgPixmap,
                    QPoint( (r.x() + contentsX()) % bgPixmap.width(),
                            (r.y() + contentsY()) % bgPixmap.height() ) );
 	} else {
@@ -287,7 +289,7 @@ public:
     {
 	switch (sortmeth) {
 	case Name:
-	    return a->name().compare(b->name());
+	    return a->name().lower().compare(b->name().lower());
 	case Date: {
 	    QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
 	    QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
@@ -299,10 +301,18 @@ public:
 	return 0;
     }
 
-    QString getAllDocLinkInfo() const;
-
 protected:
 
+    void timerEvent( QTimerEvent *te )
+    {
+	if ( te->timerId() == busyTimer ) {
+	    if ( bsy )
+		bsy->animateIcon();
+	} else {
+	    QIconView::timerEvent( te );
+	}
+    }
+
     void styleChange( QStyle &old )
     {
 	QIconView::styleChange( old );
@@ -334,47 +344,9 @@ protected:
 	}
     }
 
+    void focusInEvent( QFocusEvent * ) {}
+    void focusOutEvent( QFocusEvent * ) {}
 
-    // flicker free redrawing of busy indicator
-    // code was taken from QScrollView::viewportPaintEvent
-	void viewportPaintEvent( QPaintEvent* pe )
-	{
-		static QPixmap *pix = new QPixmap ( );
-
-		QWidget* vp = viewport();
-
-		if ( vp-> size ( ) != pix-> size ( ))
-			pix-> resize ( vp-> size ( ));
-
-		QPainter p(pix, vp);
-		QRect r = pe->rect();
-		if ( clipper ( ) != vp ) {
-			QRect rr(
-				-vp->x(), -vp->y(),
-				clipper()->width(), clipper()->height()
-			);
-			r &= rr;
-			if ( r.isValid() ) {
-				int ex = r.x() + vp->x() + contentsX();
-				int ey = r.y() + vp->y() + contentsY();
-				int ew = r.width();
-				int eh = r.height();
-				drawContentsOffset(&p,
-					contentsX()+vp->x(),
-					contentsY()+vp->y(),
-					ex, ey, ew, eh);
-			}
-		} else {
-			r &= clipper()->rect();
-			int ex = r.x() + contentsX();
-			int ey = r.y() + contentsY();
-			int ew = r.width();
-			int eh = r.height();
-			drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh);
-		}
-		bitBlt ( vp, r.topLeft(), pix, r );
-	}
-                                                                                                                                                                                     
 private:
     QList<AppLnk> hidden;
     QDict<void> mimes;
@@ -382,15 +354,15 @@ private:
     SortMethod sortmeth;
     QRegExp tf;
     int cf;
-    QIconViewItem* bsy;
+    LauncherItem* bsy;
+    int busyTimer;
     bool ike;
     bool bigIcns;
     QPixmap bgPixmap;
-    QPixmap bpm [6];
     QColor bgColor;
-    int busytimer;
-    int busystate;
-    BusyIndicatorType busyType;
+#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
+    QPixmap busyPix;
+#endif
 };
 
 
@@ -401,63 +373,133 @@ void LauncherView::setBusy(bool on)
     icons->setBusy(on);
 }
 
-class LauncherItem : public QIconViewItem
+void LauncherView::setBusyIndicatorType( const QString& type ) {
+    /* ### FIXME */
+}
+
+LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
+    : QIconViewItem( parent, applnk->name(),
+           bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
+	isBigIcon( bigIcon ),
+	iteration(0),
+	app(applnk) // Takes ownership
 {
-public:
-    LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE );
-    ~LauncherItem()
-    {
-	LauncherIconView* liv = (LauncherIconView*)iconView();
-	if ( liv->busyItem() == this )
-	    liv->setBusy(FALSE);
-	delete app;
-    }
+}
 
-    AppLnk* appLnk() const { return app; }
-    AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; }
+LauncherItem::~LauncherItem()
+{
+    LauncherIconView* liv = (LauncherIconView*)iconView();
+    if ( liv->busyItem() == this )
+	liv->setBusy(FALSE);
+    delete app;
+}
 
-    virtual int compare ( QIconViewItem * i ) const;
+int LauncherItem::compare ( QIconViewItem * i ) const
+{
+    LauncherIconView* view = (LauncherIconView*)iconView();
+    return view->compare(app,((LauncherItem *)i)->appLnk());
+}
 
-    void paintItem( QPainter *p, const QColorGroup &cg )
-    {
-	LauncherIconView* liv = (LauncherIconView*)iconView();
-	QBrush oldBrush( liv->itemTextBackground() );
-	QColorGroup mycg( cg );
-	if ( liv->currentItem() == this ) {
-	    liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
-	    mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
-	}
-	QIconViewItem::paintItem(p,mycg);
-	if ( liv->currentItem() == this )
-	    liv->setItemTextBackground( oldBrush );
+void LauncherItem::paintItem( QPainter *p, const QColorGroup &cg )
+{
+    LauncherIconView* liv = (LauncherIconView*)iconView();
+    QBrush oldBrush( liv->itemTextBackground() );
+    QColorGroup mycg( cg );
+    if ( liv->currentItem() == this ) {
+	liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
+	mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
     }
 
-    virtual QPixmap* pixmap () const
-    {
-	const LauncherIconView* liv = (LauncherIconView*)iconView();
-	if ( (const LauncherItem *)liv->busyItem() == this )
-	    return liv->busyPixmap();
-	return QIconViewItem::pixmap();
-    }
+    QIconViewItem::paintItem(p,mycg);
 
-protected:
-    AppLnk* app;
-};
+    // Paint animation overlay
+    if ( liv->busyItem() == this )
+	paintAnimatedIcon(p);
 
+    if ( liv->currentItem() == this )
+	liv->setItemTextBackground( oldBrush );
+}
 
-LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
-    : QIconViewItem( parent, applnk->name(),
-           bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
-	app(applnk) // Takes ownership
+void LauncherItem::paintAnimatedIcon( QPainter *p )
 {
+    LauncherIconView* liv = (LauncherIconView*)iconView();
+    int pic = iteration % 16;
+    int w = pixmap()->width(), h = pixmap()->height();
+    QPixmap dblBuf( w, h + 4 );
+    QPainter p2( &dblBuf );
+    int x1, y1;
+    if ( liv->itemTextPos() == QIconView::Bottom ) {
+	x1 = x() + (width() - w) / 2 - liv->contentsX();
+	y1 = y() - liv->contentsY();
+    } else {
+	x1 = x() - liv->contentsX();
+	y1 = y() + (height() - h) / 2 - liv->contentsY();
+    }
+    y1 -= 2;
+    p2.translate(-x1,-y1);
+    liv->drawBackground( &p2, QRect(x1,y1,w,h+4) );
+    int bounceY = 2;
+#ifdef BOUNCE_BUSY_ICON
+    bounceY = 4 - ((iteration+2)%8);
+    bounceY = bounceY < 0 ? -bounceY : bounceY;
+#endif
+    p2.drawPixmap( x1, y1 + bounceY, *pixmap() );
+#ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
+    p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h );
+#endif
+    p->drawPixmap( x1, y1, dblBuf );
 }
 
-int LauncherItem::compare ( QIconViewItem * i ) const
+void LauncherItem::animateIcon()
 {
-    LauncherIconView* view = (LauncherIconView*)iconView();
-    return view->compare(app,((LauncherItem *)i)->appLnk());
+    LauncherIconView* liv = (LauncherIconView*)iconView();
+
+    if ( liv->busyItem() != this || !app )
+	return;
+
+    // Highlight the icon
+    if ( iteration == 0 ) {
+	QPixmap src = isBigIcon ? app->bigPixmap() : app->pixmap();
+	QImage img = src.convertToImage();
+	QRgb *rgb;
+	int count;
+	if ( img.depth() == 32 ) {
+	    rgb = (QRgb*)img.bits();
+	    count = img.bytesPerLine()/sizeof(QRgb)*img.height();
+	} else {
+	    rgb = img.colorTable();
+	    count = img.numColors();
+	}
+	for ( int r = 0; r < count; r++, rgb++ ) {
+#if defined(BRIGHTEN_BUSY_ICON)
+	    QColor c(*rgb);
+	    int h, s, v;
+	    c.hsv(&h,&s,&v);
+	    c.setHsv(h,QMAX(s-24,0),QMIN(v+48,255));
+	    *rgb = qRgba(c.red(),c.green(),c.blue(),qAlpha(*rgb));
+#elif defined(ALPHA_FADE_BUSY_ICON)
+	    *rgb = qRgba(qRed(*rgb),qGreen(*rgb),qBlue(*rgb),qAlpha(*rgb)/2);
+#endif
+	}
+	src.convertFromImage( img );
+	setPixmap( src );
+    }
+
+    iteration++;
+
+    // Paint animation overlay
+    QPainter p( liv->viewport() );
+    paintAnimatedIcon( &p );
+}
+
+void LauncherItem::resetIcon()
+{
+    iteration = 0;
+    setPixmap( isBigIcon ? app->bigPixmap() : app->pixmap() );
 }
 
+//===========================================================================
+
 QStringList LauncherIconView::mimeTypes() const
 {
     QStringList r;
@@ -503,6 +545,7 @@ void LauncherIconView::updateCategoriesAndMimeTypes()
 
 void LauncherIconView::hideOrShowItems(bool resort)
 {
+    viewport()->setUpdatesEnabled( FALSE );
     hidden.setAutoDelete(FALSE);
     QList<AppLnk> links=hidden;
     hidden.clear();
@@ -512,7 +555,6 @@ void LauncherIconView::hideOrShowItems(bool resort)
 	links.append(item->takeAppLnk());
 	item = (LauncherItem*)item->nextItem();
     }
-    viewport()->setUpdatesEnabled( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
@@ -520,9 +562,9 @@ void LauncherIconView::hideOrShowItems(bool resort)
 	addItem(l,FALSE);
 	++it;
     }
-    viewport()->setUpdatesEnabled( TRUE );
     if ( resort && !autoArrange() )
 	sort();
+    viewport()->setUpdatesEnabled( TRUE );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
@@ -533,20 +575,22 @@ bool LauncherIconView::removeLink(const QString& linkfile)
     DocLnk dl(linkfile);
     while (item) {
 	l = item->appLnk();
-	if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
-	  || ( l->fileKnown() && ( l->file() == linkfile ))
-	  || ( dl.fileKnown() && l->fileKnown() && ( dl.file() == l->file() )) ) {
+	LauncherItem *nextItem = (LauncherItem *)item->nextItem();
+	if (  l->linkFileKnown() && l->linkFile() == linkfile
+		|| l->fileKnown() && (
+		    l->file() == linkfile
+		    || dl.isValid() && dl.file() == l->file() ) ) {
 	    delete item;
 	    did = TRUE;
 	}
-	item = (LauncherItem*)item->nextItem();
+	item = nextItem;
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
 	++it;
-	if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
-	  || ( l->file() == linkfile )
-	  || ( dl.fileKnown() && ( dl.file() == l->file() )) ) {
+	if ( l->linkFileKnown() && l->linkFile() == linkfile
+		|| l->file() == linkfile
+		|| dl.isValid() && dl.file() == l->file() ) {
 	    hidden.removeRef(l);
 	   did = TRUE;
 	}
@@ -554,62 +598,12 @@ bool LauncherIconView::removeLink(const QString& linkfile)
     return did;
 }
 
-static QString docLinkInfo(const Categories& cats, DocLnk* doc)
-{
-    QString contents;
-
-    QFileInfo fi( doc->file() );
-    if ( !fi.exists() )
-	return contents;
-
-    if ( doc->linkFileKnown() ) {
-	QString lfn = doc->linkFile();
-	QFile f( lfn );
-	if ( f.open( IO_ReadOnly ) ) {
-	    QTextStream ts( &f );
-	    ts.setEncoding( QTextStream::UnicodeUTF8 );
-	    contents += ts.read();
-	    f.close();
-	    goto calcsize;
-	}
-    }
-
-    contents += "[Desktop Entry]\n";
-    contents += "Categories = " // No tr
-	+ cats.labels("Document View", doc->categories()).join(";") + "\n"; // No tr
-    contents += "File = "+doc->file()+"\n"; // No tr
-    contents += "Name = "+doc->name()+"\n"; // No tr
-    contents += "Type = "+doc->type()+"\n"; // No tr
-
-calcsize:
-    contents += QString("Size = %1\n").arg( fi.size() ); // No tr
-    return contents;
-}
-
-QString LauncherIconView::getAllDocLinkInfo() const
-{
-    QString contents;
-    LauncherItem* item = (LauncherItem*)firstItem();
-    Categories cats;
-    while (item) {
-	DocLnk* doc = (DocLnk*)item->appLnk();
-	contents += docLinkInfo(cats,doc);
-	item = (LauncherItem*)item->nextItem();
-    }
-    QListIterator<AppLnk> it(hidden);
-    DocLnk* doc;
-    while ((doc=(DocLnk*)it.current())) {
-	contents += docLinkInfo(cats,doc);
-	++it;
-    }
-    return contents;
-}
-
 //===========================================================================
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
+    catmb = 0;
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
@@ -640,6 +634,13 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
 
 LauncherView::~LauncherView()
 {
+    if ( bgCache && bgCache->contains( bgName ) )
+	(*bgCache)[bgName]->ref--;
+}
+
+void LauncherView::hideIcons()
+{
+    icons->hide();
 }
 
 void LauncherView::setToolsEnabled(bool y)
@@ -650,12 +651,16 @@ void LauncherView::setToolsEnabled(bool y)
 
 	    // Type filter
 	    typemb = new QComboBox(tools);
+	    QSizePolicy p = typemb->sizePolicy();
+	    p.setHorData(QSizePolicy::Expanding);
+	    typemb->setSizePolicy(p);
 
 	    // Category filter
-	    catmb = new CategorySelect(tools);
-
 	    updateTools();
 	    tools->show();
+
+	    // Always show vscrollbar
+	    icons->setVScrollBarMode( QScrollView::AlwaysOn );
 	} else {
 	    delete tools;
 	    tools = 0;
@@ -667,9 +672,10 @@ void LauncherView::updateTools()
 {
     disconnect( typemb, SIGNAL(activated(int)),
 	        this, SLOT(showType(int)) );
-    disconnect( catmb, SIGNAL(signalSelected(int)),
+    if ( catmb ) disconnect( catmb, SIGNAL(signalSelected(int)),
 	        this, SLOT(showCategory(int)) );
 
+    // ### I want to remove this
     icons->updateCategoriesAndMimeTypes();
 
     QString prev;
@@ -689,9 +695,9 @@ void LauncherView::updateTools()
 	} else {
 	    t[0] = t[0].upper();
 	}
-	types += tr("%1 files").arg(t);
+	types += t;
     }
-    types << tr("All types of file");
+    types << tr("All types");
     prev = typemb->currentText();
     typemb->clear();
     typemb->insertStringList(types);
@@ -704,6 +710,9 @@ void LauncherView::updateTools()
     if ( prev.isNull() )
 	typemb->setCurrentItem(typemb->count()-1);
 
+    int pcat = catmb ? catmb->currentCategory() : -2;
+    if ( !catmb )
+	catmb = new CategorySelect(tools);
     Categories cats( 0 );
     cats.load( categoryFileName() );
     QArray<int> vl( 0 );
@@ -711,6 +720,11 @@ void LauncherView::updateTools()
 	tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
+    catmb->setCurrentCategory(pcat);
+
+    // if type has changed we need to redisplay
+    if ( typemb->currentText() != prev )
+	showType( typemb->currentItem() );
 
     connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
@@ -758,17 +772,75 @@ void LauncherView::setViewMode( ViewMode m )
     }
 }
 
+//
+// User images may require scaling.
+//
+QImage LauncherView::loadBackgroundImage(QString &bgName)
+{
+    QImageIO imgio;
+    QSize   ds = qApp->desktop()->size();   // should be launcher, not desktop
+    bool    further_scaling = TRUE;
+
+    imgio.setFileName( bgName );
+    imgio.setParameters("GetHeaderInformation");
+
+    if (imgio.read() == FALSE) {
+	return imgio.image();
+    }
+
+    if (imgio.image().width() < ds.width() &&
+	    imgio.image().height() < ds.height()) {
+	further_scaling = FALSE;
+    }
+
+    if (!imgio.image().bits()) {
+	//
+	// Scale and load.  Note we don't scale up.
+	//
+	QString param( "Scale( %1, %2, ScaleMin )" ); // No tr
+	imgio.setParameters(further_scaling ?
+	    param.arg(ds.width()).arg(ds.height()).latin1() :
+	    "");
+	imgio.read();
+    } else {
+	if (further_scaling) {
+	    int	t1 = imgio.image().width() * ds.height();
+	    int t2 = imgio.image().height() * ds.width();
+	    int dsth = ds.height();
+	    int dstw = ds.width();
+
+	    if (t1 > t2) {
+		dsth = t2 / imgio.image().width();
+	    } else {
+		dstw = t1 / imgio.image().height();
+	    }
+
+	    //
+	    // Loader didn't scale for us.  Do it manually.
+	    //
+	    return imgio.image().smoothScale(dstw, dsth);
+	}
+    }
+
+    return imgio.image();
+}
+
 void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
 {
-    if ( !bgCache )
+    if ( !bgCache ) {
 	bgCache = new QMap<QString,BgPixmap*>;
+	qAddPostRoutine( cleanup_cache );
+    }
+
     if ( bgCache->contains( bgName ) )
 	(*bgCache)[bgName]->ref--;
+    bgName = "";
+
+    QPixmap bg;
 
     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;
@@ -785,55 +857,63 @@ void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
 		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 {
-		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();
+	    if (!val.isEmpty()) {
+		bgName = val;
+		if ( bgCache->contains( bgName ) ) {
+		    (*bgCache)[bgName]->ref++;
+		    bg = (*bgCache)[bgName]->pm;
+		} else {
+		    QString imgFile = bgName;
+		    bool tile = FALSE;
+		    if ( imgFile[0]!='/' || !QFile::exists(imgFile) ) {
+			imgFile = Resource::findPixmap( imgFile );
+			tile = TRUE;
+		    }
+		    QImage img = loadBackgroundImage(imgFile);
+
+
+		    if ( img.depth() == 1 )
+			img = img.convertDepth(8);
+		    img.setAlphaBuffer(FALSE);
+		    bg.convertFromImage(img);
+		    bgCache->insert( bgName, new BgPixmap(bg) );
 		}
-		bgCache->insert( bgName, new BgPixmap(bg) );
-		icons->setBackgroundPixmap( bg );
 	    }
 	    break;
+
+	case SolidColor:
+	default:
+	    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 );
+    const QObjectList *list = queryList( "QWidget", 0, FALSE );
+    QObject *obj;
+    for ( QObjectListIt it( *list ); (obj=it.current()); ++it ) {
+	if ( obj->isWidgetType() ) {
+	    QWidget *w = (QWidget*)obj;
+	    w->setBackgroundPixmap( bg );
+	    if ( bgName.isEmpty() ) {
+		// Solid Color
+		if ( val.isEmpty() )
+		    w->setBackgroundColor( colorGroup().base() );
+		else
+		    w->setBackgroundColor( val );
+	    } else {
+		// Ruled or Image pixmap
+		w->setBackgroundOrigin( ParentOrigin );
+	    }
 	}
     }
+    delete list;
 
     bgType = t;
     icons->viewport()->update();
+
+    QTimer::singleShot( 1000, this, SLOT(flushBgCache()) );
 }
 
 void LauncherView::setTextColor( const QColor &tc )
@@ -848,11 +928,13 @@ void LauncherView::setTextColor( const QColor &tc )
 void LauncherView::setViewFont( const QFont &f )
 {
     icons->setFont( f );
+    icons->hideOrShowItems( FALSE );
 }
 
-void LauncherView::unsetViewFont( )
+void LauncherView::clearViewFont()
 {
-    icons->unsetFont( );
+    icons->unsetFont();
+    icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::resizeEvent(QResizeEvent *e)
@@ -862,17 +944,6 @@ void LauncherView::resizeEvent(QResizeEvent *e)
 	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();
@@ -911,32 +982,15 @@ void LauncherView::itemPressed( int btn, QIconViewItem *item )
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( btn == RightButton )
 	    emit rightPressed( appLnk );
-/*
-	else if ( btn == LeftButton )
-	    emit clicked( appLnk );
-*/
+	else if ( btn == ShiftButton )
+	    emit rightPressed( appLnk );
 	item->setSelected(FALSE);
     }
 }
 
-void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter )
+void LauncherView::removeAllItems()
 {
-    QListIterator<AppLnk> it( folder->children() );
-    icons->setTypeFilter(typefilter,FALSE);
-
-    while ( it.current() ) {
-	// show only the icons for existing files
-	if (QFile(it.current()->file()).exists() || ( it.current()->file().left(4) == "http" )) {
-	    icons->addItem(*it,FALSE);
-	}
-	else {
-	    //maybe insert some .desktop file deletion code later
-	    //maybe dir specific
-	}
-	++it;
-    }
-
-    icons->sort();
+    icons->clear();
 }
 
 bool LauncherView::removeLink(const QString& linkfile)
@@ -944,6 +998,18 @@ bool LauncherView::removeLink(const QString& linkfile)
     return icons->removeLink(linkfile);
 }
 
+void LauncherView::setSortEnabled( bool v )
+{
+    icons->setSorting( v );
+    if ( v )
+	sort();
+}
+
+void LauncherView::setUpdatesEnabled( bool u )
+{
+    icons->setUpdatesEnabled( u );
+}
+
 void LauncherView::sort()
 {
     icons->sort();
@@ -954,11 +1020,6 @@ void LauncherView::addItem(AppLnk* app, bool resort)
     icons->addItem(app,resort);
 }
 
-void LauncherView::setFileSystems(const QList<FileSystem> &)
-{
-    // ### does nothing now...
-}
-
 void LauncherView::paletteChange( const QPalette &p )
 {
     icons->unsetPalette();
@@ -970,12 +1031,30 @@ void LauncherView::paletteChange( const QPalette &p )
     icons->setPalette( QPalette(cg,cg,cg) );
 }
 
+void LauncherView::fontChanged(const QFont&)
+{
+    qDebug("LauncherView::fontChanged()");
+    icons->hideOrShowItems( FALSE );
+}
 
-void LauncherView::setBusyIndicatorType ( const QString &type )
+void LauncherView::relayout(void)
 {
-    if ( type. lower ( ) == "blink" )
-	icons-> setBusyIndicatorType ( BIT_Blinking );
-    else
-	icons-> setBusyIndicatorType ( BIT_Normal );
+    icons->hideOrShowItems(FALSE);
+}
+
+void LauncherView::flushBgCache()
+{
+    if ( !bgCache )
+	return;
+    // 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 );
+	}
+    }
 }
 
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 82a319b..7863d6a 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -20,16 +20,17 @@
 #ifndef LAUNCHERVIEW_H
 #define LAUNCHERVIEW_H
 
-#include <qpe/storage.h>
+#include <qtopia/storage.h>
+#include <qtopia/applnk.h>
 
 #include <qvbox.h>
 
-class AppLnk;
-class AppLnkSet;
 class CategorySelect;
 class LauncherIconView;
 class QIconView;
 class QIconViewItem;
+class QLabel;
+class QWidgetStack;
 class MenuButton;
 class QComboBox;
 
@@ -41,17 +42,21 @@ public:
     LauncherView( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~LauncherView();
 
+    void hideIcons();
+
     bool removeLink(const QString& linkfile);
     void addItem(AppLnk* app, bool resort=TRUE);
+    void removeAllItems();
+    void setSortEnabled(bool);
+    void setUpdatesEnabled(bool);
     void sort();
 
-    void setFileSystems(const QList<FileSystem> &);
     void setToolsEnabled(bool);
     void updateTools();
 
     void setBusy(bool);
+    void setBusyIndicatorType( const QString& );
 
-    QString getAllDocLinkInfo() const;
     enum ViewMode { Icon, List };
     void setViewMode( ViewMode m );
     ViewMode viewMode() const { return vmode; }
@@ -64,12 +69,9 @@ public:
     QColor textColor() const { return textCol; }
 
     void setViewFont( const QFont & );
-    void unsetViewFont ( );
-
-    void setBusyIndicatorType ( const QString &type );
+    void clearViewFont();
 
-public slots:
-    void populate( AppLnkSet *folder, const QString& categoryfilter );
+    void relayout(void);
 
 signals:
     void clicked( const AppLnk * );
@@ -84,11 +86,13 @@ protected slots:
     void showType(int);
     void showCategory( int );
     void resizeEvent(QResizeEvent *);
+    void flushBgCache();
 
 protected:
-    void internalPopulate( AppLnkSet *, const QString& categoryfilter );
     void paletteChange( const QPalette & );
 
+    void fontChanged(const QFont &);
+
 private:
     static bool bsy;
     QWidget* tools;
@@ -100,7 +104,9 @@ private:
     BackgroundType bgType;
     QString bgName;
     QColor textCol;
-    int busyType;
+
+    QImage loadBackgroundImage(QString &fname);
+    int m_busyType;
 };
 
 #endif // LAUNCHERVIEW_H