initial new doc tab using ofileselector

2 files changed, 93 insertions, 38 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index bcc2495..d9fc8e4 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -22,6 +22,8 @@
 //      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>
@@ -197,7 +199,7 @@ void CategoryTabWidget::addItem( const QString& linkfile )
 }
 
 void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
-	AppLnkSet* docFolder, const QList<FileSystem> &fs)
+ AppLnkSet* /*docFolder*/, const QList<FileSystem> & /*fs*/)
 {
     QString current;
     if ( categoryBar ) {
@@ -251,13 +253,23 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     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)) );
 
@@ -273,9 +285,20 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
     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
@@ -318,13 +341,10 @@ void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
 	tab->fgColor = QColor(tabTextCol);
 }
 
-void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs)
-{
-    docview->populate( docFolder, QString::null );
-    docFolder->detachChildren();
-    docview->setFileSystems(fs);
-    docview->updateTools();
-}
+//void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
+//{
+   //     docFolder->detachChildren();
+//}
 
 void CategoryTabWidget::tabProperties()
 {
@@ -343,7 +363,7 @@ void CategoryTabWidget::tabProperties()
 
 QString CategoryTabWidget::getAllDocLinkInfo() const
 {
-    return docview->getAllDocLinkInfo();
+   return "";
 }
 
 LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label )
@@ -361,15 +381,14 @@ LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm,
 
 void CategoryTabWidget::updateLink(const QString& linkfile)
 {
-    int i=0;
-    LauncherView* view;
+   //       LauncherView* view;
     qApp->processEvents();
-    while ((view = (LauncherView*)stack->widget(i++))) {
-	if ( view->removeLink(linkfile) )
-	    break;
-    }
-    addItem(linkfile);
-    docview->updateTools();
+//          while ((view = (LauncherView*)stack->widget(i++))) {
+//        if ( view->removeLink(linkfile) )
+//            break;
+//          }
+   //   addItem(linkfile);
+   fileSel->reparse();
 }
 
 void CategoryTabWidget::paletteChange( const QPalette &p )
@@ -387,7 +406,7 @@ void CategoryTabWidget::setBusy(bool on)
     if ( on )
 	((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
     else
-	for (int i=0; i<tabs; i++)
+  for (int i=0; i<tabs-1; i++)
 	    ((LauncherView*)stack->widget(i))->setBusy(FALSE);
 }
 
@@ -648,6 +667,7 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
 	this, SLOT(properties(AppLnk*)));
 
+
 #if !defined(QT_NO_COP)
     QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
@@ -732,16 +752,13 @@ void Launcher::updateMimeTypes(AppLnkSet* folder)
  */
 void Launcher::loadDocs() // ok here comes a hack belonging to Global::
 {
-
     OWait *owait = new OWait();
     Global::statusMessage( tr( "Finding documents" ) );
 
     owait->show();
     qApp->processEvents();
-
-    delete docsFolder;
+   if(docsFolder) delete docsFolder;
     docsFolder = new DocLnkSet;
-
     DocLnkSet *tmp = 0;
     QString home = QString(getenv("HOME"))  + "/Documents";
     tmp = new DocLnkSet( home , QString::null);
@@ -764,9 +781,11 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
     Config mediumCfg( "medium");
     mediumCfg.setGroup("main");
     // a) -zecke we don't want to check
-    if(!mediumCfg.readBoolEntry("use", true ) )
+   if(!mediumCfg.readBoolEntry("use", true ) ) {
+      owait->hide();
+      delete owait;
       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
@@ -785,6 +804,8 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
 	  delete tmp;
 	}
       } // done
+      owait->hide();
+      delete owait;
       return; // save the else
     }
     // c) zecke
@@ -848,7 +869,6 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
 void Launcher::updateTabs()
 {
     MimeType::updateApplications(); // ### reads all applnks twice
-
     delete rootFolder;
     rootFolder = new AppLnkSet( MimeType::appsFolderName() );
 
@@ -860,7 +880,7 @@ void Launcher::updateTabs()
 void Launcher::updateDocs()
 {
     loadDocs();
-    tabs->updateDocs(docsFolder,storage->fileSystems());
+     //    tabs->updateDocs(docsFolder,storage->fileSystems());
 }
 
 void Launcher::viewSelected(const QString& s)
@@ -1317,3 +1337,19 @@ void Launcher::preloadApps()
 #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);
+   setPermissionBarVisible(false);
+   setLineEditVisible(false) ;
+  //setChooserVisible( bool chooser );
+  
+}
+
+DocumentTab::~DocumentTab() {
+
+}
+
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index c92ef5d..0616734 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -1,8 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
-**
+** This file is part of the Qtopia Environment.**
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -21,6 +20,10 @@
 #define LAUNCHER_H
 
 #include <qpe/config.h>
+#include <qpe/applnk.h>
+
+#include <opie/ofileselector.h>
+
 #include <qmainwindow.h>
 #include <qtabbar.h>
 #include <qstringlist.h>
@@ -36,6 +39,17 @@ class QWidgetStack;
 class StorageInfo;
 class SyncDialog;
 
+
+class DocumentTab : public OFileSelector
+{
+  Q_OBJECT
+public:
+ DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName);//, 4,0, "/","");
+~DocumentTab();
+private:
+
+};
+
 class CategoryTabBar : public QTabBar
 {
     Q_OBJECT
@@ -43,12 +57,15 @@ public:
     CategoryTabBar( QWidget *parent=0, const char *name=0 );
     ~CategoryTabBar();
 
+signals:
+
 protected slots:
     virtual void layoutTabs();
 
 protected:
     void paint ( QPainter *p, QTab *t, bool f ) const;
     void paintLabel( QPainter* p, const QRect& br, QTab* t, bool has_focus ) const;
+   
 };
 
 class CategoryTabWidget : public QVBox {
@@ -58,22 +75,24 @@ public:
     CategoryTabWidget( QWidget* parent );
     void initializeCategories(AppLnkSet* rootFolder, AppLnkSet* docFolder,
 	    const QList<FileSystem> &);
-    void updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs);
+//    void updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs);
     void updateLink(const QString& linkfile);
     void setBusy(bool on);
     QString getAllDocLinkInfo() const;
     LauncherView *view( const QString &id );
     void setBusyIndicatorType ( const QString &type );
+    DocumentTab *fileSel;
 signals:
     void selected(const QString&);
     void clicked(const AppLnk*);
     void rightPressed(AppLnk*);
-
+    void ofileSel(const DocLnk &);
 public slots:
     void nextTab();
     void prevTab();
     void showTab(const QString&);
-
+   void clickie(const DocLnk&);
+   void clickie(const QString &);
 protected slots:
     void tabProperties();