As promised here is the switching

It's working as expected
I'll clean up it a  bit fix some UI bugs
and then put it into the libopie.pro

2 files changed, 95 insertions, 15 deletions

diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index 91a510f..7f38f5b 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -364,19 +364,13 @@ void OFileSelector::slotCancel()
 {
   emit cancel();
 }
 /* switch the views */
 void OFileSelector::slotViewCheck(const QString &sel)
 {
-  if( sel == tr("Documents" ) ){
-      initializeOldSelector();
-      m_selector = Normal;
-
-  }else {
-;
-  }
+    setView( sel );
 }
 
 QString OFileSelector::currentMimeType() const{
     QString mime;
     QString currentText;
     if (m_shChooser && m_mimeCheck )
@@ -471,13 +465,12 @@ void OFileSelector::init()
   m_lay->setSpacing(0 );
 
   /* take care of the main view... */
   initToolbar();
 
   /* initialize the file lister */
-  initLister();
   if( m_selector == Normal ){
       QString mime;
       if (!m_autoMime) {
           if (!m_mimetypes.isEmpty() ) {
               QMap<QString, QStringList>::Iterator it;
               it = m_mimetypes.begin(); // cause we're in the init
@@ -645,12 +638,13 @@ void OFileSelector::initializeChooser()
     m_mimeCheck = new QComboBox( m_boxView, "mime check");
     m_boxView->setSpacing( 8 );
     m_lay->addWidget(m_boxView, 0 );
 
 
     updateMimeCheck();
+    fillList();
 
     connect( m_viewCheck, SIGNAL( activated(const QString & ) ),
              this, SLOT( slotViewCheck(const QString & ) ) );
     connect( m_mimeCheck, SIGNAL( activated(const QString & ) ),
              this, SLOT( slotMimeCheck( const QString & ) ) );
   }
@@ -720,16 +714,12 @@ void OFileSelector::initToolbar() {
     if(!m_shClose )
         m_close->hide();
 
     m_mainView->setToolbar( m_pseudo );
     m_lay->addWidget( m_mainView,  100 );
 }
-/* initialize the OLocalLister */
-void OFileSelector::initLister() {
-    m_lister = new OLocalLister(this);
-}
 /* put default locations into the bar */
 void OFileSelector::initLocations () {
 
     // let;s fill the Location ComboBox
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
@@ -936,23 +926,91 @@ void OFileSelector::reparse()
   if( m_shTool ){
     m_location->insertItem( m_currentDir );
 
   }
   // reenable painting and updates
 }
-
+/* switch lister to  @param lister */
+void OFileSelector::setLister(const QString& lister) {
+    QStringList listerList = factory()->lister();
+
+    if (listerList.contains(lister) ) {
+        delete (OLister*) m_lister;
+        m_lister = factory()->lister( lister, this );
+    }else if (!m_lister ) {
+        /*
+         * if we do not have a lister
+         * we need to take the default one
+         */
+        m_lister = new OLocalLister(this);
+    }
+    m_listerName = lister;
+}
+void OFileSelector::setView( const QString& lis ) {
+    qWarning("setView ");
+    fillList();
+    if ( lis == tr("Documents") ) {
+        m_selector = Normal;
+        delete m_lister;
+        delete m_fileView;
+        m_lister = 0l;
+        m_fileView = 0l;
+        initializeOldSelector();
+    }else {
+        QString list;
+
+        delete m_lister;
+        delete m_fileView;
+        delete m_select;
+        m_lister =0l;
+        m_fileView = 0l;
+        m_select = 0l;
+        if ( lis.startsWith("All") ) {
+            m_selector = ExtendedAll;
+            list = lis.mid(4 ).stripWhiteSpace();
+        } else{
+            list = lis;
+            m_selector = Extended;
+        }
+        setLister(m_listerName);
+        m_fileView = factory()->view( list, this, m_mainView );
+        m_mainView->setWidget( m_fileView->widget() );
+        reparse();
+    }
+}
 /*
  * the factory
  */
 void OFileSelector::initFactory() {
     m_fileFactory = new OFileFactory();
     m_fileFactory->addLister(tr("Files"), newLocalLister );
     m_fileFactory->addView(tr("List View"), newFileListView );
     /* the factory is just a dummy */
     m_fileFactory->addView(tr("Documents"), newFileListView );
 }
+void OFileSelector::fillList() {
+    qWarning("fill list");
+    if (!m_viewCheck )
+        return;
+
+    m_viewCheck->clear();
+    QStringList list = factory()->views();
+    qWarning("views: " + list.join(";") );
+    for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+        qWarning( (*it) );
+        if ( (*it) == tr("Documents") ) {
+            m_viewCheck->insertItem( (*it) );
+        }else{
+            m_viewCheck->insertItem( (*it) );
+            m_viewCheck->insertItem( tr("All ") + (*it) );
+        }
+    }
+}
+OFileFactory* OFileSelector::factory() {
+    return m_fileFactory;
+}
 
 
 OFileView* OFileSelector::currentView() {
     return m_fileView;
 }
 OFileView* OFileSelector::currentView() const{
@@ -1019,6 +1077,24 @@ void OFileSelector::initializeOldSelector() {
             this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
     connect(m_select, SIGNAL(closeMe() ),
             this, SIGNAL(closeMe() ) );
     //connect to close me and other signals as well
     m_mainView->setWidget( m_select );
 }
+/*
+ * initialize the listview
+ * we will call fillList
+ * setLister
+ * with QString::null to get the default
+ * setView with either Files or All Files
+ * depending on Extended
+ */
+void OFileSelector::initializeView() {
+    setLister(QString::null);
+    fillList();
+    if (m_selector == Extended ) {
+        setView( tr("Files") );
+    }else{
+        setView( tr("All Files") );
+    }
+}
+
diff --git a/libopie/ofileselector/ofileselector.h b/libopie/ofileselector/ofileselector.h
index 3e834fb..76c3ced 100644
--- a/libopie/ofileselector/ofileselector.h
+++ b/libopie/ofileselector/ofileselector.h
@@ -34,12 +34,13 @@
 #ifndef opiefileselector_h
 #define opiefileselector_h
 
 #include <qpe/fileselector.h>
 
 #include <qdir.h>
+#include <qguardedptr.h>
 #include <qwidget.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qmap.h>
 #include <qvaluelist.h>
@@ -228,12 +229,14 @@ class OFileSelector : public QWidget {
 
   /**
    * set the Selector Mode
    */
   void setMode( int );
 
+  void setLister( const QString& name );
+  void setView( const QString& all );
   /**
    * whether or not to show dirs
    */
   bool showDirs()const { return m_dir; }
 
   /**
@@ -374,12 +377,13 @@ class OFileSelector : public QWidget {
 
  private:
 
     OFileFactory* m_fileFactory;
     OFileSelectorMain* m_mainView;
     OLister* m_lister;
+    QString m_listerName;
     OFileView* m_fileView;
     FileSelector* m_select;
     int m_mode, m_selector;
     QComboBox *m_location,
       *m_mimeCheck,
       *m_viewCheck;
@@ -443,16 +447,16 @@ class OFileSelector : public QWidget {
     /**
      * Updates the QComboBox with the current mimetypes
      */
     void updateMimeCheck();
 
     void initializeOldSelector();
-    void initLister();
     void initToolbar();
     void initLocations();
-    void initializeView() {}; // FIXME
+    void initializeView(); // FIXME
+    void fillList();
     void initFactory();
     /**
      * Returns the current mimetype
      */
     QString currentMimeType()const;
     class OFileSelectorPrivate;