updates

2 files changed, 67 insertions, 3 deletions

diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 53616f7..c9abde1 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -40,2 +40,4 @@
 #include <qpe/fileselector.h>
+#include <qpe/applnk.h>
+#include <qpe/global.h>
 
@@ -51,2 +53,5 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString
   m_mimetypes = mimetypes;
+  if( mimetypes.isEmpty() )
+    m_autoMime = true;
+
   m_mode = mode;
@@ -84,2 +89,3 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString
   init();
+  m_edit->setText( fileName );
 }
@@ -328,8 +334,28 @@ void OFileSelector::initializeChooser()
 
+  if(!m_autoMime )
+    m_mimeCheck->insertItem(m_mimetypes.join("," ) );
+  else{ // check
+    updateMimes();
+    m_mimeCheck->insertStringList( m_mimetypes );
+  }
+
   connect( m_viewCheck, SIGNAL(activated(const QString &) ),
 	   this, SLOT(slotViewCheck(const QString & ) ) );
-  
+
+  connect( m_mimeCheck, SIGNAL(activated(const QString &) ),
+	   this, SLOT(slotMimeCheck(const QString & ) ) );
 }
+void OFileSelector::slotMimeCheck(const QString &view ){
+  if(m_selector == NORMAL ){
+    delete m_select;
+    m_select = new FileSelector(view == "All" ? QString::null : view 
+				, m_stack, "fileselector", FALSE, FALSE );
+    m_stack->addWidget( m_select, NORMAL );
+    m_stack->raiseWidget( NORMAL );
+  }else{
 
 
+  }
+}
+
 void OFileSelector::slotViewCheck(const QString &view ){
@@ -337,3 +363,3 @@ void OFileSelector::slotViewCheck(const QString &view ){
   // if the current view is the one
-
+  QString currMime = m_mimeCheck->currentText();
   if( view == QString::fromLatin1("Documents") ){
@@ -341,2 +367,9 @@ void OFileSelector::slotViewCheck(const QString &view ){
     // check if we're the current widget and return
+    delete m_select;
+    m_select = new FileSelector( currMime == "All" ? QString::null : currMime,
+				 m_stack,"fileselector", FALSE, FALSE );
+    m_stack->addWidget( m_select, NORMAL );
+    m_stack->raiseWidget( NORMAL );
+    m_selector = NORMAL;
+
   }else if(view == QString::fromLatin1("Files") ){
@@ -346,2 +379,6 @@ void OFileSelector::slotViewCheck(const QString &view ){
       m_select = 0;
+      m_selector = EXTENDED;
+      // create the ListView or IconView
+
+      reparse();
     }
@@ -351,3 +388,26 @@ void OFileSelector::slotViewCheck(const QString &view ){
     m_select = 0;
+    m_selector = EXTENDED_ALL;
+
+    reparse();
   };
 };
+
+
+void OFileSelector::updateMimes() // lets check which mode is active
+  // check the current dir for items then
+{
+  m_mimetypes.clear();
+  m_mimetypes.append("All" );
+  if( m_selector == NORMAL ){
+    DocLnkSet set;
+    Global::findDocuments(&set, QString::null );
+    QListIterator<DocLnk> dit( set.children() );
+    for ( ; dit.current(); ++dit ) {
+      if( !m_mimetypes.contains((*dit)->type()  ) )
+      m_mimetypes.append( (*dit)->type() );
+    }
+  }else{
+
+
+  }
+};
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index 3f53fa9..757a960 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -86,3 +86,4 @@ class OFileSelector : public QWidget {
   enum Mode {OPEN=1, SAVE, FILESELECTOR };
-  enum Selector{NORMAL=1, EXTENDED };
+  enum Selector{NORMAL=1, EXTENDED = 2, EXTENDED_ALL =4 };
+  enum View { DIRS = 1, FILES = 2, TREE = 4, ICON = 8 };
   OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName, const QString &fileName = QString::null, const QStringList mimetypes = QStringList() );
@@ -125,4 +126,6 @@ class OFileSelector : public QWidget {
   void slotViewCheck(const QString & );
+  void slotMimeCheck(const QString & );
  protected:
   void init();
+  void updateMimes();
   int m_mode, m_selector;
@@ -156,2 +159,3 @@ class OFileSelector : public QWidget {
   bool m_boCheckPerm:1;
+  bool m_autoMime:1;