launcher side enhancements to support the "use global font" option from

launcher-settings

3 files changed, 9 insertions, 0 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 5a9ee1b..767efb2 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -406,845 +406,848 @@ void CategoryTabBar::layoutTabs()
     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
 {
     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 );
     }
 }
 
 
 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( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl )
 {
     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;
 
     int stamp = uidgen.generate(); // this is our timestamp to see which devices we know
     //uidgen.store( stamp );
     m_timeStamp = QString::number( stamp  );
 
     tabs = new CategoryTabWidget( this );
     tabs->setMaximumWidth( qApp->desktop()->width() );
     setCentralWidget( tabs );
 
     connect( tabs, SIGNAL(selected(const QString&)),
 	this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
 	this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
 	this, SLOT(properties(AppLnk*)));
 
 #if !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();
 
     preloadApps();
 
     in_lnk_props = FALSE;
     got_lnk_change = FALSE;
 }
 
 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()
 {
     if ( isVisibleWindow( winId() ) )
 	doMaximize();
     else
 	QTimer::singleShot( 20, this, SLOT(doMaximize()) );
 }
 
 void Launcher::doMaximize()
 {
     QMainWindow::showMaximized();
 }
 
 void Launcher::updateMimeTypes()
 {
     MimeType::clear();
     updateMimeTypes(rootFolder);
 }
 
 void Launcher::updateMimeTypes(AppLnkSet* folder)
 {
     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);
 	}
     }
 }
 
 /** 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::
 {
     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 ) )
       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
       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);
 	  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();
 	      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
 	      tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
 	      docsFolder->appendFrom( *tmp );
 	      delete tmp;
 	    }
 	  }
 	}
        }
     }
     m_timeStamp = newStamp;
 }
 
 void Launcher::updateTabs()
 {
     MimeType::updateApplications(); // ### reads all applnks twice
 
     delete rootFolder;
     rootFolder = new AppLnkSet( MimeType::appsFolderName() );
 
     loadDocs();
 
     tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems());
 }
 
 void Launcher::updateDocs()
 {
     loadDocs();
     tabs->updateDocs(docsFolder,storage->fileSystems());
 }
 
 void Launcher::viewSelected(const QString& s)
 {
     setCaption( s + tr(" - Launcher") );
 }
 
 void Launcher::nextView()
 {
     tabs->nextTab();
 }
 
 
 void Launcher::select( const AppLnk *appLnk )
 {
     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"),
 		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();
     }
 }
 
 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
     } 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);
 	}
     }
 }
 
 void Launcher::updateLink(const QString& link)
 {
     if (link.isNull())
 	updateTabs();
     else if (link.isEmpty())
 	updateDocs();
     else
 	tabs->updateLink(link);
 }
 
 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();
     } 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 {
         }
     }
     /*
      * 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();
 
 	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
     }
 }
 
 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) )
+	    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);
     }
 }
 
 void Launcher::storageChanged()
 {
     if ( in_lnk_props ) {
 	got_lnk_change = TRUE;
 	lnk_change = QString::null;
     } else {
 	updateLink( QString::null );
     }
 }
 
 
 bool Launcher::mkdir(const QString &localPath)
 {
     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();
     }
 
     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;
 	    }
 	}
 
     }
     return TRUE;
 }
 
 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/launcherview.cpp b/core/launcher/launcherview.cpp
index 9fc4565..2a051a6 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -85,892 +85,897 @@ public:
 	    ++it;
 	    //qDebug("%p: hidden (should remove)",l);
 	}
 #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; }
 
     void updateCategoriesAndMimeTypes();
 
     void doAutoScroll()
     {
 	// We don't want rubberbanding (yet)
     }
 
     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 );
 		    }
 
 		    bpm [i].convertFromImage( img );
 		}
 		    
 		if ( busyType == BIT_Blinking ) {
 		    busystate = 0;	
 		    busytimer = startTimer ( 200 );
 		}
 		else {		    
 		    busystate = 3;
 		}
 		timerEvent ( 0 );
 	    }
 	}
     }
 
     virtual void timerEvent ( QTimerEvent *te )
     {
 	if ( !te || ( te-> timerId ( ) == busytimer )) {
 	    if ( bsy ) {
 		busystate++;
 		if ( busystate > 5 )
 			busystate = -4;
 			
 		QScrollView::updateContents ( bsy-> pixmapRect ( false ));
 	    }
 	}
     }
 
     bool inKeyEvent() const { return ike; }
     void keyPressEvent(QKeyEvent* e)
     {
 	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);
     bool removeLink(const QString& linkfile);
 
     QStringList mimeTypes() const;
     QStringList categories() const;
 
     void clear()
     {
 	mimes.clear();
 	cats.clear();
 	QIconView::clear();
 	hidden.clear();
     }
 
     void addCatsAndMimes(AppLnk* app)
     {
 	// 	QStringList c = app->categories();
 	// 	for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
 	// 	    cats.replace(*cit,(void*)1);
 	// 	}
 	QString maj=app->type();
 	int sl=maj.find('/');
 	if (sl>=0) {
 	    QString k;
 	    k = maj.left(12) == "application/" ? maj : maj.left(sl);
 	    mimes.replace(k,(void*)1);
 	}
     }
 
     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;
 	}
     }
 
     void setBackgroundColor( const QColor &c ) {
 	bgColor = c;
     }
 
     void drawBackground( QPainter *p, const QRect &r )
     {
 	if ( !bgPixmap.isNull() ) {
 	    //p-> fillRect ( r, bgColor );
 	    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);
     }
 
     void setCategoryFilter( int catfilter, bool 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();
 	}
     }
 
     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;
     }
 
     QString getAllDocLinkInfo() const;
 
 protected:
 
     void styleChange( QStyle &old )
     {
 	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 );
 	}
     }
 
 
     // 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;
     QDict<void> cats;
     SortMethod sortmeth;
     QRegExp tf;
     int cf;
     QIconViewItem* bsy;
     bool ike;
     bool bigIcns;
     QPixmap bgPixmap;
     QPixmap bpm [6];
     QColor bgColor;
     int busytimer;
     int busystate;
     BusyIndicatorType busyType;
 };
 
 
 bool LauncherView::bsy=FALSE;
 
 void LauncherView::setBusy(bool on)
 {
     icons->setBusy(on);
 }
 
 class LauncherItem : public QIconViewItem
 {
 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; }
 
     virtual int compare ( QIconViewItem * i ) const;
 
     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 );
     }
 
     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, bool bigIcon )
     : QIconViewItem( parent, applnk->name(),
            bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
 	app(applnk) // Takes ownership
 {
 }
 
 int LauncherItem::compare ( QIconViewItem * i ) const
 {
     LauncherIconView* view = (LauncherIconView*)iconView();
     return view->compare(app,((LauncherItem *)i)->appLnk());
 }
 
 QStringList LauncherIconView::mimeTypes() const
 {
     QStringList r;
     QDictIterator<void> it(mimes);
     while (it.current()) {
 	r.append(it.currentKey());
 	++it;
     }
     r.sort();
     return r;
 }
 
 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, bigIcns );
     else
 	hidden.append(app);
     if ( resort )
 	sort();
 }
 
 void LauncherIconView::updateCategoriesAndMimeTypes()
 {
     mimes.clear();
     cats.clear();
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
 	addCatsAndMimes(item->appLnk());
 	item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
 	addCatsAndMimes(l);
 	++it;
     }
 }
 
 void LauncherIconView::hideOrShowItems(bool resort)
 {
     hidden.setAutoDelete(FALSE);
     QList<AppLnk> links=hidden;
     hidden.clear();
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
 	links.append(item->takeAppLnk());
 	item = (LauncherItem*)item->nextItem();
     }
     viewport()->setUpdatesEnabled( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
 	addItem(l,FALSE);
 	++it;
     }
     viewport()->setUpdatesEnabled( TRUE );
     if ( resort && !autoArrange() )
 	sort();
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     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() )) ) {
 	    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.fileKnown() && ( 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 );
 
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setMargin( 0 );
     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()),
 		   SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem *)),
 		   SLOT(returnPressed(QIconViewItem *)) );
     connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
 		   SLOT(itemPressed(int, QIconViewItem *)) );
 
     tools = 0;
     setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
 {
 }
 
 void LauncherView::setToolsEnabled(bool y)
 {
     if ( !y != !tools ) {
 	if ( y ) {
 	    tools = new QHBox(this);
 
 	    // Type filter
 	    typemb = new QComboBox(tools);
 
 	    // Category filter
 	    catmb = new CategorySelect(tools);
 
 	    updateTools();
 	    tools->show();
 	} else {
 	    delete tools;
 	    tools = 0;
 	}
     }
 }
 
 void LauncherView::updateTools()
 {
     disconnect( typemb, SIGNAL(activated(int)),
 	        this, SLOT(showType(int)) );
     disconnect( catmb, SIGNAL(signalSelected(int)),
 	        this, SLOT(showCategory(int)) );
 
     icons->updateCategoriesAndMimeTypes();
 
     QString prev;
 
     // Type filter
     QStringList types;
     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->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", // No tr
 	tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
 
     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(int t)
 {
     if ( t >= (int)typelist.count() ) {
 	icons->setTypeFilter("",TRUE);
     } else {
 	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( 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::unsetViewFont( )
+{
+    icons->unsetFont( );
+}
+
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
     QVBox::resizeEvent( e );
     if ( e->size().width() != e->oldSize().width() )
 	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();
     if ( item && item->isSelected() ) {
 	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 );
     }
 }
 
 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);
     }
 }
 
 void LauncherView::itemPressed( int btn, QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( btn == RightButton )
 	    emit rightPressed( appLnk );
 /*
 	else if ( btn == LeftButton )
 	    emit clicked( appLnk );
 */
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter )
 {
     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();
 }
 
 bool LauncherView::removeLink(const QString& linkfile)
 {
     return icons->removeLink(linkfile);
 }
 
 void LauncherView::sort()
 {
     icons->sort();
 }
 
 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();
     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) );
 }
 
 
 void LauncherView::setBusyIndicatorType ( const QString &type )
 {
     if ( type. lower ( ) == "blink" )
 	icons-> setBusyIndicatorType ( BIT_Blinking );
     else
 	icons-> setBusyIndicatorType ( BIT_Normal );
 }
 
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 194e4a2..82a319b 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -1,105 +1,106 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** 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
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef LAUNCHERVIEW_H
 #define LAUNCHERVIEW_H
 
 #include <qpe/storage.h>
 
 #include <qvbox.h>
 
 class AppLnk;
 class AppLnkSet;
 class CategorySelect;
 class LauncherIconView;
 class QIconView;
 class QIconViewItem;
 class MenuButton;
 class QComboBox;
 
 class LauncherView : public QVBox
 {
     Q_OBJECT
 
 public:
     LauncherView( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~LauncherView();
 
     bool removeLink(const QString& linkfile);
     void addItem(AppLnk* app, bool resort=TRUE);
     void sort();
 
     void setFileSystems(const QList<FileSystem> &);
     void setToolsEnabled(bool);
     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 & );
+    void unsetViewFont ( );
 
     void setBusyIndicatorType ( const QString &type );
 
 public slots:
     void populate( AppLnkSet *folder, const QString& categoryfilter );
 
 signals:
     void clicked( const AppLnk * );
     void rightPressed( AppLnk * );
 
 protected slots:
     void selectionChanged();
     void returnPressed( QIconViewItem *item );
     void itemClicked( int, QIconViewItem * );
     void itemPressed( int, QIconViewItem * );
     void sortBy(int);
     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;
     QComboBox *typemb;
     QStringList typelist;
     CategorySelect *catmb;
     ViewMode vmode;
     BackgroundType bgType;
     QString bgName;
     QColor textCol;
     int busyType;
 };
 
 #endif // LAUNCHERVIEW_H