interface updates. and some more implementation

2 files changed, 132 insertions, 12 deletions

diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index c9abde1..b911d37 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -1,66 +1,70 @@
 /*
                =.            This file is part of the OPIE Project
-             .=l.            Copyright (c)  2002 <>
+             .=l.            Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can 
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.        
     .i_,=:_.      -<s.       This library is distributed in the hope that  
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-        
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB. 
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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 <qheader.h>
+#include <qdir.h>
 
+#include <qpe/qpeapplication.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qpe/global.h>
+#include <qpe/mimetype.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;
@@ -247,51 +251,123 @@ void OFileSelector::updateLay()
     check = m_checkPerm->isChecked();
   QString text;
 
   if( m_edit != 0 )
     text = m_edit->text();
   // save current mimetype
 
   delItems();
   delete m_checkPerm;
   delete m_edit;
   delete m_fnLabel;
   delete m_ok;
   delete m_cancel;
   delete m_mimeCheck;
   delete m_viewCheck;
   delete m_select; // test
   delete m_stack;
   //delete m_list;
   init();
   if( m_shLne )
     m_edit->setText(text );
   if( m_shPerm )
     m_checkPerm->setChecked(check );
 }
+// let's update the mimetypes. Use the current mimefilter for the 2nd QDir retrieve
+// insert QListViewItems with the right options
+bool OFileSelector::compliesMime(const QString &path, const QString &mime )
+{
+  if( mime == "All" )
+    return true;
+  MimeType type( path );
+  if( type.id() == mime )
+    return true;
+  return false;
+}
+
 void OFileSelector::reparse()
 {
+  if(m_View== 0)
+    return;
+
+  m_View->clear();
+ 
+  QDir dir( m_currentDir );
+  QString currMime =m_mimeCheck->currentText();
+  // update the mimetype now
+  if( m_autoMime ) {
+    m_mimetypes.clear();
+    m_mimeCheck->clear();
+    dir.setFilter( QDir::Files | QDir::Readable );
+    dir.setSorting(QDir::Size ); 
+    const QFileInfoList *list = dir.entryInfoList();
+    QFileInfoListIterator it( *list );
+    QFileInfo *fi;
+    while( (fi=it.current())  ){
+      if(fi->extension() == QString::fromLatin1("desktop") ){
+        ++it;
+        continue;
+      }
+      MimeType type(fi->filePath() );
+      if( !m_mimetypes.contains( type.id() ) )
+        m_mimetypes.append( type.id() );
+
+      ++it;
+    }
+    m_mimeCheck->insertStringList(m_mimetypes );
+    // set it to the current mimetype
+  };
+  dir.setFilter(QDir::All );
+  dir.setSorting(QDir::Name | QDir::DirsFirst  );
+  const QFileInfoList *list = dir.entryInfoList();
+  QFileInfoListIterator it( *list );
+  QFileInfo *fi;
+  while( (fi=it.current())  ){
+    if(fi->isSymLink() ){
+      QString file = fi->readLink();
+      for(int i=0; i<=4; i++ ){ // prepend from dos
+        QFileInfo info( file );
+        if( !info.exists() ){
+          addSymlink(m_currentDir, info.fileName(), TRUE );
+          break;
+        }else if( info.isDir() ){ 
+          //addDir( );
+        }else if( info.isFile() ){
+          
+        }else if( info.isSymLink() ){
+          file = info.readLink();
+        }else if( i == 4 ){ // just insert it and have the symlink symbol
+          addSymlink(m_currentDir, info.fileName() );
+        }
+      }
+    }else if( fi->isDir() ){
+
+    }else if( fi->isFile() ) { // file ?
 
+
+    }
+    ++it;  
+  }
 }
 QString OFileSelector::directory()
 {
   QString string;
   return string;
 }
 int OFileSelector::fileCount()
 {
   return 0;
 }
 void OFileSelector::slotOk( )
 {
   emit ok();
 }
 void OFileSelector::slotCancel( )
 {
   emit cancel();
 }
 
 void OFileSelector::initializeName()
 {
   m_boxName = new QHBoxLayout(this );
   m_edit = new QLineEdit(this );
   m_fnLabel = new QLabel(this );
@@ -344,70 +420,102 @@ void OFileSelector::initializeChooser()
 
   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
+    if( m_View != 0) // delete 0 shouldn't crash but it did :( 
+      delete m_View;
+    m_View = 0;
     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();
-    }
+    // remove from the stack
+    delete m_select;
+    m_select = 0;
+    delete m_View;
+    m_View = 0;
+    m_selector = EXTENDED;
+    // create the ListView or IconView
+    initializeListView();
+
+    reparse();
   }else if(view == QString::fromLatin1("All Files") ) {
     // remove from the stack
     delete m_select;
     m_select = 0;
+    delete m_View;
+    m_View = 0;
     m_selector = EXTENDED_ALL;
-
+    initializeListView();
     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{
-
+    // should be allreday updatet
 
   }
 };
+void OFileSelector::initializeListView()
+{
+  m_View = new QListView(m_stack, "Extended view" );
+  m_stack->addWidget( m_View, EXTENDED );
+  m_stack->raiseWidget( EXTENDED );
+  QPEApplication::setStylusOperation( m_View->viewport(),QPEApplication::RightOnHold);
+  // set up the stuff
+  // Pixmap Name Date Size mime
+  //(m_View->header() )->hide();
+  //m_View->setRootIsDecorated(false);
+  m_View->addColumn(" ");
+  m_View->addColumn(tr("Name") );
+  m_View->addColumn(tr("Size") );
+  m_View->addColumn(tr("Date"), 60 );
+  m_View->addColumn(tr("Mime Type") );
+  QHeader *header = m_View->header();
+  header->hide();
+};
+
+
+
+
+
+
+
+
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index 757a960..a90219f 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -37,96 +37,102 @@
 #include <qwidget.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
 
 #include <qlistview.h>
 /** This is OPIEs FileDialog Widget. You can use it
  *  as a dropin replacement of the fileselector and
  *  or use any of the new features.
  *  This is also a complete FileSave and FileLoad widget
  *  If you look for a Dialog check OFileDialog  
  *
  */
 class DocLnk;
 class QCheckBox;
 class QComboBox;
 class QPushButton;
 class FileSelector;
 class QGridLayout;
 class QLineEdit;
 class QLabel;
 class QWidgetStack;
 class QHBoxLayout;
 class QVBoxLayout;
+class QPopupMenu;
+
 
 class OFileSelectorItem : public QListViewItem {
  public:
   OFileSelectorItem(QListView *view, const QPixmap &pixmap, const QString &path,
                     const QString &date, const QString &size,
                     bool isDir=false ): QListViewItem(view) {
     setPixmap(0, pixmap );
     setText(1, path );
     setText(2, size );
     setText(3, date );
     dir = isDir;
   }
   bool isDir()const{
     return dir;
   }
   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 = 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 );
   QCheckBox* permissionCheckbox();
   bool setPermission() const;
   void setPermissionChecked( bool check );
   void setMode( int );
+  void setShowDirs(bool dir ) { };
+  bool showDirs() {bool turn; return turn; }
   int mode()const { return m_mode;  };
   int selector()const { return m_selector; };
   void setSelector( int );
   QString selectedName( );
+  void setPopupMenu( const QPopupMenu * );
+
   const DocLnk* selectedDocument()const;
   void updateLay();
 
   void reparse(); // re reads the dir
   QString directory();
   int fileCount();
 
  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;
@@ -141,36 +147,42 @@ class OFileSelector : public QWidget {
 
   FileSelector *m_select;
   QWidgetStack *m_stack;
   QVBoxLayout *m_lay;
   QGridLayout *m_Oselector;
 
   QHBoxLayout *m_boxToolbar;
   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:
+  // implementation todo
+  virtual void addFile(const QString &path, const QString &name, bool symlink = FALSE ) {};
+  virtual void addDir( const QString &path, const QString &dir , bool symlink = FALSE ){};
+  virtual void addSymlink(const QString &path, const QString &name, bool broken = FALSE ){};
   void delItems();
   void initializeName();
   void initializeYes();
   void initializeChooser();
+  void initializeListView();
+  bool compliesMime(const QString &path, const QString &mime);
 
   class OFileSelectorPrivate;
   OFileSelectorPrivate *d;
 
 };
 
 
 #endif