Qtopia 1.6 merge:

Launcher tabs can now each have their own background, icon-size and font.

4 files changed, 679 insertions, 187 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index fd89410..dc81c9e 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1,9 +1,8 @@
 /**********************************************************************
-** Copyright (c) 2002 Holger zecke Freyther
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -22,10 +21,11 @@
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FSLP
 
-#include <qpe/config.h>
+#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
+#endif
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
@@ -33,11 +33,14 @@
 #include <qpe/mimetype.h>
 #include <qpe/storage.h>
 #include <qpe/palmtoprecord.h>
 
-#include <qdatetime.h>
+#include <qpe/version.h>
+
 #include <qdir.h>
+#ifdef QWS
 #include <qwindowsystem_qws.h>
+#endif
 #include <qtimer.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qlayout.h>
@@ -51,8 +54,9 @@
 #include <qframe.h>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qtextstream.h>
+#include <qpopupmenu.h>
 
 #include "launcherview.h"
 #include "launcher.h"
 #include "syncdialog.h"
@@ -70,13 +74,9 @@
 #endif
 
 #include <qpe/storage.h>
 #include "mediummountgui.h"
-//#define SHOW_ALL
-
-// uidGen
 
-// uidGen
 namespace {
   QStringList configToMime( Config *cfg ){
     QStringList mimes;
     bool tmpMime = true;
@@ -107,8 +107,25 @@ namespace {
 
 }
 
 
+
+//#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;
@@ -139,17 +156,23 @@ void CategoryTabWidget::addItem( const QString& linkfile )
     int i=0;
     AppLnk *app = new AppLnk(linkfile);
     if ( !app->isValid() ) {
   delete app;
-  return;
+	app=0;
     }
-    if ( !app->file().isEmpty() ) {
+    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 ) {
@@ -158,8 +181,10 @@ void CategoryTabWidget::addItem( const QString& linkfile )
       }
       i++;
   }
     }
+
+    QCopEnvelope e("QPE/TaskBar","reloadApps()");
 }
 
 void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
   AppLnkSet* docFolder, const QList<FileSystem> &fs)
@@ -176,18 +201,21 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     tabs=0;
 
     ids.clear();
 
+    Config cfg("Launcher");
+
     QStringList types = rootFolder->types();
     for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
   if ( !(*it).isEmpty() ) {
-      newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
+	    (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" ) {
+	if ( l->type() == "Separator" ) { // No tr
       rootFolder->remove(l);
       delete l;
   } else {
       int i=0;
@@ -203,13 +231,18 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     for (int i=0; i<tabs; i++)
   ((LauncherView*)stack->widget(i))->sort();
 
     // all documents
-    docview = newView( QString::null, Resource::loadPixmap("DocsIcon"), tr("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();
@@ -217,25 +250,87 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     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" );
+    if ( bgType == "Image" ) { // No tr
+	QString pm = cfg.readEntry( "BackgroundImage", "wallpaper/marble" );
+	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 QTab( pm, label ) );
+    categoryBar->addTab( new CategoryTab( pm, label ) );
     stack->addWidget( view, tabs++ );
     return view;
 }
 
@@ -269,8 +364,15 @@ void CategoryTabWidget::setBusy(bool on)
   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 )
 {
@@ -287,36 +389,58 @@ 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 );
-    QFontMetrics fm = fontMetrics();
     int x = 0;
     QRect r;
     QTab *t;
-    int available = width()-1;
     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);
-  // if (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) {
+	int iw = fm.width( t->text() ) + hframe - overlap;
   if ( i != middleTab ) {
-      // required += hiddenTabWidth + hframe - overlap;
       available -= hiddenTabWidth + hframe - overlap;
       if ( t->iconSet() != 0 )
     available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-  } else {
-      required += fm.width( t->text() ) + hframe - overlap;
-      if ( t->iconSet() != 0 )
-    required += 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 (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) {
-  if ( i != middleTab ) {
+	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();
@@ -331,21 +455,17 @@ void CategoryTabBar::layoutTabs()
       t->setRect( QRect(x, 0, w, h) );
       x += t->rect().width() - overlap;
       r = r.unite( t->rect() );
   } else {
-      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;
 
-      // t->setRect( QRect(x, 0, w * available/required, h) );
       t->setRect( QRect(x, 0, available, h) );
       x += t->rect().width() - overlap;
       r = r.unite( t->rect() );
   }
@@ -366,8 +486,21 @@ void CategoryTabBar::layoutTabs()
 
 
 void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
 {
+    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;
@@ -382,8 +515,15 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
     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;
@@ -398,8 +538,12 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
 #else
           t->identitifer() == keyboardFocusTab()
 #endif
     );
+    if ( setPal ) {
+	that->unsetPalette();
+	that->setUpdatesEnabled( TRUE );
+    }
 }
 
 
 void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
@@ -456,8 +600,9 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
 
     tabs = 0;
     rootFolder = 0;
     docsFolder = 0;
+
     int stamp = uidgen.generate(); // this is our timestamp to see which devices we know
     //uidgen.store( stamp );
     m_timeStamp = QString::number( stamp  );
 
@@ -475,8 +620,11 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
 #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() ) );
@@ -490,18 +638,22 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
 }
 
 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;
 }
 
 void Launcher::showMaximized()
@@ -526,15 +678,16 @@ void Launcher::updateMimeTypes()
 void Launcher::updateMimeTypes(AppLnkSet* folder)
 {
     for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
   AppLnk *app = it.current();
-  if ( app->type() == "Folder" )
+	if ( app->type() == "Folder" ) // No tr
       updateMimeTypes((AppLnkSet *)app);
   else {
       MimeType::registerApp(*app);
   }
     }
 }
+
 /** This is a HACK....
  * Reason: scanning huge mediums, microdirvers for examples
  * consomes time. To avoid that we invented the MediumMountCheck
  *
@@ -674,9 +827,9 @@ void Launcher::nextView()
 
 
 void Launcher::select( const AppLnk *appLnk )
 {
-    if ( appLnk->type() == "Folder" ) {
+    if ( appLnk->type() == "Folder" ) { // No tr
   // Not supported: flat is simpler for the user
     } else {
   if ( appLnk->exec().isNull() ) {
       QMessageBox::information(this,tr("No application"),
@@ -697,9 +850,9 @@ void Launcher::externalSelected(const AppLnk *appLnk)
 }
 
 void Launcher::properties( AppLnk *appLnk )
 {
-    if ( appLnk->type() == "Folder" ) {
+    if ( appLnk->type() == "Folder" ) { // No tr
   // Not supported: flat is simpler for the user
     } else {
   in_lnk_props = TRUE;
   got_lnk_change = FALSE;
@@ -726,14 +879,9 @@ void Launcher::updateLink(const QString& link)
 
 void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
-    if ( msg == "closing(QString)" ){
-        QString app;
-        stream >> app;
-        //qWarning("app closed %s", app.latin1()  );
-        //  MRUList::removeTask( app );
-    }else if ( msg == "linkChanged(QString)" ) {
+    if ( msg == "linkChanged(QString)" ) {
         QString link;
         stream >> link;
         if ( in_lnk_props ) {
             got_lnk_change = TRUE;
@@ -769,10 +917,12 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
             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" );
@@ -780,14 +930,14 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
         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;
-        // register an app for autostart
-        // if clear is send the list is cleared.
+#endif
     } else if ( msg == "autoStart(QString)" ) {
         QString appName;
         stream >> appName;
         Config cfg( "autostart" );
@@ -828,44 +978,60 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
                 cfg.writeEntry("Delay", delay);
             }
         } else {
         }
+    } else if ( msg == "sendVersionInfo()" ) {
+	QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" );
+	QString v = QPE_VERSION;
+	QStringList l = QStringList::split( '.', v );
+	QString v2 = l[0] + '.' + l[1];
+	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;
+	QString hardDiskHome, hardDiskHomePath;
         for ( ; it.current(); ++it ) {
-            if ( (*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" )
+	    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() * (*it)->blockSize() )
-                     + " " + (*it)->options() + ";";
-            else if ( (*it)->disk() == "/dev/mtdblock1" ||
-                      (*it)->disk() == "/dev/mtdblock/1" )
+		     + 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() * (*it)->blockSize() )
-                     + " " + (*it)->options() + ";";
-            else if ( (*it)->name().contains( tr("Hard Disk") ) &&
+		     + QString::number( (*it)->availBlocks() * k4/4 )
+		     + "K " + (*it)->options() + ";";
+	    } else if ( (*it)->name().contains( "Hard Disk") &&
                       homeDir.contains( (*it)->path() ) &&
-                      (*it)->path().length() > hardDiskHome.length() )
+		      (*it)->path().length() > hardDiskHomePath.length() ) {
+		hardDiskHomePath = (*it)->path();
                 hardDiskHome =
                     (*it)->name() + "=" + homeDir + "/Documents "
-                    + QString::number( (*it)->availBlocks() * (*it)->blockSize() )
-                    + " " + (*it)->options() + ";";
+		    + 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;
@@ -891,8 +1057,9 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
         loadDocs();
 
         QString contents;
 
+//	Categories cats;
         for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
             DocLnk *doc = it.current();
             QFileInfo fi( doc->file() );
             if ( !fi.exists() )
@@ -910,40 +1077,101 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
                     fake = TRUE;
             }
             if (fake) {
                 contents += "[Desktop Entry]\n";
-                contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n";
-                contents += "File = "+doc->file()+"\n";
-                contents += "Name = "+doc->name()+"\n";
-                contents += "Type = "+doc->type()+"\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 += QString("Size = %1\n").arg( fi.size() );
+	    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() );
+ 	//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
     }
 }
 
 void Launcher::cancelSync()
 {
+#ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", "cancelSync()" );
+#endif
+}
+
+void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
+{
+    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) )
+	    tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+	qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
+    }
 }
 
 void Launcher::storageChanged()
 {
     if ( in_lnk_props ) {
   got_lnk_change = TRUE;
-  lnk_change = "";
+	lnk_change = QString::null;
     } else {
-  updateDocs();
+	updateLink( QString::null );
     }
 }
 
 
@@ -997,7 +1225,9 @@ void Launcher::preloadApps()
     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
     }
 }
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index d2efa58..e3881ea 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -19,8 +19,9 @@
 **********************************************************************/
 #ifndef LAUNCHER_H
 #define LAUNCHER_H
 
+#include <qpe/config.h>
 #include <qmainwindow.h>
 #include <qtabbar.h>
 #include <qstringlist.h>
 #include <qvbox.h>
@@ -59,8 +60,10 @@ public:
 	    const QList<FileSystem> &);
     void updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs);
     void updateLink(const QString& linkfile);
     void setBusy(bool on);
+    QString getAllDocLinkInfo() const;
+    LauncherView *view( const QString &id );
 
 signals:
     void selected(const QString&);
     void clicked(const AppLnk*);
@@ -69,9 +72,13 @@ signals:
 public slots:
     void nextTab();
     void prevTab();
 
+protected slots:
+    void tabProperties();
+
 protected:
+    void setTabAppearance( const QString &id, Config &cfg );
     void paletteChange( const QPalette &p );
 
 private:
     CategoryTabBar* categoryBar;
@@ -110,8 +117,9 @@ signals:
 
 private slots:
     void doMaximize();
     void systemMessage( const QCString &, const QByteArray &);
+    void launcherMessage( const QCString &, const QByteArray &);
     void storageChanged();
     void cancelSync();
 
 private:
@@ -131,8 +139,9 @@ private:
     void updateLink(const QString& link);
     bool in_lnk_props;
     bool got_lnk_change;
     QString lnk_change;
+
     QString m_timeStamp;
     Qtopia::UidGen uidgen;
 };
 
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index c54a00f..047fe45 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -22,44 +22,53 @@
 
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qpe/qpedebug.h>
-#include <qpe/config.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/private/palmtoprecord.h>
 
 #include <qtimer.h>
+#include <qtextstream.h>
 #include <qdict.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qhbox.h>
 #include <qiconview.h>
 #include <qpainter.h>
 #include <qregexp.h>
 #include <qtoolbutton.h>
+#include <qimage.h>
 
-class LauncherIconView : public QIconView {
+
+class BgPixmap
+{
 public:
-    QColor iconText;
-    QColor background;
+    BgPixmap( const QPixmap &p ) : pm(p), ref(1) {}
+    QPixmap pm;
+    int ref;
+};
 
+static QMap<QString,BgPixmap*> *bgCache = 0;
+
+class LauncherIconView : public QIconView {
+public:
     LauncherIconView( QWidget* parent, const char* name=0 ) :
   QIconView(parent,name),
   tf(""),
   cf(0),
-  bsy(0)
+	bsy(0),
+	bigIcns(TRUE),
+	bgColor(white)
     {
   sortmeth = Name;
   hidden.setAutoDelete(TRUE);
   ike = FALSE;
-
-  Config config( "qpe" );
-  config.setGroup( "Appearance" );
-  iconText = QColor( config.readEntry( "LauncherIconText", "#000000" ) );
-  background = QColor( config.readEntry( "LauncherBackground", "#FFFFFF" ) );
+	calculateGrid( Bottom );
     }
 
     ~LauncherIconView()
     {
@@ -72,9 +81,11 @@ public:
   }
 #endif
     }
 
+    QPixmap* busyPixmap() const { return (QPixmap*)&bpm; }
     QIconViewItem* busyItem() const { return bsy; }
+    void setBigIcons( bool bi ) { bigIcns = bi; }
 
     void updateCategoriesAndMimeTypes();
 
     void doAutoScroll()
@@ -85,8 +96,33 @@ public:
     void setBusy(bool on)
     {
   QIconViewItem *c = on ? currentItem() : 0;
   if ( bsy != c ) {
+	    if ( c ) {
+		QPixmap *src = c->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();
+		}
+		int rc, gc, bc;
+		colorGroup().highlight().rgb( &rc, &gc, &bc );
+		int ri, gi, bi;
+		for ( int r = 0; r < count; r++, rgb++ ) {
+		    int ri = (rc+qRed(*rgb))/2;
+		    int gi = (gc+qGreen(*rgb))/2;
+		    int bi = (bc+qBlue(*rgb))/2;
+		    int ai = qAlpha(*rgb);
+		    *rgb = qRgba(ri,gi,bi,ai);
+		}
+
+		bpm.convertFromImage( img );
+	    }
       QIconViewItem* o = bsy;
       bsy = c;
       if ( o ) o->repaint();
       if ( c ) c->repaint();
@@ -96,12 +132,10 @@ public:
     bool inKeyEvent() const { return ike; }
     void keyPressEvent(QKeyEvent* e)
     {
   ike = TRUE;
-  if ( e->key() == Key_F33 ) {
-      // "OK" button
+	if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space )
       returnPressed(currentItem());
-  }
   QIconView::keyPressEvent(e);
   ike = FALSE;
     }
 
@@ -127,72 +161,37 @@ public:
   //  }
   QString maj=app->type();
   int sl=maj.find('/');
   if (sl>=0) {
-      QString k = maj.left(sl);
+	    QString k;
+	    k = maj.left(12) == "application/" ? maj : maj.left(sl);
       mimes.replace(k,(void*)1);
   }
     }
 
+    void setBackgroundPixmap( const QPixmap &pm ) {
+	bgPixmap = pm;
+    }
+
+    void setBackgroundColor( const QColor &c ) {
+	bgColor = c;
+    }
+
     void drawBackground( QPainter *p, const QRect &r )
     {
-  Config config("qpe");
-  config.setGroup("Appearance");
-  QString backgroundImage = config.readEntry("BackgroundImage","launcher/opie-background");
-    //  if (backgroundImage.isNull()) backgroundImage="launcher/opie-background";
-  int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0;
-  //int backgroundMode = 2;
-
-  if ( backgroundMode == 1 ) {
-
-      // Double buffer the background
-      static QPixmap *bg = NULL;
-      static QColor bgColor;
-
-      if ( (bg == NULL) || (bgColor != colorGroup().button()) ) {
-    // Create a new background double buffer
-    if (bg == NULL)
-        bg = new QPixmap( width(), height() );
-    bgColor = colorGroup().button();
-    QPainter painter( bg );
-
-//    painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110));
-    painter.fillRect( QRect( 0, 0, width(), height() ), background);
-                // Overlay the Qtopia logo in the center
-                QImage logo;
-    if (QFile::exists(backgroundImage)) {
-                logo = QImage(backgroundImage);
+	if ( !bgPixmap.isNull() ) {
+           p->drawTiledPixmap( r, bgPixmap,
+                   QPoint( (r.x() + contentsX()) % bgPixmap.width(),
+                           (r.y() + contentsY()) % bgPixmap.height() ) );
     } else {
-    logo = Resource::loadImage(backgroundImage );
-    }
-    if ( !logo.isNull() && config.readBoolEntry( "UseBackgroundImage", TRUE ) )
-        painter.drawImage( (width() - logo.width()) / 2,
-               (height() - logo.height()) / 2, logo );
-      }
-
-      // Draw the double buffer to the widget (it is tiled for when the icon view is large)
-      p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
-            (r.y() + contentsY()) % bg->height() ) );
-  } else if ( backgroundMode == 2 ) {
-      static QPixmap *bg = 0;
-      static QColor bgColor;
-      if ( !bg || (bgColor != colorGroup().background()) ) {
-    bgColor = colorGroup().background();
-    bg = new QPixmap( width(), 9 );
-    QPainter painter( bg );
-    for ( int i = 0; i < 3; i++ ) {
-        painter.setPen( colorGroup().background().light(130) );
-        painter.drawLine( 0, i*3, width()-1, i*3 );
-        painter.drawLine( 0, i*3+1, width()-1, i*3+1 );
-        painter.setPen( colorGroup().background().light(105) );
-        painter.drawLine( 0, i*3+2, width()-1, i*3+2 );
-    }
+	    p->fillRect( r, bgColor );
       }
-      p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
-            (r.y() + contentsY()) % bg->height() ) );
-  } else {
-      p->fillRect( r, QBrush( colorGroup().background().light(110) ) );
   }
+
+    void setItemTextPos( ItemTextPos pos )
+    {
+	calculateGrid( pos );
+	QIconView::setItemTextPos( pos );
     }
 
     void hideOrShowItems(bool resort);
 
@@ -239,16 +238,41 @@ public:
   }
   return 0;
     }
 
+    QString getAllDocLinkInfo() const;
+
 protected:
 
     void styleChange( QStyle &old )
     {
   QIconView::styleChange( old );
-  //### duplicated code from LauncherView constructor
+	calculateGrid( itemTextPos() );
+    }
+
+    void calculateGrid( ItemTextPos pos )
+    {
   int dw = QApplication::desktop()->width();
-  setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240
+	int viewerWidth = dw-style().scrollBarExtent().width();
+	if ( pos == Bottom ) {
+	    int cols = 3;
+	    if ( viewerWidth <= 200 )
+		cols = 2;
+	    else if ( viewerWidth >= 400 )
+		 cols = viewerWidth/96;
+	    setSpacing( 4 );
+	    setGridX( (viewerWidth-(cols+1)*spacing())/cols );
+	    setGridY( fontMetrics().height()*2+24 );
+	} else {
+	    int cols = 2;
+	    if ( viewerWidth < 150 )
+		cols = 1;
+	    else if ( viewerWidth >= 400 )
+		 cols = viewerWidth/150;
+	    setSpacing( 2 );
+	    setGridX( (viewerWidth-(cols+1)*spacing())/cols );
+	    setGridY( fontMetrics().height()+2 );
+	}
     }
 
 private:
     QList<AppLnk> hidden;
@@ -258,9 +282,12 @@ private:
     QRegExp tf;
     int cf;
     QIconViewItem* bsy;
     bool ike;
-
+    bool bigIcns;
+    QPixmap bgPixmap;
+    QPixmap bpm;
+    QColor bgColor;
 };
 
 
 bool LauncherView::bsy=FALSE;
@@ -272,9 +299,9 @@ void LauncherView::setBusy(bool on)
 
 class LauncherItem : public QIconViewItem
 {
 public:
-    LauncherItem( QIconView *parent, AppLnk* applnk );
+    LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE );
     ~LauncherItem()
     {
   LauncherIconView* liv = (LauncherIconView*)iconView();
   if ( liv->busyItem() == this )
@@ -295,30 +322,29 @@ public:
   if ( liv->currentItem() == this ) {
       liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
       mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
   }
-  else {
-      mycg.setColor( QColorGroup::Text, liv->iconText );
-  }
-
   QIconViewItem::paintItem(p,mycg);
   if ( liv->currentItem() == this )
       liv->setItemTextBackground( oldBrush );
-  if ( liv->busyItem() == this ) {
-      static QPixmap* busypm=0;
-      if ( !busypm )
-    busypm = new QPixmap(Resource::loadPixmap("launching"));
-      p->drawPixmap(x()+(width()-busypm->width())/2, y(),*busypm);
   }
+
+    virtual QPixmap* pixmap () const
+    {
+	const LauncherIconView* liv = (LauncherIconView*)iconView();
+	if ( (const LauncherItem *)liv->busyItem() == this )
+	    return liv->busyPixmap();
+	return QIconViewItem::pixmap();
     }
 
 protected:
     AppLnk* app;
 };
 
 
-LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk )
-    : QIconViewItem( parent, applnk->name(), applnk->bigPixmap() ),
+LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
+    : QIconViewItem( parent, applnk->name(),
+           bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
   app(applnk) // Takes ownership
 {
 }
 
@@ -346,9 +372,9 @@ void LauncherIconView::addItem(AppLnk* app, bool resort)
 
     if ( (tf.isEmpty() || tf.match(app->type()) >= 0)
    && (cf == 0 || app->categories().contains(cf)
        || cf == -1 && app->categories().count() == 0 ) )
-  (void) new LauncherItem( this, app );
+	(void) new LauncherItem( this, app, bigIcns );
     else
   hidden.append(app);
     if ( resort )
   sort();
@@ -381,20 +407,19 @@ void LauncherIconView::hideOrShowItems(bool resort)
     while (item) {
   links.append(item->takeAppLnk());
   item = (LauncherItem*)item->nextItem();
     }
-    bool oldAutoArrange = autoArrange();
-    setAutoArrange( FALSE );
+    viewport()->setUpdatesEnabled( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
   addItem(l,FALSE);
   ++it;
     }
-    if ( resort )
+    viewport()->setUpdatesEnabled( TRUE );
+    if ( resort && !autoArrange() )
   sort();
-    setAutoArrange( oldAutoArrange );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
@@ -403,43 +428,100 @@ bool LauncherIconView::removeLink(const QString& linkfile)
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
   l = item->appLnk();
-  if (  l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
+	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();
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
   ++it;
-  if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
+	if ( l->linkFileKnown() && l->linkFile() == linkfile
+		|| l->file() == linkfile
+		|| dl.isValid() && dl.file() == l->file() ) {
       hidden.removeRef(l);
      did = TRUE;
   }
     }
     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 )
 {
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
 
-    int dw = QApplication::desktop()->width();
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
-    icons->setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240
-    icons->setGridY( fontMetrics().height()*2+24 );
     icons->setFrameStyle( QFrame::NoFrame );
-    icons->setSpacing( 4 );
     icons->setMargin( 0 );
-    icons->setSelectionMode( QIconView::Multi );
+    icons->setSelectionMode( QIconView::NoSelection );
     icons->setBackgroundMode( PaletteBase );
+    icons->setResizeMode( QIconView::Fixed );
+    vmode = (ViewMode)-1;
+    setViewMode( Icon );
 
     connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)),
        SLOT(itemClicked(int, QIconViewItem *)) );
     connect( icons, SIGNAL(selectionChanged()),
@@ -449,8 +531,9 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
        SLOT(itemPressed(int, QIconViewItem *)) );
 
     tools = 0;
+    setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
 {
@@ -462,15 +545,12 @@ void LauncherView::setToolsEnabled(bool y)
   if ( y ) {
       tools = new QHBox(this);
 
       // Type filter
-      typemb = new MenuButton(tools);
-      typemb->setLabel(tr("Type: %1"));
-      typemb->setFixedHeight ( 20 );
+	    typemb = new QComboBox(tools);
 
       // Category filter
       catmb = new CategorySelect(tools);
-      catmb->setFixedHeight ( 20 );
 
       updateTools();
       tools->show();
   } else {
@@ -481,10 +561,10 @@ void LauncherView::setToolsEnabled(bool y)
 }
 
 void LauncherView::updateTools()
 {
-    disconnect( typemb, SIGNAL(selected(const QString&)),
-          this, SLOT(showType(const QString&)) );
+    disconnect( typemb, SIGNAL(activated(int)),
+	        this, SLOT(showType(int)) );
     disconnect( catmb, SIGNAL(signalSelected(int)),
           this, SLOT(showCategory(int)) );
 
     icons->updateCategoriesAndMimeTypes();
@@ -492,46 +572,183 @@ void LauncherView::updateTools()
     QString prev;
 
     // Type filter
     QStringList types;
-    types << tr("All");
-    types << "--";
-    types += icons->mimeTypes();
+    typelist = icons->mimeTypes();
+    for (QStringList::ConstIterator it = typelist.begin(); it!=typelist.end(); ++it) {
+	QString t = *it;
+	if ( t.left(12) == "application/" ) {
+	    MimeType mt(t);
+	    const AppLnk* app = mt.application();
+	    if ( app )
+		t = app->name();
+	    else
+		t = t.mid(12);
+	} else {
+	    t[0] = t[0].upper();
+	}
+	types += tr("%1 files").arg(t);
+    }
+    types << tr("All types of file");
     prev = typemb->currentText();
     typemb->clear();
-    typemb->insertItems(types);
-    typemb->select(prev);
+    typemb->insertStringList(types);
+    for (int i=0; i<typemb->count(); i++) {
+	if ( typemb->text(i) == prev ) {
+	    typemb->setCurrentItem(i);
+	    break;
+	}
+    }
+    if ( prev.isNull() )
+	typemb->setCurrentItem(typemb->count()-1);
 
     Categories cats( 0 );
     cats.load( categoryFileName() );
     QArray<int> vl( 0 );
-    catmb->setCategories( vl, "Document View", tr("Document View") );
+    catmb->setCategories( vl, "Document View", // No tr
+	tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
 
-    connect(typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&)));
+    connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
 }
 
 void LauncherView::sortBy(int s)
 {
     icons->setSortMethod((LauncherIconView::SortMethod)s);
 }
 
-void LauncherView::showType(const QString& t)
+void LauncherView::showType(int t)
 {
-    if ( t == tr("All") ) {
+    if ( t >= (int)typelist.count() ) {
   icons->setTypeFilter("",TRUE);
     } else {
-  icons->setTypeFilter(t+"/*",TRUE);
+	QString ty = typelist[t];
+	if ( !ty.contains('/') )
+	    ty += "/*";
+	icons->setTypeFilter(ty,TRUE);
     }
 }
 
 void LauncherView::showCategory( int c )
 {
     icons->setCategoryFilter( c, TRUE );
 }
 
+void LauncherView::setViewMode( ViewMode m )
+{
+    if ( vmode != m ) {
+	bool bigIcons = m == Icon;
+	icons->viewport()->setUpdatesEnabled( FALSE );
+	icons->setBigIcons( bigIcons );
+	switch ( m ) {
+	    case List:
+		icons->setItemTextPos( QIconView::Right );
+		break;
+	    case Icon:
+		icons->setItemTextPos( QIconView::Bottom );
+		break;
+	}
+	icons->hideOrShowItems( FALSE );
+	icons->viewport()->setUpdatesEnabled( TRUE );
+	vmode = m;
+    }
+}
+
+void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
+{
+    if ( !bgCache )
+	bgCache = new QMap<QString,BgPixmap*>;
+    if ( bgCache->contains( bgName ) )
+	(*bgCache)[bgName]->ref--;
+
+    switch ( t ) {
+	case Ruled: {
+	    bgName = QString("Ruled_%1").arg(colorGroup().background().name()); // No tr
+	    QPixmap bg;
+	    if ( bgCache->contains( bgName ) ) {
+		(*bgCache)[bgName]->ref++;
+		bg = (*bgCache)[bgName]->pm;
+	    } else {
+		bg.resize( width(), 9 );
+		QPainter painter( &bg );
+		for ( int i = 0; i < 3; i++ ) {
+		    painter.setPen( white );
+		    painter.drawLine( 0, i*3, width()-1, i*3 );
+		    painter.drawLine( 0, i*3+1, width()-1, i*3+1 );
+		    painter.setPen( colorGroup().background().light(105) );
+		    painter.drawLine( 0, i*3+2, width()-1, i*3+2 );
+		}
+		painter.end();
+		bgCache->insert( bgName, new BgPixmap(bg) );
+	    }
+	    icons->setBackgroundPixmap( bg );
+	    break;
+	}
+
+	case SolidColor:
+	    icons->setBackgroundPixmap( QPixmap() );
+	    if ( val.isEmpty() ) {
+		icons->setBackgroundColor( colorGroup().base() );
+	    } else {
+		icons->setBackgroundColor( val );
+	    }
+	    bgName = "";
+	    break;
+
+	case Image:
+	    bgName = val;
+	    if ( bgCache->contains( bgName ) ) {
+		(*bgCache)[bgName]->ref++;
+		icons->setBackgroundPixmap( (*bgCache)[bgName]->pm );
+	    } else {
+		qDebug( "Loading image: %s", val.latin1() );
+		QPixmap bg( Resource::loadPixmap( "wallpaper/" + val ) );
+		if ( bg.isNull() ) {
+		    QImageIO imgio;
+		    imgio.setFileName( bgName );
+		    QSize ds = qApp->desktop()->size();
+		    QString param( "Scale( %1, %2, ScaleMin )" ); // No tr
+		    imgio.setParameters( param.arg(ds.width()).arg(ds.height()).latin1() );
+		    imgio.read();
+		    bg = imgio.image();
+		}
+		bgCache->insert( bgName, new BgPixmap(bg) );
+		icons->setBackgroundPixmap( bg );
+	    }
+	    break;
+    }
+
+    // remove unreferenced backgrounds.
+    QMap<QString,BgPixmap*>::Iterator it = bgCache->begin();
+    while ( it != bgCache->end() ) {
+	QMap<QString,BgPixmap*>::Iterator curr = it;
+	++it;
+	if ( (*curr)->ref == 0 ) {
+	    delete (*curr);
+	    bgCache->remove( curr );
+	}
+    }
+
+    bgType = t;
+    icons->viewport()->update();
+}
+
+void LauncherView::setTextColor( const QColor &tc )
+{
+    textCol = tc;
+    QColorGroup cg = icons->colorGroup();
+    cg.setColor( QColorGroup::Text, tc );
+    icons->setPalette( QPalette(cg,cg,cg) );
+    icons->viewport()->update();
+}
+
+void LauncherView::setViewFont( const QFont &f )
+{
+    icons->setFont( f );
+}
+
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
     QVBox::resizeEvent( e );
     if ( e->size().width() != e->oldSize().width() )
@@ -543,8 +760,13 @@ void LauncherView::populate( AppLnkSet *folder, const QString& typefilter )
     icons->clear();
     internalPopulate( folder, typefilter );
 }
 
+QString LauncherView::getAllDocLinkInfo() const
+{
+    return icons->getAllDocLinkInfo();
+}
+
 void LauncherView::selectionChanged()
 {
     QIconViewItem* item = icons->currentItem();
     if ( item && item->isSelected() ) {
@@ -596,17 +818,15 @@ void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilte
     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")
-  {
+	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
   }
-      else
-  {
-    icons->addItem(*it,FALSE);
-  }
   ++it;
     }
 
     icons->sort();
@@ -630,4 +850,16 @@ void LauncherView::addItem(AppLnk* app, bool resort)
 void LauncherView::setFileSystems(const QList<FileSystem> &)
 {
     // ### does nothing now...
 }
+
+void LauncherView::paletteChange( const QPalette &p )
+{
+    icons->unsetPalette();
+    QVBox::paletteChange( p );
+    if ( bgType == Ruled )
+	setBackgroundType( Ruled, QString::null );
+    QColorGroup cg = icons->colorGroup();
+    cg.setColor( QColorGroup::Text, textCol );
+    icons->setPalette( QPalette(cg,cg,cg) );
+}
+
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 3aaef7e..2fb37b6 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -1,8 +1,8 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -30,8 +30,9 @@ class CategorySelect;
 class LauncherIconView;
 class QIconView;
 class QIconViewItem;
 class MenuButton;
+class QComboBox;
 
 class LauncherView : public QVBox
 {
     Q_OBJECT
@@ -49,8 +50,22 @@ public:
     void updateTools();
 
     void setBusy(bool);
 
+    QString getAllDocLinkInfo() const;
+    enum ViewMode { Icon, List };
+    void setViewMode( ViewMode m );
+    ViewMode viewMode() const { return vmode; }
+
+    enum BackgroundType { Ruled, SolidColor, Image };
+    void setBackgroundType( BackgroundType t, const QString & );
+    BackgroundType backgroundType() const { return bgType; }
+
+    void setTextColor( const QColor & );
+    QColor textColor() const { return textCol; }
+
+    void setViewFont( const QFont & );
+
 public slots:
     void populate( AppLnkSet *folder, const QString& categoryfilter );
 
 signals:
@@ -62,20 +77,26 @@ protected slots:
     void returnPressed( QIconViewItem *item );
     void itemClicked( int, QIconViewItem * );
     void itemPressed( int, QIconViewItem * );
     void sortBy(int);
-    void showType(const QString&);
+    void showType(int);
     void showCategory( int );
     void resizeEvent(QResizeEvent *);
 
 protected:
     void internalPopulate( AppLnkSet *, const QString& categoryfilter );
+    void paletteChange( const QPalette & );
 
 private:
     static bool bsy;
     QWidget* tools;
     LauncherIconView* icons;
-    MenuButton *typemb;
+    QComboBox *typemb;
+    QStringList typelist;
     CategorySelect *catmb;
+    ViewMode vmode;
+    BackgroundType bgType;
+    QString bgName;
+    QColor textCol;
 };
 
 #endif // LAUNCHERVIEW_H