make it at least compile. ljp, please look @ the doctab

1 files changed, 14 insertions, 13 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 0205622..b612aa2 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -192,392 +192,393 @@ void CategoryTabWidget::addItem( const QString& linkfile )
 //              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++;
       }
   }
   ++it;
     }
     rootFolder->detachChildren();
     for (int i=0; i<tabs; i++)
   ((LauncherView*)stack->widget(i))->sort();
 
     // all documents
     QImage img( Resource::loadImage( "DocsIcon" ) );
     QPixmap pm;
     pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
 
     //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)) );
 
     ((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 );
     QString bgType = cfg.readEntry( "BackgroundType", "Image" );
     if ( bgType == "Image" ) { // No tr
   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 textCol = cfg.readEntry( "TextColor" );
     if ( textCol.isEmpty() )
   v->setTextColor( QColor() );
     else
   v->setTextColor( QColor(textCol) );
     QStringList font = cfg.readListEntry( "Font", ',' );
     if ( font.count() == 4 )
   v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
 
     // Tabs
     QString tabCol = cfg.readEntry( "TabColor" );
     if ( tabCol.isEmpty() )
   tab->bgColor = QColor();
     else
   tab->bgColor = QColor(tabCol);
     QString tabTextCol = cfg.readEntry( "TabTextColor" );
     if ( tabTextCol.isEmpty() )
   tab->fgColor = QColor();
     else
   tab->fgColor = QColor(tabTextCol);
 }
 
 //void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
 //{
    //     docFolder->detachChildren();
 //}
 
 void CategoryTabWidget::tabProperties()
 {
     LauncherView *view = (LauncherView*)stack->widget( categoryBar->currentTab() );
     QPopupMenu *m = new QPopupMenu( this );
     m->insertItem( tr("Icon View"), LauncherView::Icon );
     m->insertItem( tr("List View"), LauncherView::List );
     m->setItemChecked( (int)view->viewMode(), TRUE );
     int rv = m->exec( QCursor::pos() );
     if ( rv >= 0 && rv != view->viewMode() ) {
   view->setViewMode( (LauncherView::ViewMode)rv );
     }
 
     delete m;
 }
 
 QString CategoryTabWidget::getAllDocLinkInfo() const
 {
    return "";
 }
 
 LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label )
 {
     LauncherView* view = new LauncherView( stack );
     connect( view, SIGNAL(clicked(const AppLnk*)),
       this, SIGNAL(clicked(const AppLnk*)));
     connect( view, SIGNAL(rightPressed(AppLnk*)),
       this, SIGNAL(rightPressed(AppLnk*)));
     ids.append(id);
     categoryBar->addTab( new 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);
     else
   for (int i=0; i<tabs-1; 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 );
 }
 
 //===========================================================================
 
 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;
 
 //    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;
     }
     if ( mode == Pack && required > width()-1 )
   mode = HideBackText;
     for ( int i = 0; i < count(); i++ ) {
   t = tab(i);
   if ( mode != HideBackText ) {
       int w = fm.width( t->text() );
       int ih = 0;
       if ( t->iconSet() != 0 ) {
     w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
     ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
       }
       int h = QMAX( fm.height(), ih );
       h = QMAX( h, QApplication::globalStrut().height() );
 
       h += vframe;
       w += hframe;
 
       QRect tr(x, 0,
     mode == Even ? eventabwidth : w * (width()-1)/required, h);
       t->setRect(tr);
       x += tr.width() - overlap;
       r = r.unite(tr);
   } else if ( i != middleTab ) {
       int w = hiddenTabWidth;
       int ih = 0;
       if ( t->iconSet() != 0 ) {
     w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
     ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
       }
       int h = QMAX( fm.height(), ih );
       h = QMAX( h, QApplication::globalStrut().height() );
 
       h += vframe;
       w += hframe;
 
       t->setRect( QRect(x, 0, w, h) );
       x += t->rect().width() - overlap;
       r = r.unite( t->rect() );
   } else {
       int ih = 0;
       if ( t->iconSet() != 0 ) {
     ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
       }
       int h = QMAX( fm.height(), ih );
       h = QMAX( h, QApplication::globalStrut().height() );
 
       h += vframe;
 
       t->setRect( QRect(x, 0, available, h) );
       x += t->rect().width() - overlap;
       r = r.unite( t->rect() );
   }
     }
 
     QRect rr = tab(count()-1)->rect();
     rr.setRight(width()-1);
     tab(count()-1)->setRect( rr );
 
     for ( t = tabList()->first(); t; t = tabList()->next() ) {
        QRect tr = t->rect();
        tr.setHeight( r.height() );
        t->setRect( tr );
     }
 
     update();
 }
 
 
 void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
 {
     CategoryTabBar *that = (CategoryTabBar *) this;
     CategoryTab *ct = (CategoryTab *)t;
     QPalette pal = palette();
     bool setPal = FALSE;
     if ( ct->bgColor.isValid() ) {
   pal.setColor( QPalette::Active, QColorGroup::Background, ct->bgColor );
   pal.setColor( QPalette::Active, QColorGroup::Button, ct->bgColor );
   pal.setColor( QPalette::Inactive, QColorGroup::Background, ct->bgColor );
   pal.setColor( QPalette::Inactive, QColorGroup::Button, ct->bgColor );
   that->setUpdatesEnabled( FALSE );
   that->setPalette( pal );
   setPal = TRUE;
     }
 #if QT_VERSION >= 300
     QStyle::SFlags flags = QStyle::Style_Default;
     if ( selected )
         flags |= QStyle::Style_Selected;
     style().drawControl( QStyle::CE_TabBarTab, p, this, t->rect(),
                          colorGroup(), flags, QStyleOption(t) );
 #else
     style().drawTab( p, this, t, selected );
 #endif
 
     QRect r( t->rect() );
     QFont f( font() );
     if ( selected )
   f.setBold( TRUE );
     p->setFont( f );
 
     if ( ct->fgColor.isValid() ) {
   pal.setColor( QPalette::Active, QColorGroup::Foreground, ct->fgColor );
   pal.setColor( QPalette::Inactive, QColorGroup::Foreground, ct->fgColor );
   that->setUpdatesEnabled( FALSE );
   that->setPalette( pal );
   setPal = TRUE;
     }
     int iw = 0;
     int ih = 0;
     if ( t->iconSet() != 0 ) {
   iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
   ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
     }
     int w = iw + p->fontMetrics().width( t->text() ) + 4;
@@ -1152,204 +1153,204 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 //  Categories cats;
   for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
       DocLnk *doc = it.current();
       QFileInfo fi( doc->file() );
       if ( !fi.exists() )
     continue;
 
       bool fake = !doc->linkFileKnown();
       if ( !fake ) {
     QFile f( doc->linkFile() );
     if ( f.open( IO_ReadOnly ) ) {
         QTextStream ts( &f );
         ts.setEncoding( QTextStream::UnicodeUTF8 );
         contents += ts.read();
         f.close();
     } else
         fake = TRUE;
       }
       if (fake) {
     contents += "[Desktop Entry]\n";
     contents += "Categories = " + // No tr
 //        cats.labels("Document View",doc->categories()).join(";") + "\n"; // No tr
       Qtopia::Record::idsToString( doc->categories() ) + "\n";
     contents += "Name = "+doc->name()+"\n"; // No tr
     contents += "Type = "+doc->type()+"\n"; // No tr
       }
       contents += "File = "+doc->file()+"\n"; // No tr // (resolves path)
       contents += QString("Size = %1\n").arg( fi.size() ); // No tr
   }
 
   //qDebug( "sending length %d", contents.length() );
 #ifndef QT_NO_COP
   QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
   e << contents;
 #endif
 
   //qDebug( "================ \n\n%s\n\n===============",
   //contents.latin1() );
 
   delete docsFolder;
   docsFolder = 0;
 #ifdef QWS
     } else if ( msg == "setMouseProto(QString)" ) {
   QString mice;
   stream >> mice;
   setenv("QWS_MOUSE_PROTO",mice.latin1(),1);
   qwsServer->openMouse();
     } else if ( msg == "setKeyboard(QString)" ) {
   QString kb;
   stream >> kb;
   setenv("QWS_KEYBOARD",kb.latin1(),1);
   qwsServer->openKeyboard();
 #endif
     }
 }
 
 void Launcher::cancelSync()
 {
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", "cancelSync()" );
 #endif
 }
 
 void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
 {
  QDataStream stream( data, IO_ReadOnly );
     if ( msg == "setTabView(QString,int)" ) {
   QString id;
   stream >> id;
   int mode;
   stream >> mode;
   if ( tabs->view(id) )
       tabs->view(id)->setViewMode( (LauncherView::ViewMode)mode );
     } else if ( msg == "setTabBackground(QString,int,QString)" ) {
   QString id;
   stream >> id;
   int mode;
   stream >> mode;
   QString pixmapOrColor;
   stream >> pixmapOrColor;
   if ( tabs->view(id) )
       tabs->view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
     } else if ( msg == "setTextColor(QString,QString)" ) {
   QString id;
   stream >> id;
   QString color;
   stream >> color;
   if ( tabs->view(id) )
       tabs->view(id)->setTextColor( QColor(color) );
     } else if ( msg == "setFont(QString,QString,int,int,int)" ) {
   QString id;
   stream >> id;
   QString fam;
   stream >> fam;
   int size;
   stream >> size;
   int weight;
   stream >> weight;
   int italic;
   stream >> italic;
   if ( tabs->view(id) )
       if ( !fam. isEmpty ( ))
     tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
       else
     tabs->view(id)->unsetViewFont();
   qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
     }
     else if ( msg == "setBusyIndicatorType(QString)" ) {
   QString type;
   stream >> type;
   tabs->setBusyIndicatorType(type);
     }
     else if ( msg == "home()" ) {
   if ( isVisibleWindow( winId ( )))
      nextView ( );
   else
      raise ( );
 
     }
 }
 
 void Launcher::storageChanged()
 {
     if ( in_lnk_props ) {
   got_lnk_change = TRUE;
   lnk_change = QString::null;
     } else {
   updateLink( QString::null );
     }
 }
 
 
 bool Launcher::mkdir(const QString &localPath)
 {
     QDir fullDir(localPath);
     if (fullDir.exists())
   return true;
 
     // at this point the directory doesn't exist
     // go through the directory tree and start creating the direcotories
     // that don't exist; if we can't create the directories, return false
 
     QString dirSeps = "/";
     int dirIndex = localPath.find(dirSeps);
     QString checkedPath;
 
     // didn't find any seps; weird, use the cur dir instead
     if (dirIndex == -1) {
   //qDebug("No seperators found in path %s", localPath.latin1());
   checkedPath = QDir::currentDirPath();
     }
 
     while (checkedPath != localPath) {
   // no more seperators found, use the local path
   if (dirIndex == -1)
       checkedPath = localPath;
   else {
       // the next directory to check
       checkedPath = localPath.left(dirIndex) + "/";
       // advance the iterator; the next dir seperator
       dirIndex = localPath.find(dirSeps, dirIndex+1);
   }
 
   QDir checkDir(checkedPath);
   if (!checkDir.exists()) {
       //qDebug("mkdir making dir %s", checkedPath.latin1());
 
       if (!checkDir.mkdir(checkedPath)) {
     qDebug("Unable to make directory %s", checkedPath.latin1());
     return FALSE;
       }
   }
 
     }
     return TRUE;
 }
 
 void Launcher::preloadApps()
 {
     Config cfg("Launcher");
     cfg.setGroup("Preload");
     QStringList apps = cfg.readListEntry("Apps",',');
     for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
 #ifndef QT_NO_COP
   QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
 #endif
     }
 }
 
 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 );
+   //setYesCancelVisible(false);
+   //setToolbarVisible(false);
+   //setPermissionBarVisible(false);
+   //setLineEditVisible(false) ;
+   //setChooserVisible( bool chooser );
   
 }
 
 DocumentTab::~DocumentTab() {
 
 }