another fix

1 files changed, 20 insertions, 20 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 5f050aa..0205622 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -120,125 +120,125 @@ public:
     CategoryTab( const QIconSet &icon, const QString &text=QString::null )
   : QTab( icon, text )
     {
     }
 
     QColor bgColor;
     QColor fgColor;
 };
 
 //===========================================================================
 
 CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
     QVBox( parent )
 {
     categoryBar = 0;
     stack = 0;
 }
 
 void CategoryTabWidget::prevTab()
 {
     if ( categoryBar ) {
   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 tab = categoryBar->currentTab();
   categoryBar->setCurrentTab( (tab + 1)%n );
     }
 }
 
 
 void CategoryTabWidget::showTab(const QString& id)
 {
     if ( categoryBar ) {
   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() ) {
+//     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;
-   }
+//        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++;
-      }
-   }
+//     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*/)
 {
    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 );
   }
     }
     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++;
       }
@@ -1297,59 +1297,59 @@ bool Launcher::mkdir(const QString &localPath)
 
     // 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
     }
 }
 
 DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName)
    : OFileSelector(parent,mode,selector,dirName,fileName)
 {
    setYesCancelVisible(false);
-   setToolbarVisible(true);
+   setToolbarVisible(false);
    setPermissionBarVisible(false);
    setLineEditVisible(false) ;
   //setChooserVisible( bool chooser );
   
 }
 
 DocumentTab::~DocumentTab() {
 
 }