nightly commits

A improved interface thanks to jowenn and some more implementation

Actually I don't understand why it's not yet finished ;)

1 files changed, 78 insertions, 22 deletions

diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index a90219f..73674e2 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -40,3 +40,6 @@
 #include <qstringlist.h>
+#include <qmap.h>
+#include <qvaluelist.h>
 
+#include <qpe/applnk.h>
 #include <qlistview.h>
@@ -61,4 +64,4 @@ class QVBoxLayout;
 class QPopupMenu;
-
-
+class QFileInfo;
+// 
 class OFileSelectorItem : public QListViewItem {
@@ -66,3 +69,3 @@ class OFileSelectorItem : public QListViewItem {
   OFileSelectorItem(QListView *view, const QPixmap &pixmap, const QString &path,
-		    const QString &date, const QString &size,
+		    const QString &date, const QString &size, const QString &mDir,
 		    bool isDir=false ): QListViewItem(view) {
@@ -72,4 +75,9 @@ class OFileSelectorItem : public QListViewItem {
     setText(3, date );
+    //setText(4, mDir );
+    m_dir = mDir;
     dir = isDir;
   }
+  QString directory()const{
+    return m_dir;
+  }
   bool isDir()const{
@@ -80,4 +88,22 @@ class OFileSelectorItem : public QListViewItem {
   }
+  QString key(int id, bool )const {
+    QString ke;
+    if( id == 0 || id == 1 ){ // name
+      if( dir ){
+	ke.append("0" );
+	ke.append( text(1) );
+      }else{
+	ke.append("1" );
+	ke.append( text(1) );
+      }
+    }else if( id == 2 ){ // size
+      return text(2);
+    }else if( id == 3 ){ // date
+      return text(3);
+    }
+    return ke;
+  };
  private:
   bool dir:1;
+  QString m_dir;
 };
@@ -92,12 +118,13 @@ class OFileSelector : public QWidget {
 
-  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 );
+  bool isToolbarVisible() const { return m_shTool;  };
+  bool isPermissionBarVisible() const {  return m_shPerm; };
+  bool isLineEditVisible()const { return m_shLne; };
+  bool isChooserVisible( )const { return m_shChooser; };
+  bool isYesCancelVisible()const { return m_shYesNo;  };
+  void setYesCancelVisible( bool show );
+  void setToolbarVisible( bool show );
+  void setPermissionBarVisible( bool show );
+  void setLineEditVisible(bool show) ;
+  void setChooserVisible( bool chooser );
+
   QCheckBox* permissionCheckbox();
@@ -105,5 +132,18 @@ class OFileSelector : public QWidget {
   void setPermissionChecked( bool check );
+
   void setMode( int );
-  void setShowDirs(bool dir ) { };
-  bool showDirs() {bool turn; return turn; }
+
+  bool showDirs()const { return m_dir; }
+  void setShowDirs(bool );
+
+  const QListView* listview() { return m_View; };
+
+  bool isCaseSensetive()const {  return m_case; }
+  void setCaseSensetive(bool caSe );
+
+  bool showFiles()const { return m_files; };
+  void setShowFiles(bool );
+
+
+
   int mode()const { return m_mode;  };
@@ -111,6 +151,6 @@ class OFileSelector : public QWidget {
   void setSelector( int );
-  QString selectedName( );
+  
+
   void setPopupMenu( const QPopupMenu * );
 
-  const DocLnk* selectedDocument()const;
   void updateLay();
@@ -118,5 +158,17 @@ class OFileSelector : public QWidget {
   void reparse(); // re reads the dir
-  QString directory();
+
+  QString selectedName( )const;
+  QStringList selectedNames()const;
+
+  QString selectedPath() const;
+  QStringList selectedPaths() const;
+
+  QString directory()const;
   int fileCount();
 
+  /* the user needs to delete it */
+  DocLnk selectedDocument()const;
+  /* the user needs to delete it */
+  QValueList<DocLnk> selectedDocuments();
+
  signals:
@@ -166,2 +218,5 @@ class OFileSelector : public QWidget {
   bool m_autoMime:1;
+  bool m_case:1;
+  bool m_dir:1;
+  bool m_files:1;
 
@@ -171,5 +226,5 @@ class OFileSelector : public QWidget {
   // 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 ){};
+  virtual void addFile(const QString &mime, QFileInfo *info, bool symlink = FALSE );
+  virtual void addDir( const QString &mime, QFileInfo *info , bool symlink = FALSE );
+  virtual void addSymlink(const QString &mime, QFileInfo *info, bool broken = FALSE ){};
   void delItems();
@@ -179,2 +234,3 @@ class OFileSelector : public QWidget {
   void initializeListView();
+  void initPics();
   bool compliesMime(const QString &path, const QString &mime);
@@ -183,3 +239,3 @@ class OFileSelector : public QWidget {
   OFileSelectorPrivate *d;
-
+  static QMap<QString,QPixmap> *m_pixmaps;
 };