Merge from BRANCH_1_0

13 files changed, 652 insertions, 664 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 480d261..078ce8d 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -93,76 +93,66 @@ void BatteryMeter::timerEvent( QTimerEvent * )
         chargeTimer->start( 500 );
     } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) {
         charging = false;
         chargeTimer->stop();
         if ( batteryView )
         batteryView->updatePercent( percent );
     }
     repaint( style != 0 );
     if ( batteryView )
         batteryView->repaint();
     }
 }
 
 void BatteryMeter::chargeTimeout()
 {
     percent += 20;
     if ( percent > 100 )
 	percent = 0;
 
     repaint(FALSE);
     if ( batteryView )
 	batteryView->updatePercent( percent );
 }
 
 void BatteryMeter::paintEvent( QPaintEvent* )
 {
     if ( style == 1 )
     {
         QPainter p(this);
         QFont f( "Fixed", AppLnk::smallIconSize()/2 );
         QFontMetrics fm( f );
         p.setFont( f );
-        if ( percent > 98 ) {
-            p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "F" ) );
-        }
-        else if ( percent < 5 )
-        {
-            p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "E" ) );
-        }
-        else
-        {
-            p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
-            p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
-        }
+        p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
+        p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
         return;
     }
 
     QPainter p(this);
     QColor color;
     QColor g = gray.light( 160 );
     switch ( ps->acStatus() )
     {
         case PowerStatus::Offline: color = blue.light( 150 ); break;
         case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break;
         default: color = red.light( 160 );
     }
 
     int w = height() / 2;
     if ( !(w%2) ) w--; // should have an odd value to get a real middle line
     int h = height() - 4;
     int pix = (percent * h) / 100;
     int y2 = height() -2;
     int y = y2 - pix;
     int x1 = (width() - w ) / 2;
 
     p.setPen(QColor(80,80,80));
     p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0);  // header
     p.drawRect(x1,1,w,height()-1);      // corpus
     p.setBrush(color);
 
     int extra = ((percent * h) % 100)/(100/4);
 
     int middle = w/2;
     for ( int i = 0; i < middle; i++ )
     {
         p.setPen( gray.dark( 100+i*20 ) );
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 092a48d..5936b5d 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -211,45 +211,45 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
     lightc = c.light(140);
   }
   if ( percent < 0 )
     return;
 
   int rightEnd1 = screenWidth - 47;
   int rightEnd2 = screenWidth - 35;
   int percent2 = ( percent / 100.0 ) * rightEnd1 ;
   p.setPen( black );
   qDrawShadePanel( &p,   9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
   qDrawShadePanel( &p, rightEnd2, 37,  12, 24, colorGroup(), TRUE, 1, NULL);
   drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
   drawSegment( &p, QRect( 11 + percent2, 30,  rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
   drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
   p.setPen( black);
 
 
   if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
 
       p.drawText(15, 50, tr ("Ipaq  " + ipaqChem));
 
       QString jacketMsg;
       if (bat2) {
           p.setPen(black);
           p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
           p.drawText(10,240, tr("Battery time remaining: ") + sec2);
           jacketMsg = tr("Jacket  " + jackChem);
       } else {
           jackPercent = 0;
           jacketMsg = tr("No jacket with battery inserted");
       }
 
-      int jackPerc =  ( jackPercent / 100.0 ) * screenWidth - 47;
+      int jackPerc =  ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
 
       qDrawShadePanel( &p,   9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
       qDrawShadePanel( &p, rightEnd2, 167,  12, 24, colorGroup(), TRUE, 1, NULL);
       drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
       drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
       drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 );
       p.setPen( black );
       p.drawText(15, 180, jacketMsg);
   }
 
 }
 
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index b8c4553..4ed09b8 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -243,107 +243,111 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
 		}
 	    }
 	}
 	f.close();
 
 	if (!showPopUp
 	    && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
 	    QString text = QString::null;
 	    QString what = QString::null;
 	    if (cardWas0 != cardInPcmcia0) {
 		if (cardInPcmcia0) {
 		    text += tr("New card: ");
 		    what = "on";
 		} else {
 		    text += tr("Ejected: ");
 		    what = "off";
 		}
 		text += cardInPcmcia0Name;
 		popUp(text, "cardmon/" + cardInPcmcia0Type);
 	    }
 
 	    if (cardWas1 != cardInPcmcia1) {
 		if (cardInPcmcia1) {
 		    text += tr("New card: ");
 		    what = "on";
 		} else {
 		    text += tr("Ejected: ");
 		    what = "off";
 		}
 		text += cardInPcmcia1Name;
 		popUp(text, "cardmon/" + cardInPcmcia1Type);
 	    }
+#ifndef QT_NO_SOUND
 	    QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
 	}
     } else {
 	// no file found
 	qDebug("no file found");
 	cardInPcmcia0 = FALSE;
 	cardInPcmcia1 = FALSE;
     }
     repaint( FALSE );
     return ((cardWas0 == cardInPcmcia0
 	     && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
 
 }
 
 
 bool CardMonitor::getStatusSd(int showPopUp)
 {
 
     bool cardWas = cardInSd;	// remember last state
     cardInSd = FALSE;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct mntent *me;
     FILE *mntfp = setmntent("/etc/mtab", "r");
 
     if (mntfp) {
 	while ((me = getmntent(mntfp)) != 0) {
 	    QString fs = me->mnt_fsname;
 	    //qDebug( fs );
 	    if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd"
 		|| fs.left(9) == "/dev/mmcd") {
 		cardInSd = TRUE;
 		show();
 	    }
 //            else {
 //                 cardInSd = FALSE;
 //             }
 	}
 	endmntent(mntfp);
     }
 
     if (!showPopUp && cardWas != cardInSd) {
 	QString text = QString::null;
 	QString what = QString::null;
 	if (cardInSd) {
 	    text += "New card: SD/MMC";
 	    what = "on";
 	} else {
 	    text += "Ejected: SD/MMC";
 	    what = "off";
 	}
 	//qDebug("TEXT: " + text );
+#ifndef QT_NO_SOUND
 	QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
 	popUp(text, "cardmon/ide");	// XX add SD pic
     }
 #else
 #error "Not on Linux"
 #endif
     repaint( FALSE );
     return ((cardWas == cardInSd) ? FALSE : TRUE);
 }
 
 void CardMonitor::paintEvent(QPaintEvent *)
 {
 
     QPainter p(this);
 
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
 	p.drawPixmap(0, 0, pm  );
 	show();
     } else {
 	//p.eraseRect(rect());
 	hide();
     }
 }
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h
index 64af97d..1186caf 100644
--- a/core/applets/homeapplet/home.h
+++ b/core/applets/homeapplet/home.h
@@ -3,47 +3,47 @@
 **
 ** This file is part of 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 __OPIE_HOME_APPLET_H__
 #define __OPIE_HOME_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
 
 class HomeApplet : public QObject, public MenuAppletInterface
 {
 public:
     HomeApplet ( );
     virtual ~HomeApplet ( );
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual int position() const;
-    
+
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
     virtual QString text ( ) const;
     virtual QString tr( const char* ) const;
     virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
-    
+
     virtual void activated ( );
 
 private:
     ulong ref;
 };
 
 #endif
diff --git a/core/applets/restartapplet2/.cvsignore b/core/applets/restartapplet2/.cvsignore
index a403d26..4943911 100644
--- a/core/applets/restartapplet2/.cvsignore
+++ b/core/applets/restartapplet2/.cvsignore
@@ -1,7 +1,6 @@
 *.moc
 *.~
 Makefile*
 config.in
 moc_*
 opieobjconfig.in
-opieobj
diff --git a/core/applets/suspendapplet/suspend.h b/core/applets/suspendapplet/suspend.h
index 0c92bcb..75467c1 100644
--- a/core/applets/suspendapplet/suspend.h
+++ b/core/applets/suspendapplet/suspend.h
@@ -3,47 +3,47 @@
 **
 ** This file is part of 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 __OPIE_SUSPEND_APPLET_H__
 #define __OPIE_SUSPEND_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
 
 class SuspendApplet : public QObject, public MenuAppletInterface
 {
 public:
     SuspendApplet ( );
     virtual ~SuspendApplet ( );
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual int position() const;
-    
+
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
     virtual QString text ( ) const;
     virtual QString tr( const char* ) const;
     virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
-    
+
     virtual void activated ( );
 
 private:
     ulong ref;
 };
 
 #endif
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 0205622..8b2907a 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1,58 +1,56 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FSLP
 
-//#include <opie/ofiledialog.h>
-#include <opie/ofileselector.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/mimetype.h>
 #include <qpe/storage.h>
 #include <qpe/palmtoprecord.h>
 
 #include <qpe/version.h>
 
 #include <qdir.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #endif
 #include <qtimer.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qstyle.h>
 #include <qpushbutton.h>
 #include <qtabbar.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qframe.h>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qtextstream.h>
 #include <qpopupmenu.h>
@@ -62,1294 +60,1260 @@
 
 #include "launcherview.h"
 #include "launcher.h"
 #include "syncdialog.h"
 #include "desktop.h"
 #include <qpe/lnkproperties.h>
 //#include "mrulist.h"
 #include "qrsync.h"
 #include <stdlib.h>
 #include <unistd.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <stdio.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 #include <qpe/storage.h>
 #include "mediummountgui.h"
 
 namespace {
   QStringList configToMime( Config *cfg ){
     QStringList mimes;
     bool tmpMime = true;
     cfg->setGroup("mimetypes" );
     tmpMime = cfg->readBoolEntry("all" ,true);
     if( tmpMime ){
       mimes << QString::null;
       return mimes;
     }else{
       tmpMime = cfg->readBoolEntry("audio", true );
       if(tmpMime )
-  mimes.append("audio/*" );
+	mimes.append("audio/*" );
 
       tmpMime = cfg->readBoolEntry("image", true );
       if(tmpMime )
-  mimes.append("image/*" );
+	mimes.append("image/*" );
 
       tmpMime = cfg->readBoolEntry("text", true );
       if(tmpMime )
-  mimes.append("text/*");
+	mimes.append("text/*");
 
       tmpMime = cfg->readBoolEntry("video", true );
       if(tmpMime )
-  mimes.append("video/*" );
+	mimes.append("video/*" );
     }
     return mimes;
   }
 
 }
 
 
 
 //#define SHOW_ALL
 
 class CategoryTab : public QTab
 {
 public:
     CategoryTab( const QIconSet &icon, const QString &text=QString::null )
-  : QTab( icon, text )
+	: QTab( icon, text )
     {
     }
 
     QColor bgColor;
     QColor fgColor;
 };
 
 //===========================================================================
 
 CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
     QVBox( parent )
 {
     categoryBar = 0;
     stack = 0;
 }
 
 void CategoryTabWidget::prevTab()
 {
     if ( categoryBar ) {
-  int n = categoryBar->count();
-  int tab = categoryBar->currentTab();
-  if ( tab >= 0 )
+	int n = categoryBar->count();
+	int tab = categoryBar->currentTab();
+	if ( tab >= 0 )
             categoryBar->setCurrentTab( (tab - 1 + n)%n );
     }
 }
 
 void CategoryTabWidget::nextTab()
 {
     if ( categoryBar ) {
-  int n = categoryBar->count();
+	int n = categoryBar->count();
         int tab = categoryBar->currentTab();
-  categoryBar->setCurrentTab( (tab + 1)%n );
+	categoryBar->setCurrentTab( (tab + 1)%n );
     }
 }
 
 
 void CategoryTabWidget::showTab(const QString& id)
 {
     if ( categoryBar ) {
-  int idx = ids.findIndex( id );
-  categoryBar->setCurrentTab( idx );
+	int idx = ids.findIndex( id );
+	categoryBar->setCurrentTab( idx );
     }
 }
 
 void CategoryTabWidget::addItem( const QString& linkfile )
 {
-//     int i=0;
-//     AppLnk *app = new AppLnk(linkfile);
-//     if ( !app->isValid() ) {
-//        delete app;
-//        app=0;
-//     }
-//     if ( !app || !app->file().isEmpty() ) {
-      // A document
-//        delete app;
-//        app = new DocLnk(linkfile);
-//        if ( app->fileKnown() ) {
-//           ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
-//        } else {
-//           ((LauncherView*)(stack->widget(ids.count()-1)))->sort();
-//           delete app;
-//        }
-//        return;
-//     }
-   // An application
-//     for ( QStringList::Iterator it=ids.begin(); it!=ids.end(); ++it) {
-//        if ( !(*it).isEmpty() ) {
-//           QRegExp tf(*it,FALSE,TRUE);
-//           if ( tf.match(app->type()) >= 0 ) {
-//              ((LauncherView*)stack->widget(i))->addItem(app);
-//              return;
-//           }
-//           i++;
-   //        }
-   //  }
-
-   QCopEnvelope e("QPE/TaskBar","reloadApps()");
+    int i=0;
+    AppLnk *app = new AppLnk(linkfile);
+    if ( !app->isValid() ) {
+	delete app;
+	app=0;
+    }
+    if ( !app || !app->file().isEmpty() ) {
+	// A document
+	delete app;
+	app = new DocLnk(linkfile);
+	if ( app->fileKnown() ) {
+	    ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
+	} else {
+	    ((LauncherView*)(stack->widget(ids.count()-1)))->sort();
+	    delete app;
+	}
+	return;
+    }
+    // An application
+    for ( QStringList::Iterator it=ids.begin(); it!=ids.end(); ++it) {
+	if ( !(*it).isEmpty() ) {
+	    QRegExp tf(*it,FALSE,TRUE);
+	    if ( tf.match(app->type()) >= 0 ) {
+		((LauncherView*)stack->widget(i))->addItem(app);
+		return;
+	    }
+	    i++;
+	}
+    }
+
+    QCopEnvelope e("QPE/TaskBar","reloadApps()");
 }
 
 void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
- AppLnkSet* /*docFolder*/, const QList<FileSystem> & /*fs*/)
+	AppLnkSet* docFolder, const QList<FileSystem> &fs)
 {
-   QString current;
+    QString current;
     if ( categoryBar ) {
         int c = categoryBar->currentTab();
         if ( c >= 0 ) current = ids[c];
     }
 
     delete categoryBar;
     categoryBar = new CategoryTabBar( this );
     QPalette pal = categoryBar->palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
 
     delete stack;
     stack = new QWidgetStack(this);
     tabs=0;
 
     ids.clear();
 
     Config cfg("Launcher");
 
     QStringList types = rootFolder->types();
     for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
-  if ( !(*it).isEmpty() ) {
-      (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
-      setTabAppearance( *it, cfg );
-  }
+	if ( !(*it).isEmpty() ) {
+	    (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
+	    setTabAppearance( *it, cfg );
+	}
     }
     QListIterator<AppLnk> it( rootFolder->children() );
     AppLnk* l;
     while ( (l=it.current()) ) {
-  if ( l->type() == "Separator" ) { // No tr
-      rootFolder->remove(l);
-      delete l;
-  } else {
-      int i=0;
-      for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
-    if ( *it == l->type() )
-        ((LauncherView*)stack->widget(i))->addItem(l,FALSE);
-    i++;
-      }
-  }
-  ++it;
+	if ( l->type() == "Separator" ) { // No tr
+	    rootFolder->remove(l);
+	    delete l;
+	} else {
+	    int i=0;
+	    for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
+		if ( *it == l->type() )
+		    ((LauncherView*)stack->widget(i))->addItem(l,FALSE);
+		i++;
+	    }
+	}
+	++it;
     }
     rootFolder->detachChildren();
     for (int i=0; i<tabs; i++)
-  ((LauncherView*)stack->widget(i))->sort();
+	((LauncherView*)stack->widget(i))->sort();
 
     // all documents
     QImage img( Resource::loadImage( "DocsIcon" ) );
     QPixmap pm;
     pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
+    docview = newView( "Documents", // No tr
+	pm, tr("Documents"));
+    docview->populate( docFolder, QString::null );
+    docFolder->detachChildren();
+    docview->setFileSystems(fs);
+    docview->setToolsEnabled(TRUE);
+    setTabAppearance( "Documents", cfg ); // No tr
 
-    //ljpotter
-     CategoryTab *catTab ;
-     catTab = new CategoryTab( pm, "Documents" );
-        
-     categoryBar->addTab( catTab );
-
-     fileSel = new DocumentTab( stack, 4, 0, "/","");
-     stack->addWidget( fileSel, tabs++ );
-
-     //     fileSel->hide();     
-
-     connect( fileSel, SIGNAL( fileSelected( const DocLnk & )),
-              this, SLOT(clickie(const DocLnk&)) );
-        
-//       connect( fileSel, SIGNAL( fileSelected( const QString & )),
-//                this, SLOT(clickie(const QString&)) );
-
-     connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
+    connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
 
     ((LauncherView*)stack->widget(0))->setFocus();
 
     cfg. setGroup ( "GUI" );
     setBusyIndicatorType ( cfg. readEntry ( "BusyType", QString::null ));
 
     if ( !current.isNull() ) {
         showTab(current);
     }
 
     categoryBar->show();
     stack->show();
 
-
     QCopEnvelope e("QPE/TaskBar","reloadApps()");
 }
 
-void CategoryTabWidget::clickie(const DocLnk &lnk) {
-   lnk.execute();
-   //   fileSel->reparse();
-}
-
-void CategoryTabWidget::clickie(const QString &appStr) {
-//     DocLnk lnk(appStr);
-//     lnk.execute();
-}
-
 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 );
+	v->setViewMode( LauncherView::List );
     QString bgType = cfg.readEntry( "BackgroundType", "Image" );
     if ( bgType == "Image" ) { // No tr
-  QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
-  v->setBackgroundType( LauncherView::Image, pm );
+	QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
+	v->setBackgroundType( LauncherView::Image, pm );
     } else if ( bgType == "SolidColor" ) {
-  QString c = cfg.readEntry( "BackgroundColor" );
-  v->setBackgroundType( LauncherView::SolidColor, c );
+	QString c = cfg.readEntry( "BackgroundColor" );
+	v->setBackgroundType( LauncherView::SolidColor, c );
     }
     QString textCol = cfg.readEntry( "TextColor" );
     if ( textCol.isEmpty() )
-  v->setTextColor( QColor() );
+	v->setTextColor( QColor() );
     else
-  v->setTextColor( QColor(textCol) );
+	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) );
+	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();
+	tab->bgColor = QColor();
     else
-  tab->bgColor = QColor(tabCol);
+	tab->bgColor = QColor(tabCol);
     QString tabTextCol = cfg.readEntry( "TabTextColor" );
     if ( tabTextCol.isEmpty() )
-  tab->fgColor = QColor();
+	tab->fgColor = QColor();
     else
-  tab->fgColor = QColor(tabTextCol);
+	tab->fgColor = QColor(tabTextCol);
 }
 
-//void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
-//{
-   //     docFolder->detachChildren();
-//}
+void CategoryTabWidget::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 );
+	view->setViewMode( (LauncherView::ViewMode)rv );
     }
 
     delete m;
 }
 
 QString CategoryTabWidget::getAllDocLinkInfo() const
 {
-   return "";
+    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*)));
+	    this, SIGNAL(clicked(const AppLnk*)));
     connect( view, SIGNAL(rightPressed(AppLnk*)),
-      this, SIGNAL(rightPressed(AppLnk*)));
+	    this, SIGNAL(rightPressed(AppLnk*)));
     ids.append(id);
     categoryBar->addTab( new CategoryTab( pm, label ) );
     stack->addWidget( view, tabs++ );
     return view;
 }
 
 void CategoryTabWidget::updateLink(const QString& linkfile)
 {
-   //       LauncherView* view;
-   qApp->processEvents();
-//          while ((view = (LauncherView*)stack->widget(i++))) {
-//        if ( view->removeLink(linkfile) )
-//            break;
-//          }
-   //   addItem(linkfile);
-   fileSel->reparse();
+    int i=0;
+    LauncherView* view;
+    //qApp->processEvents();
+    while ((view = (LauncherView*)stack->widget(i++))) {
+	if ( view->removeLink(linkfile) )
+	    break;
+    }
+    addItem(linkfile);
+    docview->updateTools();
 }
 
 void CategoryTabWidget::paletteChange( const QPalette &p )
 {
     QVBox::paletteChange( p );
     QPalette pal = palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
     categoryBar->update();
 }
 
 void CategoryTabWidget::setBusy(bool on)
 {
     if ( on )
-  ((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
+	((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
     else
-  for (int i=0; i<tabs-1; i++)
-      ((LauncherView*)stack->widget(i))->setBusy(FALSE);
+	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);
 }
 
 void CategoryTabWidget::setBusyIndicatorType ( const QString &type )
 {
-  for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it )
-    view ( *it )-> setBusyIndicatorType ( type );
+	for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it )
+		view ( *it )-> setBusyIndicatorType ( type );
 }
 
 //===========================================================================
 
 CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name )
     : QTabBar( parent, name )
 {
     setFocusPolicy( NoFocus );
     connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) );
 }
 
 CategoryTabBar::~CategoryTabBar()
 {
 }
 
 void CategoryTabBar::layoutTabs()
 {
     if ( !count() )
-  return;
+	return;
 
 //    int percentFalloffTable[] = { 100, 70, 40, 12, 6, 3, 1, 0 };
     int available = width()-1;
     QFontMetrics fm = fontMetrics();
     int hiddenTabWidth = -7;
     int middleTab = currentTab();
     int hframe, vframe, overlap;
     style().tabbarMetrics( this, hframe, vframe, overlap );
     int x = 0;
     QRect r;
     QTab *t;
     int required = 0;
     int eventabwidth = (width()-1)/count();
     enum Mode { HideBackText, Pack, Even } mode=Even;
     for ( int i = 0; i < count(); i++ ) {
-  t = tab(i);
-  int iw = fm.width( t->text() ) + hframe - overlap;
-  if ( i != middleTab ) {
-      available -= hiddenTabWidth + hframe - overlap;
-      if ( t->iconSet() != 0 )
-    available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-  }
-  if ( t->iconSet() != 0 )
-      iw += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-  required += iw;
-  // As space gets tight, packed looks better than even. "10" must be at least 0.
-  if ( iw >= eventabwidth-10 )
-      mode = Pack;
+	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;
+	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() );
-  }
+	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;
+	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 );
+	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;
+	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();
+	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,
+			  r.top() + (r.height()-h)/2, w, h ), t,
 #if QT_VERSION >= 300
-          t->identifier() == keyboardFocusTab()
+			    t->identifier() == keyboardFocusTab()
 #else
-          t->identitifer() == keyboardFocusTab()
+			    t->identitifer() == keyboardFocusTab()
 #endif
-    );
+		);
     if ( setPal ) {
-  that->unsetPalette();
-  that->setUpdatesEnabled( TRUE );
+	that->unsetPalette();
+	that->setUpdatesEnabled( TRUE );
     }
 }
 
 
 void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
-        QTab* t, bool has_focus ) const
+			  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 );
+	// 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;
+	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() );
+	if ( colorGroup().brush( QColorGroup::Button ) == colorGroup().brush( QColorGroup::Background ) )
+	    p->setPen( colorGroup().buttonText() );
+	else
+	    p->setPen( colorGroup().foreground() );
 #else
-  p->setPen( colorGroup().foreground() );
+	p->setPen( colorGroup().foreground() );
 #endif
-  p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
+	p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
     } else {
-  p->setPen( palette().disabled().foreground() );
-  p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
+	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 );
     setCentralWidget( tabs );
 
     connect( tabs, SIGNAL(selected(const QString&)),
-  this, SLOT(viewSelected(const QString&)) );
+	this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
-  this, SLOT(select(const AppLnk*)));
+	this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
-  this, SLOT(properties(AppLnk*)));
-
+	this, SLOT(properties(AppLnk*)));
 
 #if !defined(QT_NO_COP)
     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();
+	if ( w->winId() == wid )
+	    return !w->isFullyObscured();
     }
 #endif
     return FALSE;
 }
 
 void Launcher::showMaximized()
 {
     if ( isVisibleWindow( winId() ) )
-  doMaximize();
+	doMaximize();
     else
-  QTimer::singleShot( 20, this, SLOT(doMaximize()) );
+	QTimer::singleShot( 20, this, SLOT(doMaximize()) );
 }
 
 void Launcher::doMaximize()
 {
     QMainWindow::showMaximized();
     tabs->setMaximumWidth( qApp->desktop()->width() );
 }
 
 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);
-  }
+	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::
 {
-   OWait *owait = new OWait();
-   Global::statusMessage( tr( "Finding documents" ) );
-
-   owait->show();
-   qApp->processEvents();
-   if(docsFolder) delete docsFolder;
-   docsFolder = new DocLnkSet;
-   DocLnkSet *tmp = 0;
-   QString home = QString(getenv("HOME"))  + "/Documents";
-   tmp = new DocLnkSet( home , QString::null);
-   docsFolder->appendFrom( *tmp );
-   delete tmp;
-
-   // RAM documents
-   StorageInfo storage;
-   const QList<FileSystem> &fileSystems = storage.fileSystems();
-   QListIterator<FileSystem> it ( fileSystems );
-
-   for ( ; it.current(); ++it ) {
-      if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
-         tmp = new DocLnkSet( (*it)->path(), QString::null );
-         docsFolder->appendFrom( *tmp );
-         delete tmp;
-      }
-   }
-
-   Config mediumCfg( "medium");
-   mediumCfg.setGroup("main");
-   // a) -zecke we don't want to check
-   if(!mediumCfg.readBoolEntry("use", true ) ) {
-      owait->hide();
-      delete owait;
+
+    OWait *owait = new OWait();
+    Global::statusMessage( tr( "Finding documents" ) );
+
+    owait->show();
+    qApp->processEvents();
+
+    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
+    // 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 ) ){
+    // 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;
-         }
+	if( (*it)->isRemovable() ){
+	  tmp = new DocLnkSet( (*it)->path(), mime );
+	  docsFolder->appendFrom( *tmp );
+	  delete tmp;
+	}
       } // done
-      owait->hide();
-      delete owait;
       return; // save the else
-   }
-   // c) zecke
-   for ( it.toFirst(); it.current(); ++it ) {
+    }
+    // c) zecke
+    for ( it.toFirst(); it.current(); ++it ) {
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
-         Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File);
-         cfg.setGroup("main");
-         QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
-         /** This medium is uptodate
-          */
-         if( stamp == m_timeStamp ){ // ok we know this card
-            cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp
-            // we need to scan the list now. Hopefully the cache will be there
-            // read the mimetypes from the config and search for documents
-            QStringList mimetypes = configToMime( &cfg);
-            //qApp->processEvents();
-            Global::statusMessage( tr( "Searching documents" ) );
-            tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";")  );
-            docsFolder->appendFrom( *tmp );
-            delete tmp;
-
-         } else { // come up with the gui cause this a new card
-            MediumMountGui medium(&cfg, (*it)->path() );
-            if( medium.check() ){ // we did not ask before or ask again is off
-               /** c2) */
-               if( medium.exec()  ){ // he clicked yes so search it
-                  // speicher
-                  //cfg.read(); // cause of a race we need to reread - fixed
-                  cfg.setGroup("main");
-                  cfg.writeEntry("timestamp", newStamp );
-                  cfg.write();
-
-                  //qApp->processEvents();
-                  tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) );
-                  docsFolder->appendFrom( *tmp );
-                  delete tmp;
-               }// no else
-               /** c1) */
-            } else { // we checked
-               // do something different see what we need to do
-               // let's see if we should check the device
-               cfg.setGroup("main" );
-               bool check = cfg.readBoolEntry("autocheck", true );
-               if( check ){ // find the documents
-
-                  //qApp->processEvents();
+	Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File);
+	cfg.setGroup("main");
+	QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
+	/** This medium is uptodate
+	*/
+	if( stamp == m_timeStamp ){ // ok we know this card
+	  cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp
+	  // we need to scan the list now. Hopefully the cache will be there
+	  // read the mimetypes from the config and search for documents
+ 	  QStringList mimetypes = configToMime( &cfg);
+          //qApp->processEvents();
                   Global::statusMessage( tr( "Searching documents" ) );
-                  tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
-                  docsFolder->appendFrom( *tmp );
-                  delete tmp;
-               }
-            }
-         }
-      }
-   }
-   m_timeStamp = newStamp;
-   owait->hide();
-   delete owait;
+  	  tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";")  );
+	  docsFolder->appendFrom( *tmp );
+	  delete tmp;
+
+	}else{ // come up with the gui cause this a new card
+	  MediumMountGui medium(&cfg, (*it)->path() );
+	  if( medium.check() ){ // we did not ask before or ask again is off
+	    /** c2) */
+	    if( medium.exec()  ){ // he clicked yes so search it
+	      // speicher
+	      //cfg.read(); // cause of a race we need to reread - fixed
+	      cfg.setGroup("main");
+	      cfg.writeEntry("timestamp", newStamp );
+	      cfg.write();
+
+              //qApp->processEvents();
+              tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) );
+      	      docsFolder->appendFrom( *tmp );
+	      delete tmp;
+	    }// no else
+	    /** c1) */
+	  }else{ // we checked
+	    // do something different see what we need to do
+	    // let's see if we should check the device
+	    cfg.setGroup("main" );
+	    bool check = cfg.readBoolEntry("autocheck", true );
+	    if( check ){ // find the documents
+
+                //qApp->processEvents();
+                      Global::statusMessage( tr( "Searching documents" ) );
+                      tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
+	      docsFolder->appendFrom( *tmp );
+	      delete tmp;
+	    }
+	  }
+	}
+       }
+    }
+    m_timeStamp = newStamp;
+    owait->hide();
+    delete owait;
 }
 
 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());
+    loadDocs();
+    tabs->updateDocs(docsFolder,storage->fileSystems());
 }
 
 void Launcher::viewSelected(const QString& s)
 {
     setCaption( s + tr(" - Launcher") );
 }
 
 void Launcher::nextView()
 {
     tabs->nextTab();
 }
 
 void Launcher::showTab(const QString& id)
 {
     tabs->showTab(id);
     raise();
 }
 
 void Launcher::select( const AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) { // No tr
-  // Not supported: flat is simpler for the user
+	// Not supported: flat is simpler for the user
     } else {
-  if ( appLnk->exec().isNull() ) {
-      QMessageBox::information(this,tr("No application"),
-    tr("<p>No application is defined for this document."
-    "<p>Type is %1.").arg(appLnk->type()));
-      return;
-  }
-  tabs->setBusy(TRUE);
-  emit executing( appLnk );
-  appLnk->execute();
+	if ( appLnk->exec().isNull() ) {
+	    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
+	// 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);
-  }
+	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)
 {
     bool notify_sm = false;
 
     if (link.isNull()) {
-  updateTabs();
-  notify_sm = true;
+	updateTabs();
+	notify_sm = true;
     }
     else if (link.isEmpty()) {
-  updateDocs();
+	updateDocs();
     }
     else {
-  tabs->updateLink(link);
-  notify_sm = true;
+	tabs->updateLink(link);
+	notify_sm = true;
     }
 
     if ( notify_sm )
-      QCopEnvelope e ( "QPE/TaskBar", "reloadApps()" );
+    	QCopEnvelope e ( "QPE/TaskBar", "reloadApps()" );
 }
 
 void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 {
- QDataStream stream( data, IO_ReadOnly );
+    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);
-  }
+	QString link;
+	stream >> link;
+	if ( in_lnk_props ) {
+	    got_lnk_change = TRUE;
+	    lnk_change = link;
+	} else {
+	    updateLink(link);
+	}
     } else if ( msg == "busy()" ) {
-  emit busy();
+	emit busy();
     } else if ( msg == "notBusy(QString)" ) {
-  QString app;
-  stream >> app;
-  tabs->setBusy(FALSE);
-  emit notBusy(app);
+	QString app;
+	stream >> app;
+	tabs->setBusy(FALSE);
+	emit notBusy(app);
     } else if ( msg == "mkdir(QString)" ) {
-  QString dir;
-  stream >> dir;
-  if ( !dir.isEmpty() )
-      mkdir( dir );
+	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 );
+	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 );
+	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 );
+	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;
+	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 );
+	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" );
+	QString home = getenv( "HOME" );
 #ifndef QT_NO_COP
-  QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
-  e << home;
-  int locked = (int) Desktop::screenLocked();
-  e << locked;
+	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());
+	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)" );
+	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;
+	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;
+	e << s;
 #endif
     } else if ( msg == "sendSyncDate(QString)" ) {
-  QString app;
-  stream >> app;
-  Config cfg( "qpe" );
-  cfg.setGroup("SyncDate");
+	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 );
+	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() );
+	//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());
+	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() ) );
+	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;
+	delete syncDialog; syncDialog = 0;
     } else if ( msg == "getAllDocLinks()" ) {
-  loadDocs();
+	loadDocs();
 
                 // directly show updated docs in document tab
                 updateDocs();
 
                 QString contents;
 
-//  Categories cats;
-  for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
-      DocLnk *doc = it.current();
-      QFileInfo fi( doc->file() );
-      if ( !fi.exists() )
-    continue;
-
-      bool fake = !doc->linkFileKnown();
-      if ( !fake ) {
-    QFile f( doc->linkFile() );
-    if ( f.open( IO_ReadOnly ) ) {
-        QTextStream ts( &f );
-        ts.setEncoding( QTextStream::UnicodeUTF8 );
-        contents += ts.read();
-        f.close();
-    } else
-        fake = TRUE;
-      }
-      if (fake) {
-    contents += "[Desktop Entry]\n";
-    contents += "Categories = " + // No tr
-//        cats.labels("Document View",doc->categories()).join(";") + "\n"; // No tr
-      Qtopia::Record::idsToString( doc->categories() ) + "\n";
-    contents += "Name = "+doc->name()+"\n"; // No tr
-    contents += "Type = "+doc->type()+"\n"; // No tr
-      }
-      contents += "File = "+doc->file()+"\n"; // No tr // (resolves path)
-      contents += QString("Size = %1\n").arg( fi.size() ); // No tr
-  }
-
-  //qDebug( "sending length %d", contents.length() );
+//	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;
+	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;
+	delete docsFolder;
+	docsFolder = 0;
 #ifdef QWS
     } else if ( msg == "setMouseProto(QString)" ) {
-  QString mice;
-  stream >> mice;
-  setenv("QWS_MOUSE_PROTO",mice.latin1(),1);
-  qwsServer->openMouse();
+	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();
+	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 );
+    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 );
+	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 );
+	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) );
+	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 );
+	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);
+	QString type;
+	stream >> type;
+	tabs->setBusyIndicatorType(type);
     }
     else if ( msg == "home()" ) {
-  if ( isVisibleWindow( winId ( )))
-     nextView ( );
-  else
-     raise ( );
+	if ( isVisibleWindow( winId ( )))
+	   nextView ( );
+	else
+	   raise ( );
 
     }
 }
 
 void Launcher::storageChanged()
 {
     if ( in_lnk_props ) {
-  got_lnk_change = TRUE;
-  lnk_change = QString::null;
+	got_lnk_change = TRUE;
+	lnk_change = QString::null;
     } else {
-  updateLink( QString::null );
+	updateLink( QString::null );
     }
 }
 
 
 bool Launcher::mkdir(const QString &localPath)
 {
     QDir fullDir(localPath);
     if (fullDir.exists())
-  return true;
+	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();
+	//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;
-      }
-  }
+	// 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()");
+	QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
 #endif
     }
 }
-
-DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName)
-   : OFileSelector(parent,mode,selector,dirName,fileName)
-{
-   setYesCancelVisible(false);
-   setToolbarVisible(false);
-   setPermissionBarVisible(false);
-   setLineEditVisible(false) ;
-  //setChooserVisible( bool chooser );
-  
-}
-
-DocumentTab::~DocumentTab() {
-
-}
-
diff --git a/core/obex/obex.cc b/core/obex/obex.cc
index 595fed9..2a306de 100644
--- a/core/obex/obex.cc
+++ b/core/obex/obex.cc
@@ -1,45 +1,47 @@
 
 #include <qapplication.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextcodec.h>
 
 #include <qpe/qcopenvelope_qws.h>
 
 #include <opie/oprocess.h>
 #include "obex.h"
 
 using namespace  OpieObex;
 
+/* TRANSLATOR OpieObex::Obex */
+
 Obex::Obex( QObject *parent, const char* name )
   : QObject(parent, name )
 {
     m_rec = 0;
     m_send=0;
     m_count = 0;
     m_receive = false;
     connect( this, SIGNAL(error(int) ), // for recovering to receive
              SLOT(slotError() ) );
     connect( this, SIGNAL(sent(bool) ),
              SLOT(slotError() ) );
 };
 Obex::~Obex() {
     delete m_rec;
     delete m_send;
 }
 void Obex::receive()  {
     m_receive = true;
     m_outp = QString::null;
     qWarning("Receive" );
     m_rec = new OProcess();
     *m_rec << "irobex_palm3";
     // connect to the necessary slots
     connect(m_rec,  SIGNAL(processExited(OProcess*) ),
             this,  SLOT(slotExited(OProcess*) ) );
 
     connect(m_rec,  SIGNAL(receivedStdout(OProcess*, char*,  int ) ),
             this,  SLOT(slotStdOut(OProcess*, char*, int) ) );
 
     if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning("could not start :(");
         emit done( false );
@@ -80,87 +82,76 @@ void Obex::sendNow(){
     m_send = new OProcess();
     *m_send << "irobex_palm3";
     *m_send << QFile::encodeName(m_file);
 
     // connect to slots Exited and and StdOut
     connect(m_send,  SIGNAL(processExited(OProcess*) ),
             this, SLOT(slotExited(OProcess*)) );
     connect(m_send,  SIGNAL(receivedStdout(OProcess*, char*,  int )),
             this, SLOT(slotStdOut(OProcess*, char*, int) ) );
 
     // now start it
     if (!m_send->start(/*OProcess::NotifyOnExit,  OProcess::AllOutput*/ ) ) {
         qWarning("could not send" );
         m_count = 25;
         emit error(-1 );
         delete m_send;
         m_send=0;
     }
     // end
     m_count++;
     emit currentTry( m_count );
 }
 
 void Obex::slotExited(OProcess* proc ){
     if (proc == m_rec ) { // receive process
         received();
     }else if ( proc == m_send ) {
         sendEnd();
     }
 }
 void Obex::slotStdOut(OProcess* proc, char* buf, int len){
     if ( proc == m_rec ) { // only receive
-        for (int i = 0; i < len; i++ ) {
-            printf("%c", buf[i] );
-        }
-        printf("\n");
-        QByteArray ar( len );
+        QByteArray ar( len  );
         memcpy( ar.data(), buf, len );
         qWarning("parsed: %s", ar.data() );
         m_outp.append( ar );
     }
 }
 
 void Obex::received() {
   if (m_rec->normalExit() ) {
       if ( m_rec->exitStatus() == 0 ) { // we got one
           QString filename = parseOut();
           qWarning("ACHTUNG %s", filename.latin1() );
-          if (filename.contains( 'ö' ) || filename.contains( 'ä' ) || filename.contains('ü' ) ) {
-              qWarning("renaming!!!!");
-              QFileInfo inf( filename );
-              QString newName = "/tmp/opie-obex." + inf.extension();
-              ::rename( QFile::encodeName( filename ).data(), newName );
-              qWarning("name is %s", QFile::encodeName( filename ).data() );
-          }
           emit receivedFile( filename );
       }
   }else{
       emit done(false);
   };
   delete m_rec;
   m_rec = 0;
   receive();
 }
 
 void Obex::sendEnd() {
   if (m_send->normalExit() ) {
     if ( m_send->exitStatus() == 0 ) {
       delete m_send;
       m_send=0;
       qWarning("done" );
       emit sent(true);
     }else if (m_send->exitStatus() == 255 ) { // it failed maybe the other side wasn't ready
       // let's try it again
       delete m_send;
       m_send = 0;
       qWarning("try sending again" );
       sendNow();
     }
   }else {
     emit error( -1 );
     delete m_send;
     m_send = 0;
   }
 }
 QString Obex::parseOut(     ){
   QString path;
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp
index 6509d12..5aaf63c 100644
--- a/core/obex/obexhandler.cpp
+++ b/core/obex/obexhandler.cpp
@@ -1,42 +1,44 @@
 #include <qcopchannel_qws.h>
 
 #include <qpe/qcopenvelope_qws.h>
 
 #include "obexsend.h"
 #include "receiver.h"
 #include "obexhandler.h"
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::ObexHandler */
+
 ObexHandler::ObexHandler() {
     m_wasRec = false;
     m_sender = 0l;
     m_receiver = 0l;
     QCopChannel* chan = new QCopChannel("QPE/Obex");
     connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
             this, SLOT(irdaMessage(const QCString&, const QByteArray& ) ) );
 }
 ObexHandler::~ObexHandler() {
     delete m_sender;
     delete m_receiver;
 }
 void ObexHandler::doSend(const QString& str, const QString& desc) {
     delete m_sender;
     m_sender = new SendWidget;
     m_sender->raise();
     m_sender->showMaximized();
     connect(m_sender, SIGNAL(done() ),
             this, SLOT(slotSent() ) );
     m_sender->send( str, desc );
 }
 void ObexHandler::doReceive(bool b) {
     if (m_receiver && b ) return; // we should enable receiver and it is on
     else if (!m_receiver && !b ) return; // we should disbale receiver and it is off
     else if (m_receiver && !b ) {
         delete m_receiver;
         m_receiver=0;
     }else if (!m_receiver && b ) {
         m_receiver= new Receiver;
     }
 }
 void ObexHandler::slotSent() {
diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp
index 12a078f..5bfc779 100644
--- a/core/obex/obeximpl.cpp
+++ b/core/obex/obeximpl.cpp
@@ -1,28 +1,30 @@
 #include "obexhandler.h"
 #include "obeximpl.h"
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::ObexImpl */
+
 ObexImpl::ObexImpl() {
     m_handler = new ObexHandler;
 }
 ObexImpl::~ObexImpl() {
     delete m_handler;
 }
 QRESULT ObexImpl::queryInterface( const QUuid& uuid, QUnknownInterface **iface ) {
     *iface = 0;
     if ( uuid == IID_QUnknown ) {
         *iface = this;
     }else if ( uuid == IID_ObexInterface )
         *iface = this;
 
     if (*iface)
         (*iface)->addRef();
 
     return QS_OK;
 }
 
 
 Q_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( ObexImpl )
 }
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 2931cf7..cf5d958 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -1,49 +1,51 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qhbox.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qtl.h>
 
 #include <qcopchannel_qws.h>
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include "obex.h"
 #include "obexsend.h"
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::SendWidget */
+
 
 SendWidget::SendWidget( QWidget* parent, const char* name )
     : QWidget( parent, name ) {
     initUI();
 }
 SendWidget::~SendWidget() {
 }
 void SendWidget::initUI() {
     m_obex = new Obex(this, "obex");
     connect(m_obex, SIGNAL(error(int) ),
             this, SLOT(slotIrError(int) ) );
     connect(m_obex, SIGNAL(sent(bool) ),
             this, SLOT(slotIrSent(bool) ) );
     connect(m_obex, SIGNAL(currentTry(unsigned int ) ),
             this, SLOT(slotIrTry(unsigned int ) ) );
 
     QCopChannel* chan = new QCopChannel("QPE/IrDaAppletBack", this );
     connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
             this, SLOT(dispatchIrda(const QCString&, const QByteArray& ) ) );
 
     chan = new QCopChannel("QPE/BluetoothBack", this );
     connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
             this, SLOT(dispatchBt(const QCString&, const QByteArray& ) ) );
 
     QVBoxLayout* lay = new QVBoxLayout(this);
 
     QHBox* nameBox = new QHBox(this);
     QLabel* name = new QLabel(nameBox);
     name->setText( tr("<qt><h1>Sending:</h1></qt>") );
     name->setAlignment( AlignLeft | AlignTop );
     m_lblFile = new QLabel(nameBox);
     lay->addWidget(nameBox, 0);
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp
index 31c6afe..bf9e30c 100644
--- a/core/obex/receiver.cpp
+++ b/core/obex/receiver.cpp
@@ -1,172 +1,203 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <stdlib.h> // int system
 #include <unistd.h>
 
 #include <fcntl.h>
 
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qhbox.h>
+#include <qregexp.h>
 #include <qtextview.h>
 #include <qpushbutton.h>
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/global.h>
 
 #include "obex.h"
 #include "receiver.h"
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::Receiver */
+
 Receiver::Receiver() {
     m_obex = new Obex(this, "Receiver");
     connect(m_obex, SIGNAL(receivedFile(const QString& ) ),
             this, SLOT(slotReceived(const QString& ) ) );
     m_obex->receive();
 }
 Receiver::~Receiver() {
     m_obex->setReceiveEnabled( false );
     delete m_obex;
 }
-void Receiver::slotReceived( const QString& file ) {
+void Receiver::slotReceived( const QString& _file ) {
+    QString file = _file;
     int check = checkFile(file);
     if ( check == AddressBook )
         handleAddr( file );
     else if ( check == Datebook )
         handleDateTodo( file );
     else
         handleOther( file );
 }
 void Receiver::handleAddr( const QString& str ) {
     QCopEnvelope e("QPE/Application/addressbook", "setDocument(QString)" );
     e << str;
 }
 /* we can not say for sure if it's a VEevent ot VTodo */
 void Receiver::handleDateTodo( const QString& str ) {
     QCopEnvelope e0("QPE/Application/todolist", "setDocument(QString)");
     e0 << str;
     QCopEnvelope e1("QPE/Application/datebook", "setDocument(QString)" );
     e1 << str;
 }
 /*
  * Handle other asks if it should accept the
  * beamed object and creates a DocLnk
  */
 void Receiver::handleOther( const QString& other ) {
     OtherHandler* hand =  new OtherHandler();
     hand->handle( other );
 }
-int Receiver::checkFile( const QString& file ) {
+void Receiver::tidyUp( QString& _file, const QString& ending) {
+    /* libversit fails on BASE64 encoding we try to sed it away */
+    QString file = _file;
+    char foo[24]; // big enough
+    (void)::strcpy(foo, "/tmp/opie-XXXXXX");
+
+    int fd = ::mkstemp(foo);
+
+    if ( fd == -1 )
+        return;
+
+    (void)::strncat( foo, ending.latin1(), 4 );
+    _file = QString::fromLatin1( foo );
+    QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) );
+    qWarning("Executing: %s", cmd.latin1() );
+    (void)::system( cmd.latin1() );
+
+    cmd = QString("rm %1").arg( Global::shellQuote(file) );
+    (void)::system( cmd.latin1() );
+}
+int Receiver::checkFile( QString& file ) {
     qWarning("check file!! %s", file.latin1() );
     int ret;
+    QString ending;
+
     if (file.right(4) == ".vcs" ) {
         ret = Datebook;
+        ending = QString::fromLatin1(".vcs");
     }else if ( file.right(4) == ".vcf") {
         ret = AddressBook;
+        ending = QString::fromLatin1(".vcf");
     }else
         ret = Other;
 
 
+    if (ending.isEmpty() )
+        return ret;
+
+    /**
+     * currently the parser is broken in regard of BASE64 encoding
+     * and M$ likes to send that. So we will executed a small
+     * tidy up system sed script
+     * At this point we can also remove umlaute from the filename
+     */
+    tidyUp( file, ending );
+
     qWarning("check it now %d", ret );
     return ret;
 }
 
+/* TRANSLATOR OpieObex::OtherHandler */
+
 OtherHandler::OtherHandler()
     : QVBox()
 {
     QHBox* box = new QHBox(this);
     QLabel* lbl = new QLabel(box);
     lbl->setText(tr("<qt><b>Received:</b></qt>"));
     m_na = new QLabel(box);
 
     QFrame* frame = new QFrame(this);
     frame->setFrameShape( QFrame::HLine );
     frame->setFrameShadow( QFrame::Sunken );
 
     m_view = new QTextView(this);
 
     box = new QHBox(this);
     QPushButton *but = new QPushButton(box);
     but->setText(tr("Accept") );
     connect(but, SIGNAL(clicked() ),
             this, SLOT(accept()) );
 
     but = new QPushButton(box);
     but->setText(tr("Deny") );
     connect(but, SIGNAL(clicked() ),
             this, SLOT(deny() ) );
 
     raise();
     showMaximized();
 }
 OtherHandler::~OtherHandler() {
 
 }
 void OtherHandler::handle( const QString& file ) {
     m_file = file;
     m_na->setText(file);
     DocLnk lnk(file);
     qWarning(" %s %s", lnk.type().latin1(), lnk.icon().latin1() );
 
     QString str = tr("<p>You received a file of type %1 (<img src=\"%2\"> )What do you want to do?").arg(lnk.type() ).arg(lnk.icon() );
     m_view->setText( str );
 }
 
 /*
  * hehe evil evil mmap ahead :)
  * we quickly copy the file and then we'll create a DocLnk for it
  */
 void OtherHandler::accept() {
     QString na = targetName( m_file );
     copy(m_file, na );
     DocLnk lnk(na);
     lnk.writeLink();
     QFile::remove(m_file);
     delete this;
 }
 void OtherHandler::deny() {
     QFile::remove( m_file );
     delete this;
 }
 QString OtherHandler::targetName( const QString& file ) {
     QFileInfo info( file );
+
+    /* $HOME needs to be set!!!! */
+    Global::createDocDir();
+
     QString newFile = QPEApplication::documentDir()+ "/"+ info.baseName();
     QString newFileBase = newFile;
 
     int trie = 0;
     while (QFile::exists(newFile + "."+info.extension() ) ) {
         newFile = newFileBase + "_"+QString::number(trie) ;
         trie++;
     }
     newFile += "." + info.extension();
 
     return newFile;
 }
 
 /* fast cpy */
 void OtherHandler::copy(const QString& src, const QString& file) {
     qWarning("src %s, dest %s", src.latin1(),file.latin1() );
-    int src_fd = ::open( QFile::encodeName( src ), O_RDONLY );
-    int to_fd  = ::open( QFile::encodeName( file), O_RDWR| O_CREAT| O_TRUNC,
-                         S_IRUSR, S_IWUSR, S_IRGRP, S_IRGRP );
-
-    struct stat stater;
-    ::fstat(src_fd, &stater );
-    ::lseek(to_fd, stater.st_size-1, SEEK_SET );
-    ::write(to_fd, "", 1 );
-
-    void *src_addr, *dest_addr;
-    src_addr = ::mmap(0, stater.st_size, PROT_READ,
-                      MAP_FILE | MAP_SHARED, src_fd, 0 );
-    dest_addr= ::mmap(0, stater.st_size, PROT_READ | PROT_WRITE,
-                      MAP_FILE | MAP_PRIVATE, to_fd, 0 );
-
-    ::memcpy(dest_addr , src_addr, stater.st_size );
-    ::munmap(src_addr , stater.st_size );
-    ::munmap(dest_addr, stater.st_size );
-
+    QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )).
+                  arg( Global::shellQuote( file ) );
+    ::system( cmd.latin1() );
     // done
 }
diff --git a/core/obex/receiver.h b/core/obex/receiver.h
index 5b20146..e1d54df 100644
--- a/core/obex/receiver.h
+++ b/core/obex/receiver.h
@@ -1,55 +1,58 @@
 #ifndef OPIE_OBEX_RECEIVER_H
 #define OPIE_OBEX_RECEIVER_H
 
 #include <qobject.h>
 #include <qvbox.h>
 #include <qstring.h>
 
 class QLabel;
 class QTextView;
 namespace OpieObex {
     class Obex;
     class OtherHandler;
     class Receiver : public QObject {
         Q_OBJECT
     public:
         enum { Datebook , AddressBook, Other };
         Receiver();
         ~Receiver();
 
     private:
         void handleAddr(const QString& );
         void handleDateTodo(const QString& );
         void handleOther(const QString& );
-        int checkFile( const QString& file );
+        /* will alter the file name */
+        int checkFile( QString& file );
         bool testDateTodo(const QString& file);
         bool testAddressbook(const QString& file);
+        /* called by checkFile */
+        void tidyUp( QString& file, const QString& ending );
 
     private slots:
         void slotReceived( const QString& );
 
     private:
         Obex* m_obex;
     };
 
     class OtherHandler : public QVBox {
         Q_OBJECT
     public:
         OtherHandler();
         ~OtherHandler();
 
         void handle( const QString& file );
     private slots:
         void accept();
         void deny();
     private:
         QString targetName( const QString& file );
         void copy( const QString& src, const QString& dest );
         QLabel* m_na;
         QTextView* m_view;
         QString m_file;
     };
 }
 
 
 #endif