6 files changed, 69 insertions, 41 deletions

diff --git a/libopie/ofileselector/ofiledialog.cpp b/libopie/ofileselector/ofiledialog.cpp
index 4783004..430def2 100644
--- a/libopie/ofileselector/ofiledialog.cpp
+++ b/libopie/ofileselector/ofiledialog.cpp
@@ -78,13 +78,13 @@ QString OFileDialog::getOpenFileName(int selector,
                                      const MimeTypes &mimes,
                                      QWidget *wid,
                                      const QString &caption )
 {
   QString ret;
   OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption,
-                   wid, OFileSelector::OPEN, selector, startDir, file, mimes);
+                   wid, OFileSelector::Open, selector, startDir, file, mimes);
   dlg.showMaximized();
   if( dlg.exec() )
     ret = dlg.fileName();
 
   return ret;
 }
@@ -94,13 +94,13 @@ QString OFileDialog::getSaveFileName(int selector,
                                   const MimeTypes &mimes,
                                   QWidget *wid,
                                   const QString &caption )
 {
   QString ret;
   OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption,
-                   wid, OFileSelector::SAVE, selector, startDir, file, mimes);
+                   wid, OFileSelector::Save, selector, startDir, file, mimes);
   dlg.showMaximized();
   if( dlg.exec() )
     ret = dlg.fileName();
 
   return ret;
 }
diff --git a/libopie/ofileselector/ofilelistview.cpp b/libopie/ofileselector/ofilelistview.cpp
index 0c7d45b..7108a5b 100644
--- a/libopie/ofileselector/ofilelistview.cpp
+++ b/libopie/ofileselector/ofilelistview.cpp
@@ -1,7 +1,10 @@
 
+#include <qpe/mimetype.h>
+#include <qpe/resource.h>
+
 #include "ofileselector.h"
 #include "ofileselectoritem.h"
 #include "ofilelistview.h"
 
 
 OFileListView::OFileListView( QWidget* parent, OFileSelector* sel)
@@ -12,13 +15,13 @@ OFileListView::OFileListView( QWidget* parent, OFileSelector* sel)
 OFileListView::~OFileListView() {
 
 }
 void OFileListView::clear() {
     QListView::clear();
 }
-void OFileListView::addFile( const QString& mime,
+void OFileListView::addFile( const QString&,
                              QFileInfo* info,
                              bool isSymlink ) {
     MimeType type( info->absFilePath() );
     QPixmap pix = type.pixmap();
     QString dir;
     QString name;
@@ -30,14 +33,14 @@ void OFileListView::addFile( const QString& mime,
     dir = info->dirPath( true );
 
     if( isSymlink )
         name = info->fileName() + " -> " +info->dirPath() + "/" + info->readLink();
     else {
         name = info->fileName();
-        if( ( selector()->mode() == Open && !info->isReadable() )||
-            ( selector()->mode() == Save && !info->isWritable() ) ){
+        if( ( selector()->mode() == OFileSelector::Open && !info->isReadable() ) ||
+            ( selector()->mode() == OFileSelector::Save && !info->isWritable() ) ){
 
             locked = true; pix = Resource::loadPixmap("locked");
         }
     }
     new OFileSelectorItem( this, pix, name,
                            info->lastModified().toString(),
@@ -45,21 +48,21 @@ void OFileListView::addFile( const QString& mime,
                            dir, locked );
 }
 void OFileListView::addFile( const QString& /*mime*/, const QString& /*dir*/,
                              const QString& /*file*/,  bool /*isSyml*/ ) {
 
 }
-void OFileListView::addDir( const QString& mime,
-                            QFileInfo* info,  bool isSym ) {
+void OFileListView::addDir( const QString&,
+                            QFileInfo* info,  bool symlink ) {
 
     bool locked = false;
     QString name;
     QPixmap pix;
 
-    if( ( selector()->mode() == Open && !info->isReadable() ) ||
-        ( selector()->mode() == Save && !info->isWritable() ) ){
+    if( ( selector()->mode() == OFileSelector::Open && !info->isReadable() ) ||
+        ( selector()->mode() == OFileSelector::Save && !info->isWritable() ) ){
 
       locked = true;
 
       if( symlink )
         pix = selector()->pixmap("symlinkedlocked");
       else
@@ -75,23 +78,23 @@ void OFileListView::addDir( const QString& mime,
                            info->lastModified().toString(),
                            QString::number( info->size() ),
                            info->dirPath( true ), locked,
                            true );
 
 }
-void OFileListView::addDir( const QString& mime,  const QString& dir,
-                            const QString& file, bool ) {
+void OFileListView::addDir( const QString& /*mime*/,  const QString& /*dir*/,
+                            const QString& /*file*/, bool ) {
 
 }
-void OFileListView::addSymlink( const QString& mime,
-                                QFileInfo* info,
-                                bool isSym ) {
+void OFileListView::addSymlink( const QString& /*mime*/,
+                                QFileInfo* /*info*/,
+                                bool /*isSym*/ ) {
 
 }
-void OFileListView::addSymlink( const QString& mime,  const QString& path,
-                                const QString& file,  bool isSym ) {
+void OFileListView::addSymlink( const QString& /*mime*/,  const QString& /*path*/,
+                                const QString& /*file*/,  bool /*isSym*/ ) {
 
 }
 void OFileListView::cd( const QString& ) {
 
 }
 QWidget* OFileListView::widget() {
@@ -102,17 +105,21 @@ QString OFileListView::selectedName()const{
     if (!item )
         return QString::null;
 
     return item->text( 1 );
 }
 QStringList OFileListView::selectedNames()const {
-
+    QStringList list;
+    list << selectedName();
+    return list;
 }
 QString OFileListView::selectedPath()const {
-
+    return QString::null;
 }
-QString OFileListView::selectedPaths()const {
-
+QStringList OFileListView::selectedPaths()const {
+    QStringList list;
+    list << selectedPath();
+    return list;
 }
 int OFileListView::fileCount() {
     return childCount();
 }
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index f655606..16ee3ee 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -243,13 +243,13 @@ bool OFileSelector::cd(const QString &path )
   m_currentDir = path;
   reparse();
   return true;
 }
 void OFileSelector::setSelector(int mode )
 {
-QString text;
+  QString text;
   switch( mode ){
   case Normal:
     text = tr("Documents");
     break;
   case Extended:
     text = tr("Files");
@@ -258,28 +258,28 @@ QString text;
     text = tr("All Files");
     break;
   }
   slotViewCheck( text );
 }
 
-void OFileSelector::setPopupFactory(OPopupMenuFactory *popup )
+void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ )
 {
 /*  m_custom = popup;
   m_showPopup = true;
 */
 }
 
 //void OFileSelector::updateL
 
 QString OFileSelector::selectedName() const
 {
   QString name;
   if( m_selector == Normal ){
-    DocLnk lnk = m_select->selectedDocument();
-    name = lnk.file();
-  }else if( m_selector == Extended || m_selector == ExtendedAll ){
+      DocLnk lnk = m_select->selectedDocument();
+      name = lnk.file();
+  }else {
       if ( m_shLne ) {
           name = m_currentDir + "/" +m_edit->text();
       }else{
           name = m_currentDir + "/" + currentView()->selectedName();
       }
   }
@@ -301,15 +301,15 @@ QStringList OFileSelector::selectedNames()const
  */
 QString OFileSelector::selectedPath()const
 {
   QString path;
   if( m_selector == Normal ){
     path = QPEApplication::documentDir();
-  }else if( m_selector == Extended || m_selector == ExtendedAll ){
-      ; //FIXME
-  }
+  } /*else if( m_selector == Extended || m_selector == ExtendedAll ){
+      ;
+      }*/
   return path;
 }
 QStringList OFileSelector::selectedPaths() const
 {
   QStringList  list;
   list << selectedPath();
@@ -330,13 +330,13 @@ int OFileSelector::fileCount()
   case Normal:
     count = m_select->fileCount();
     break;
   case Extended:
   case ExtendedAll:
   default:
-    count = currentView()->childCount();
+      count = currentView()->fileCount();
     break;
   }
   return count;
 }
 DocLnk OFileSelector::selectedDocument() const
 {
@@ -346,13 +346,13 @@ DocLnk OFileSelector::selectedDocument() const
     lnk = m_select->selectedDocument();
     break;
   }
   case Extended:
   case ExtendedAll:
   default:
-    lnk = DocLnk( selectedName() ); // new DocLnk
+    lnk = DocLnk( selectedName() );
     break;
   }
   return lnk;
 }
 QValueList<DocLnk> OFileSelector::selectedDocuments() const
 {
@@ -369,12 +369,13 @@ void OFileSelector::slotOk()
   emit ok();
 }
 void OFileSelector::slotCancel()
 {
   emit cancel();
 }
+/* switch the views */
 void OFileSelector::slotViewCheck(const QString &sel)
 {
   if( sel == tr("Documents" ) ){
     if( m_select == 0 ){
       // autMime? fix cause now we use All and not the current
         // yes currentMime fixes that for us
@@ -401,13 +402,13 @@ void OFileSelector::slotViewCheck(const QString &sel)
     m_selector = ExtendedAll;
     initializeListView();
     reparse();
     m_stack->raiseWidget( Extended ); // same widget other QFileFilter
   }
 }
-// not yet finished.....
+
 QString OFileSelector::currentMimeType() const{
     QString mime;
     QString currentText;
     if (m_shChooser )
         currentText = m_mimeCheck->currentText();
 
@@ -628,24 +629,24 @@ void OFileSelector::initVars()
   m_custom = 0;
   m_edit = 0;
   m_fnLabel = 0;
   m_new = 0;
   m_close = 0;
 }
-void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink)
+void OFileSelector::addFile(const QString &, QFileInfo *info, bool )
 {
   if(!m_files)
     return;
   //  if( !compliesMime(info->absFilePath(), mime ) )
   //  return;
   MimeType type( info->absFilePath() );
   if (!compliesMime( type.id() ) )
       return;
 
 }
-void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink )
+void OFileSelector::addDir(const QString &, QFileInfo *, bool  )
 {
   if(!m_dir)
     return;
 }
 void OFileSelector::delItems()
 {
@@ -922,13 +923,12 @@ bool OFileSelector::compliesMime( const QString& mime ) {
 
 
     if ( list.contains(mime) ) return true;
     qWarning("list doesn't contain it ");
     QStringList::Iterator it2;
     int pos;
-    int pos2;
     for ( it2 = list.begin(); it2 != list.end(); ++it2 ) {
         pos = (*it2).findRev("/*");
         if ( pos >= 0 ) {
             if ( mime.contains( (*it2).left(pos) ) ) return true;
         }
     }
@@ -946,14 +946,15 @@ void OFileSelector::slotFileBridgeSelected( const DocLnk &lnk )
   // emit fileSelected( lnk );
 }
 void OFileSelector::slotSelectionChanged()
 {
 
 }
-void OFileSelector::slotCurrentChanged(QListViewItem* item )
+void OFileSelector::slotCurrentChanged(QListViewItem* /*item*/ )
 {
+    /*
   if( item == 0 )
     return;
   if( m_selector == Extended || m_selector == ExtendedAll ) {
     OFileSelectorItem *sel = (OFileSelectorItem*) item; // start to use the C++ casts ;)
     qWarning("current changed");
     if(!sel->isDir() ){
@@ -965,26 +966,28 @@ void OFileSelector::slotCurrentChanged(QListViewItem* item )
           QString path =sel->directory() + "/" + str[0].stripWhiteSpace();
           emit fileSelected(path  );
           DocLnk lnk( path );
           emit fileSelected(lnk );
       }
     }
-  }
+    } */
 }
-void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &, int)
+void OFileSelector::slotClicked( int /*button*/, QListViewItem */*item*/, const QPoint &, int)
+
 {
+    /*
   if ( item == 0 )
     return;
 
   if( button != Qt::LeftButton )
     return;
 
   switch( m_selector ){
   default:
     break;
-  case Extended: // fall through
+  case Extended:  // fall through
   case ExtendedAll:{
     OFileSelectorItem *sel = (OFileSelectorItem*)item;
     if(!sel->isLocked() ){
       QStringList str = QStringList::split("->", sel->text(1) );
       if( sel->isDir() ){
         cd( sel->directory() + "/" + str[0].stripWhiteSpace() );
@@ -998,56 +1001,61 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &
         qWarning("file selected");
         emit fileSelected( lnk );
       }
     }
     break;
   }
-  }
+  } */
 }
 void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int )
 {
   if( item == 0 )
     return;
 
   if( button != Qt::RightButton )
     return;
   slotContextMenu( item );
 }
-void OFileSelector::slotContextMenu( QListViewItem *item)
+void OFileSelector::slotContextMenu( QListViewItem */*item*/)
 {
 
 }
 void OFileSelector::slotChangedDir()
 {
+    /*
   OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
   if(sel->isDir() ){
     QStringList str = QStringList::split("->", sel->text(1) );
     cd( sel->directory() + "/" + str[0].stripWhiteSpace() );
   }
+    */
 }
 void OFileSelector::slotOpen()
 {
+    /*
   OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
   if(!sel->isDir() ){
     QStringList str = QStringList::split("->", sel->text(1) );
     slotFileSelected( sel->directory() +"/" +str[0].stripWhiteSpace() );
     qWarning("slot open");
     // DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() );
     //emit fileSelected( lnk );
   }
+    */
 }
 void OFileSelector::slotRescan()
 {
 
 }
 void OFileSelector::slotRename()
 {
   reparse();
 }
 void OFileSelector::slotDelete()
 {
+    /*
   OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
   QStringList list = QStringList::split("->", sel->text(1) );
   if( sel->isDir() ){
     QString str = QString::fromLatin1("rm -rf ") + sel->directory() +"/" + list[0]; //better safe than sorry
     switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+list[0],
                                   tr("Yes"),tr("No"),0,1,1) ) {
@@ -1057,12 +1065,13 @@ void OFileSelector::slotDelete()
     }
   } else {
     QFile::remove( list[0] );
   }
   m_View->takeItem( sel );
   delete sel;
+    */
 }
 void OFileSelector::cdUP()
 {
   QDir dir( m_currentDir );
   dir.cdUp();
   if(dir.exists() ){
@@ -1207,12 +1216,15 @@ void OFileSelector::reparse()
 }
 
 
 OFileView* OFileSelector::currentView() {
     return 0l;
 }
+OFileView* OFileSelector::currentView() const{
+    return 0l;
+}
 int OFileSelector::filter() {
     int filter;
     if ( m_selector == ExtendedAll )
         filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
     else
         filter = QDir::Files | QDir::Dirs | QDir::All ;
@@ -1241,6 +1253,10 @@ void OFileSelector::internContextMenu() {
 void OFileSelector::internChangedDir( const QString& s) {
     emit dirSelected( s );
 }
 void OFileSelector::internChangedDir( const QDir& s) {
     emit dirSelected( s );
 }
+QPixmap OFileSelector::pixmap( const QString& s ) {
+
+    return (*m_pixmaps)[s];
+}
diff --git a/libopie/ofileselector/ofileselector.h b/libopie/ofileselector/ofileselector.h
index 937569d..12af732 100644
--- a/libopie/ofileselector/ofileselector.h
+++ b/libopie/ofileselector/ofileselector.h
@@ -333,14 +333,16 @@ class OFileSelector : public QWidget {
 
   DocLnk selectedDocument()const;
 
   QValueList<DocLnk> selectedDocuments()const;
 
   OFileView* currentView();
+  OFileView* currentView()const;
   int filter();
   int sorting();
+  QPixmap pixmap( const QString& );
 
  signals:
   void fileSelected( const DocLnk & );
   void fileSelected( const QString & );
   void dirSelected(const QString &dir );
   void dirSelected( const QDir& );
diff --git a/libopie/ofileselector/ofileview.cpp b/libopie/ofileselector/ofileview.cpp
index 71843c1..9bb40c9 100644
--- a/libopie/ofileselector/ofileview.cpp
+++ b/libopie/ofileselector/ofileview.cpp
@@ -23,6 +23,9 @@ void OFileView::contextMenu() {
 void OFileView::changedDir( const QString& s) {
     m_sel->internChangedDir( s );
 }
 void OFileView::changedDir( const QDir& d ) {
     m_sel->internChangedDir( d );
 }
+OFileSelector* OFileView::selector() const {
+    return m_sel;
+}
diff --git a/libopie/ofileselector/ofileview.h b/libopie/ofileselector/ofileview.h
index 997266a..1b397f5 100644
--- a/libopie/ofileselector/ofileview.h
+++ b/libopie/ofileselector/ofileview.h
@@ -87,13 +87,13 @@ protected:
 
   void fileSelected(const QString &);
   void fileSelected(const DocLnk & );
   void contextMenu();
   void changedDir(const QString &);
   void changedDir(const QDir & );
-  OFileSelector* selector();
+  OFileSelector* selector()const;
 
 private:
     OFileSelector* m_sel;
 };
 
 class OFileViewFactory {