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
@@ -29,35 +29,40 @@
 #include <qnamespace.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qwidgetstack.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 
 #include <qpe/fileselector.h>
+#include <qpe/applnk.h>
+#include <qpe/global.h>
 
 #include "ofileselector.h"
 
 
 OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName,
                              const QString &fileName, const QStringList mimetypes ) : QWidget( wid )
 {
   m_selector = selector;
   m_currentDir = dirName;
   m_name = fileName;
   m_mimetypes = mimetypes;
+  if( mimetypes.isEmpty() )
+    m_autoMime = true;
+
   m_mode = mode;
   m_shTool = true;
   m_shPerm = true;
   m_shLne = true;
   m_shChooser = true;
   m_shYesNo = true;
   // for FILESELECTOR only view is interesting
   m_location = 0;
   m_homeButton = 0;
   m_docButton = 0;
   m_hideButton = 0;
   m_ok = 0;
@@ -73,24 +78,25 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString
   m_lay = 0;
   m_boxToolbar = 0;
   m_boxOk = 0;
   m_edit = 0;
 
   m_fnLabel = 0;
   m_checkPerm = 0;
   m_mimeCheck = 0;
   m_viewCheck = 0;
 
   m_lay = new QVBoxLayout(this);
   init();
+  m_edit->setText( fileName );
 }
 
 // let's initialize the gui
 /**
    --------------------
    | cmbBox   Button  |
    --------------------
    | FileSlector      |
    |       or         |
    | OSelector        |
    |                  |
    |                  |
@@ -317,37 +323,91 @@ void OFileSelector::initializeChooser()
 
   m_mimeCheck = new QComboBox(this, "mime check");
   m_viewCheck = new QComboBox(this, "view check");
   m_boxView->addWidget(m_viewCheck, 0 );
   m_boxView->insertSpacing(1, 8 );
   m_boxView->addWidget(m_mimeCheck, 0 );
   m_lay->addLayout(m_boxView );
 
   m_viewCheck->insertItem(tr("Documents") );
   m_viewCheck->insertItem(tr("Files") );
   m_viewCheck->insertItem(tr("All Files") );
 
+  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 ){
   qWarning("changed: show %s", view.latin1() );
   // if the current view is the one
-
+  QString currMime = m_mimeCheck->currentText();
   if( view == QString::fromLatin1("Documents") ){
     // get the mimetype now
     // 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") ){
     if( m_select != 0 ){
       // remove from the stack
       delete m_select;
       m_select = 0;
+      m_selector = EXTENDED;
+      // create the ListView or IconView
+
+      reparse();
     }
   }else if(view == QString::fromLatin1("All Files") ) {
     // remove from the stack
     delete m_select;
     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
@@ -75,25 +75,26 @@ class OFileSelectorItem : public QListViewItem {
   }
   QString path()const{
     return text(1 );
   }
  private:
   bool dir:1;
 };
 
 class OFileSelector : public QWidget {
   Q_OBJECT
  public:
   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() );
 
   bool showToolbar() const { return m_shTool;  };
   bool showPermissionBar() const {  return m_shPerm; };
   bool showLineEdit()const { return m_shLne; };
   bool showChooser( )const { return m_shChooser; };
   bool showYesCancel()const { return m_shYesNo;  };
   void setShowYesCancel( bool show );
   void setShowToolbar( bool show );
   void setShowPermissionBar( bool show );
   void setShowLineEdit(bool show) ;
   void setShowChooser( bool chooser );
@@ -114,26 +115,28 @@ class OFileSelector : public QWidget {
 
  signals:
   void fileSelected( const DocLnk & );
   void fileSelected( const QString & );
   void closeMe();
   void ok();
   void cancel();
 
  protected slots:
   void slotOk();
   void slotCancel();
   void slotViewCheck(const QString & );
+  void slotMimeCheck(const QString & );
  protected:
   void init();
+  void updateMimes();
   int m_mode, m_selector;
   QComboBox *m_location, *m_mimeCheck, *m_viewCheck;
   QPushButton *m_homeButton, *m_docButton, *m_hideButton, *m_ok, *m_cancel;
   QPushButton  *m_reread, *m_up;
   QListView *m_View;
   QCheckBox *m_checkPerm;
 
   QString m_currentDir;
   QString m_name;
   QStringList m_mimetypes;
 
   FileSelector *m_select;
@@ -145,24 +148,25 @@ class OFileSelector : public QWidget {
   QHBoxLayout *m_boxOk;
   QHBoxLayout *m_boxName;
   QHBoxLayout *m_boxView;
 
   QLineEdit *m_edit;
   QLabel *m_fnLabel;
   bool m_shTool:1;
   bool m_shPerm:1;
   bool m_shLne:1;
   bool m_shChooser:1;
   bool m_shYesNo:1;
   bool m_boCheckPerm:1;
+  bool m_autoMime:1;
 
  protected:
 
  private:
   void delItems();
   void initializeName();
   void initializeYes();
   void initializeChooser();
 
   class OFileSelectorPrivate;
   OFileSelectorPrivate *d;