Qtopia 1.6 merge:

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

1 files changed, 501 insertions, 269 deletions

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,7 +1,7 @@
 /**********************************************************************
-** 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
@@ -23,14 +23,16 @@
 #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>
@@ -39,70 +41,102 @@
 #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)
+	QIconView(parent,name),
+	tf(""),
+	cf(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" ) );
+	sortmeth = Name;
+	hidden.setAutoDelete(TRUE);
+	ike = FALSE;
+	calculateGrid( Bottom );
     }
 
     ~LauncherIconView()
     {
 #if 0 // debuggery
-  QListIterator<AppLnk> it(hidden);
-  AppLnk* l;
-  while ((l=it.current())) {
-      ++it;
-      //qDebug("%p: hidden (should remove)",l);
-  }
+	QListIterator<AppLnk> it(hidden);
+	AppLnk* l;
+	while ((l=it.current())) {
+	    ++it;
+	    //qDebug("%p: hidden (should remove)",l);
+	}
 #endif
     }
 
+    QPixmap* busyPixmap() const { return (QPixmap*)&bpm; }
     QIconViewItem* busyItem() const { return bsy; }
+    void setBigIcons( bool bi ) { bigIcns = bi; }
 
     void updateCategoriesAndMimeTypes();
 
     void doAutoScroll()
     {
-  // We don't want rubberbanding (yet)
+	// We don't want rubberbanding (yet)
     }
 
     void setBusy(bool on)
     {
-  QIconViewItem *c = on ? currentItem() : 0;
-  if ( bsy != c ) {
-      QIconViewItem* o = bsy;
-      bsy = c;
-      if ( o ) o->repaint();
-      if ( c ) c->repaint();
-  }
+	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();
+	}
     }
 
     bool inKeyEvent() const { return ike; }
     void keyPressEvent(QKeyEvent* e)
     {
-  ike = TRUE;
-  if ( e->key() == Key_F33 ) {
-      // "OK" button
-      returnPressed(currentItem());
-  }
-  QIconView::keyPressEvent(e);
-  ike = FALSE;
+	ike = TRUE;
+	if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space )
+	    returnPressed(currentItem());
+	QIconView::keyPressEvent(e);
+	ike = FALSE;
     }
 
     void addItem(AppLnk* app, bool resort=TRUE);
@@ -113,141 +147,131 @@ public:
 
     void clear()
     {
-  mimes.clear();
-  cats.clear();
-  QIconView::clear();
-  hidden.clear();
+	mimes.clear();
+	cats.clear();
+	QIconView::clear();
+	hidden.clear();
     }
 
     void addCatsAndMimes(AppLnk* app)
     {
-  //  QStringList c = app->categories();
-  //  for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
-  //      cats.replace(*cit,(void*)1);
-  //  }
-  QString maj=app->type();
-  int sl=maj.find('/');
-  if (sl>=0) {
-      QString k = maj.left(sl);
-      mimes.replace(k,(void*)1);
-  }
+	// 	QStringList c = app->categories();
+	// 	for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
+	// 	    cats.replace(*cit,(void*)1);
+	// 	}
+	QString maj=app->type();
+	int sl=maj.find('/');
+	if (sl>=0) {
+	    QString k;
+	    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);
-    } 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->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
-            (r.y() + contentsY()) % bg->height() ) );
-  } else {
-      p->fillRect( r, QBrush( colorGroup().background().light(110) ) );
-  }
+	if ( !bgPixmap.isNull() ) {
+           p->drawTiledPixmap( r, bgPixmap,
+                   QPoint( (r.x() + contentsX()) % bgPixmap.width(),
+                           (r.y() + contentsY()) % bgPixmap.height() ) );
+	} else {
+	    p->fillRect( r, bgColor );
+	}
+    }
+
+    void setItemTextPos( ItemTextPos pos )
+    {
+	calculateGrid( pos );
+	QIconView::setItemTextPos( pos );
     }
 
     void hideOrShowItems(bool resort);
 
     void setTypeFilter(const QString& typefilter, bool resort)
     {
-  tf = QRegExp(typefilter,FALSE,TRUE);
-  hideOrShowItems(resort);
+	tf = QRegExp(typefilter,FALSE,TRUE);
+	hideOrShowItems(resort);
     }
 
     void setCategoryFilter( int catfilter, bool resort )
     {
-  Categories cat;
-  cat.load( categoryFileName() );
-  QString str;
-  if ( catfilter == -2 )
-      cf = 0;
-  else
-      cf = catfilter;
-  hideOrShowItems(resort);
+	Categories cat;
+	cat.load( categoryFileName() );
+	QString str;
+	if ( catfilter == -2 )
+	    cf = 0;
+	else
+	    cf = catfilter;
+	hideOrShowItems(resort);
     }
 
     enum SortMethod { Name, Date, Type };
 
     void setSortMethod( SortMethod m )
     {
-  if ( sortmeth != m ) {
-      sortmeth = m;
-      sort();
-  }
+	if ( sortmeth != m ) {
+	    sortmeth = m;
+	    sort();
+	}
     }
 
     int compare(const AppLnk* a, const AppLnk* b)
     {
-  switch (sortmeth) {
-  case Name:
-      return a->name().compare(b->name());
-  case Date: {
-      QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
-      QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
-      return fa.lastModified().secsTo(fb.lastModified());
-  }
-  case Type:
-      return a->type().compare(b->type());
-  }
-  return 0;
+	switch (sortmeth) {
+	case Name:
+	    return a->name().compare(b->name());
+	case Date: {
+	    QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+	    QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
+	    return fa.lastModified().secsTo(fb.lastModified());
+	}
+	case Type:
+	    return a->type().compare(b->type());
+	}
+	return 0;
     }
 
+    QString getAllDocLinkInfo() const;
+
 protected:
 
     void styleChange( QStyle &old )
     {
-  QIconView::styleChange( old );
-  //### duplicated code from LauncherView constructor
-  int dw = QApplication::desktop()->width();
-  setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240
+	QIconView::styleChange( old );
+	calculateGrid( itemTextPos() );
+    }
+
+    void calculateGrid( ItemTextPos pos )
+    {
+	int dw = QApplication::desktop()->width();
+	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:
@@ -259,7 +283,10 @@ private:
     int cf;
     QIconViewItem* bsy;
     bool ike;
-
+    bool bigIcns;
+    QPixmap bgPixmap;
+    QPixmap bpm;
+    QColor bgColor;
 };
 
 
@@ -273,13 +300,13 @@ 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 )
-      liv->setBusy(FALSE);
-  delete app;
+	LauncherIconView* liv = (LauncherIconView*)iconView();
+	if ( liv->busyItem() == this )
+	    liv->setBusy(FALSE);
+	delete app;
     }
 
     AppLnk* appLnk() const { return app; }
@@ -289,26 +316,24 @@ public:
 
     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 ) );
-  }
-  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);
-  }
+	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 );
+    }
+
+    virtual QPixmap* pixmap () const
+    {
+	const LauncherIconView* liv = (LauncherIconView*)iconView();
+	if ( (const LauncherItem *)liv->busyItem() == this )
+	    return liv->busyPixmap();
+	return QIconViewItem::pixmap();
     }
 
 protected:
@@ -316,9 +341,10 @@ protected:
 };
 
 
-LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk )
-    : QIconViewItem( parent, applnk->name(), applnk->bigPixmap() ),
-  app(applnk) // Takes ownership
+LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
+    : QIconViewItem( parent, applnk->name(),
+           bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
+	app(applnk) // Takes ownership
 {
 }
 
@@ -333,8 +359,8 @@ QStringList LauncherIconView::mimeTypes() const
     QStringList r;
     QDictIterator<void> it(mimes);
     while (it.current()) {
-  r.append(it.currentKey());
-  ++it;
+	r.append(it.currentKey());
+	++it;
     }
     r.sort();
     return r;
@@ -345,13 +371,13 @@ void LauncherIconView::addItem(AppLnk* app, bool resort)
     addCatsAndMimes(app);
 
     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 );
+	 && (cf == 0 || app->categories().contains(cf)
+	     || cf == -1 && app->categories().count() == 0 ) )
+	(void) new LauncherItem( this, app, bigIcns );
     else
-  hidden.append(app);
+	hidden.append(app);
     if ( resort )
-  sort();
+	sort();
 }
 
 void LauncherIconView::updateCategoriesAndMimeTypes()
@@ -360,14 +386,14 @@ void LauncherIconView::updateCategoriesAndMimeTypes()
     cats.clear();
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
-  addCatsAndMimes(item->appLnk());
-  item = (LauncherItem*)item->nextItem();
+	addCatsAndMimes(item->appLnk());
+	item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
-  addCatsAndMimes(l);
-  ++it;
+	addCatsAndMimes(l);
+	++it;
     }
 }
 
@@ -379,21 +405,20 @@ void LauncherIconView::hideOrShowItems(bool resort)
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
-  links.append(item->takeAppLnk());
-  item = (LauncherItem*)item->nextItem();
+	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;
+	addItem(l,FALSE);
+	++it;
     }
-    if ( resort )
-  sort();
-    setAutoArrange( oldAutoArrange );
+    viewport()->setUpdatesEnabled( TRUE );
+    if ( resort && !autoArrange() )
+	sort();
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
@@ -403,24 +428,82 @@ 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()*/ ) {
-      delete item;
-      did = TRUE;
-  }
-  item = (LauncherItem*)item->nextItem();
+	l = item->appLnk();
+	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()*/ ) {
-      hidden.removeRef(l);
-     did = TRUE;
-  }
+	++it;
+	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 )
 {
@@ -428,28 +511,28 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     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 *)) );
+		   SLOT(itemClicked(int, QIconViewItem *)) );
     connect( icons, SIGNAL(selectionChanged()),
-       SLOT(selectionChanged()) );
+		   SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem *)),
-       SLOT(returnPressed(QIconViewItem *)) );
+		   SLOT(returnPressed(QIconViewItem *)) );
     connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
-       SLOT(itemPressed(int, QIconViewItem *)) );
+		   SLOT(itemPressed(int, QIconViewItem *)) );
 
     tools = 0;
+    setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
@@ -459,33 +542,30 @@ LauncherView::~LauncherView()
 void LauncherView::setToolsEnabled(bool y)
 {
     if ( !y != !tools ) {
-  if ( y ) {
-      tools = new QHBox(this);
+	if ( y ) {
+	    tools = new QHBox(this);
 
-      // Type filter
-      typemb = new MenuButton(tools);
-      typemb->setLabel(tr("Type: %1"));
-      typemb->setFixedHeight ( 20 );
+	    // Type filter
+	    typemb = new QComboBox(tools);
 
-      // Category filter
-      catmb = new CategorySelect(tools);
-      catmb->setFixedHeight ( 20 );
+	    // Category filter
+	    catmb = new CategorySelect(tools);
 
-      updateTools();
-      tools->show();
-  } else {
-      delete tools;
-      tools = 0;
-  }
+	    updateTools();
+	    tools->show();
+	} else {
+	    delete tools;
+	    tools = 0;
+	}
     }
 }
 
 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)) );
+	        this, SLOT(showCategory(int)) );
 
     icons->updateCategoriesAndMimeTypes();
 
@@ -493,22 +573,43 @@ void LauncherView::updateTools()
 
     // 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)));
 }
 
@@ -517,12 +618,15 @@ 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") ) {
-  icons->setTypeFilter("",TRUE);
+    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);
     }
 }
 
@@ -531,11 +635,124 @@ 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() )
-  sort();
+	sort();
 }
 
 void LauncherView::populate( AppLnkSet *folder, const QString& typefilter )
@@ -544,49 +761,54 @@ void LauncherView::populate( AppLnkSet *folder, const QString& typefilter )
     internalPopulate( folder, typefilter );
 }
 
+QString LauncherView::getAllDocLinkInfo() const
+{
+    return icons->getAllDocLinkInfo();
+}
+
 void LauncherView::selectionChanged()
 {
     QIconViewItem* item = icons->currentItem();
     if ( item && item->isSelected() ) {
-  AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
-  if ( icons->inKeyEvent() ) // not for mouse press
-      emit clicked( appLnk );
-  item->setSelected(FALSE);
+	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+	if ( icons->inKeyEvent() ) // not for mouse press
+	    emit clicked( appLnk );
+	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::returnPressed( QIconViewItem *item )
 {
     if ( item ) {
-  AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
-  emit clicked( appLnk );
+	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+	emit clicked( appLnk );
     }
 }
 
 void LauncherView::itemClicked( int btn, QIconViewItem *item )
 {
     if ( item ) {
-  AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
-  if ( btn == LeftButton ) {
-      // Make sure it's the item we execute that gets highlighted
-      icons->setCurrentItem( item );
-      emit clicked( appLnk );
-  }
-  item->setSelected(FALSE);
+	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+	if ( btn == LeftButton ) {
+	    // Make sure it's the item we execute that gets highlighted
+	    icons->setCurrentItem( item );
+	    emit clicked( appLnk );
+	}
+	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::itemPressed( int btn, QIconViewItem *item )
 {
     if ( item ) {
-  AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
-  if ( btn == RightButton )
-      emit rightPressed( appLnk );
+	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+	if ( btn == RightButton )
+	    emit rightPressed( appLnk );
 /*
-  else if ( btn == LeftButton )
-      emit clicked( appLnk );
+	else if ( btn == LeftButton )
+	    emit clicked( appLnk );
 */
-  item->setSelected(FALSE);
+	item->setSelected(FALSE);
     }
 }
 
@@ -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")
-  {
-    //maybe insert some .desktop file deletion code later
-    //maybe dir specific
-  }
-      else
-  {
-    icons->addItem(*it,FALSE);
-  }
-  ++it;
+	// 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();
@@ -631,3 +851,15 @@ 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) );
+}
+