5 files changed, 62 insertions, 15 deletions

diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index 255e79e..9ce07dd 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -137,450 +137,441 @@ void OFileSelector::setYesCancelVisible( bool show )
     m_boxOk->show();
   else
     m_boxOk->hide();
 
 }
 void OFileSelector::setToolbarVisible( bool show )
 {
   m_shTool = show;
 
   if(!m_shTool ){
     m_location->hide();
     m_up->hide();
     m_homeButton->hide();
     m_docButton->hide();
   }else{
     m_location->show();
     m_up->show();
     m_homeButton->show();
     m_docButton->show();
   }
 }
 void OFileSelector::setPermissionBarVisible( bool show )
 {
   m_shPerm = show;
   initializePerm();
 
   if( m_shPerm )
     m_checkPerm->show();
   else
     m_checkPerm->hide();
 }
 void OFileSelector::setLineEditVisible( bool show )
 {
   if( show ){
     initializeName();
     m_boxName->show();
   }else{
       // check if we showed before this is the way to go
       if( m_shLne && m_boxName != 0 )
           m_boxName->hide();
   }
   m_shLne = show;
 }
 
 void OFileSelector::setChooserVisible( bool show )
 {
   m_shChooser = show;
   initializeChooser();
 
   if( m_shChooser )
       m_boxView->hide();
   else
       m_boxView->show();
 
 }
 
 QCheckBox* OFileSelector::permissionCheckbox()
 {
   if( m_selector == Normal )
     return 0l;
   else
     return m_checkPerm;
 }
 bool OFileSelector::setPermission()const
 {
   return m_checkPerm == 0 ? false : m_checkPerm->isChecked();
 }
 void OFileSelector::setPermissionChecked( bool check )
 {
   if( m_checkPerm )
     m_checkPerm->setChecked( check );
 }
 
 void OFileSelector::setMode(int mode) // FIXME do direct raising
 {
   m_mode = mode;
   if( m_selector == Normal )
     return;
 }
 void OFileSelector::setShowDirs(bool dir)
 {
   m_dir = dir;
   if ( m_selector != Fileselector )
       reparse();
 }
 void OFileSelector::setCaseSensetive(bool caSe )
 {
   m_case = caSe;
 
   if ( m_selector != Fileselector )
       reparse();
 }
 void OFileSelector::setShowFiles(bool show )
 {
   m_files = show;
   reparse();
 }
 ///
 bool OFileSelector::cd(const QString &path )
 {
   m_currentDir = path;
   reparse();
   return true;
 }
 void OFileSelector::setSelector(int mode )
 {
   QString text;
   switch( mode ){
   case Normal:
     text = tr("Documents");
     break;
   case Extended:
     text = tr("List View");
     break;
   case ExtendedAll:
     text = tr("All List View");
     break;
   }
   slotViewCheck( text );
 }
 
 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_shLne ) {
-          name = m_currentDir + "/" +m_edit->text();
-      }else{
-          name = m_currentDir + "/" + currentView()->selectedName();
-      }
+      name = currentLister()->selectedName();
   }
   return name;
 }
 QStringList OFileSelector::selectedNames()const
 {
   QStringList list;
   if( m_selector == Normal ){
     list << selectedName();
   }else  {
     list << selectedName(); // FIXME implement multiple Selections
   }
   return list;
 }
 /** If mode is set to the Dir selection this will return the selected path.
  *
  *
  */
 QString OFileSelector::selectedPath()const
 {
   QString path;
   if( m_selector == Normal ){
     path = QPEApplication::documentDir();
   }  /* normal case to do */
   return path;
 }
 QStringList OFileSelector::selectedPaths() const
 {
   QStringList  list;
   list << selectedPath();
   return list;
 }
 QString OFileSelector::directory()const
 {
   if( m_selector == Normal )
     return QPEApplication::documentDir();
 
   return QDir(m_currentDir).absPath();
 }
 
 int OFileSelector::fileCount()
 {
   int count;
   switch( m_selector ){
   case Normal:
     count = m_select->fileCount();
     break;
   case Extended:
   case ExtendedAll:
   default:
       count = currentView()->fileCount();
     break;
   }
   return count;
 }
 DocLnk OFileSelector::selectedDocument() const
 {
   DocLnk lnk;
   switch( m_selector ){
   case Normal:{
     lnk = m_select->selectedDocument();
     break;
   }
   case Extended:
   case ExtendedAll:
   default:
     lnk = DocLnk( selectedName() );
     break;
   }
   return lnk;
 }
 QValueList<DocLnk> OFileSelector::selectedDocuments() const
 {
   QValueList<DocLnk> docs;
   docs.append( selectedDocument() );
   return docs;
 }
 
 
 // slots internal
 
 void OFileSelector::slotOk()
 {
   emit ok();
 }
 void OFileSelector::slotCancel()
 {
   emit cancel();
 }
 /* switch the views */
 void OFileSelector::slotViewCheck(const QString &sel)
 {
     setView( sel );
 }
 
 QString OFileSelector::currentMimeType() const{
     QString mime;
     QString currentText;
     if (m_shChooser && m_mimeCheck )
         currentText = m_mimeCheck->currentText();
 
     qWarning("CurrentText" + currentText );
     if (tr("All") == currentText ) return QString::null;
     else if (currentText.isEmpty() ) {
         ;
     }else {
         QMap<QString, QStringList>::ConstIterator it;
         it = m_mimetypes.find( currentText );
         if ( it != m_mimetypes.end() ) {
             mime = it.data().join(";");
         }else{
             mime = currentText;
         }
     }
     return mime;
 }
 void OFileSelector::slotMimeCheck(const QString &mime)
 {
     if( m_selector == Normal ){
         initializeOldSelector();
 
         updateMimes();
         updateMimeCheck();
         m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime) );
     }else{ // others
         qWarning("Mime %s", mime.latin1() );
         if(m_shChooser ){
             qWarning("Current Text %s", m_mimeCheck->currentText().latin1() );
             //m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime)  );
         }
         reparse();
     }
 }
 /*
  * Ok if a non dir gets inserted into this combobox
  * we need to change it
  * QFileInfo and dirPath will give us the right Dir
  */
 void OFileSelector::slotLocationActivated(const QString &file)
 {
     qWarning("slotLocationActivated");
     QString name = file.left( file.find("<-", 0, TRUE ) );
     QFileInfo info( name );
     if ( info.isFile() )
         cd(info.dirPath( TRUE ) ); //absolute
     else
         cd(name );
-    reparse();
 }
 void OFileSelector::slotInsertLocationPath(const QString &currentPath, int count)
 {
   QStringList pathList;
   bool underDog = FALSE;
   for(int i=0;i<count;i++) {
     pathList << m_location->text(i);
     if( m_location->text(i) == currentPath)
       underDog = TRUE;
   }
   if( !underDog) {
     m_location->clear();
     if( currentPath.left(2)=="//")
       pathList.append( currentPath.right(currentPath.length()-1) );
     else
       pathList.append( currentPath );
     m_location->insertStringList( pathList,-1);
   }
 }
 /*
  * Do not crash anymore
  * don't try to change dir to a file
  */
 void OFileSelector::locationComboChanged()
 {
     QFileInfo info( m_location->lineEdit()->text() );
     qWarning("info %s %s", info.dirPath(true).latin1(), m_location->lineEdit()->text().latin1() );
     if (info.isFile() )
         cd(info.dirPath(TRUE) ); //absolute path
     else
         cd( m_location->lineEdit()->text() );
-
-    reparse();
 }
 void OFileSelector::init()
 {
   initFactory();
   m_lay = new QVBoxLayout( this );
   m_lay->setSpacing(0 );
 
   /* take care of the main view... */
   initToolbar();
   //if( m_shChooser ) // the Chooser for the view and Mimetypes
   initializeChooser();
 
   /* initialize the file lister */
   if( m_selector == Normal ){
       QString mime;
       if (!m_autoMime) {
           if (!m_mimetypes.isEmpty() ) {
               QMap<QString, QStringList>::Iterator it;
               it = m_mimetypes.begin(); // cause we're in the init
               mime = it.data().join(";");
           }
       }
       initializeOldSelector();
   }else{
       initializeView();
   }
 
   if( m_shLne ) // the LineEdit with the current FileName
       initializeName();
 
   if( m_shPerm ) // the Permission QCheckBox
       initializePerm();
 
   if( m_shYesNo ) // the Yes No button row
       initializeYes( );
 
   if (m_selector != Normal )
       reparse();
 }
 void OFileSelector::updateMimes()
 {
   if( m_autoMime ){
     m_mimetypes.clear();
     m_mimetypes.insert( tr("All"), QString::null );
     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.insert( (*dit)->type(), (*dit)->type() );
       }
     }// else done in reparse
   }
 }
 void OFileSelector::initVars()
 {
   if( m_mimetypes.isEmpty() )
     m_autoMime = true;
   else
     m_autoMime = false;
 
   m_shClose = false;
   m_shNew = false;
   m_shTool = true;
   m_shPerm = false;
   m_shLne = true;
   m_shChooser = true;
   m_shYesNo = true;
   m_case = false;
   m_dir = true;
   m_files = true;
   m_showPopup = false;
   m_mainView = 0l;
   m_fileView = 0l;
   m_lister = 0l;
 
   if(m_pixmaps == 0 ) // init the pixmaps
     initPics();
 
   // pointers
   m_location = 0;
   m_mimeCheck = 0;
   m_viewCheck = 0;
   m_homeButton = 0;
   m_docButton = 0;
   m_hideButton = 0;
   m_ok = 0;
   m_cancel = 0;
   m_reread = 0;
   m_up = 0;
   m_View = 0;
   m_checkPerm = 0;
   m_pseudo = 0;
   m_pseudoLayout = 0;
   m_select = 0;
   m_lay = 0;
   m_Oselector = 0;
   m_boxToolbar = 0;
   m_boxOk = 0;
   m_boxName = 0;
   m_boxView = 0;
   m_edit = 0;
   m_fnLabel = 0;
   m_new = 0;
   m_close = 0;
 }
 void OFileSelector::initializeName()
 {
   /**  Name Layout Line
    *   This is the Layout line arranged in
    *   horizontal way each components
    *   are next to each other
    *   but we will only do this if
    *   we didn't initialize a while ago.
    */
   if( m_boxName == 0 ){
     m_boxName = new QHBox( this ); // remove this this? or use a QHBox
     m_fnLabel = new QLabel( m_boxName );
     m_fnLabel->setText( tr("Name:") );
     m_edit = new QLineEdit( m_boxName );
     m_edit->setText( m_name );
     //m_boxName->addWidget( m_fnLabel );
     m_boxName->setMargin( 5 );
     m_boxName->setSpacing( 8 );
     //m_boxName->setStretchFactor(m_edit, 100 ); // 100 is stretch factor
 
     m_lay->addWidget( m_boxName, 0 ); // add it to the topLevel layout
@@ -729,266 +720,266 @@ void OFileSelector::initLocations () {
     }
     int count = m_location->count();
     m_location->insertItem( m_currentDir );
     m_location->setCurrentItem( count );
 
 }
 void OFileSelector::initializePerm()
 {
   if( m_checkPerm == 0 ){
     m_checkPerm = new QCheckBox(tr("Set Permission"), this, "perm");
     m_checkPerm->setChecked( false );
     m_lay->addWidget( m_checkPerm );
   }
 }
 void OFileSelector::initPics()
 {
   m_pixmaps = new QMap<QString,QPixmap>;
   QPixmap pm  = Resource::loadPixmap( "folder"  );
   QPixmap lnk = Resource::loadPixmap( "opie/symlink"  );
 
   QPainter painter( &pm );
   painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
   pm.setMask( pm.createHeuristicMask( FALSE ) );
   m_pixmaps->insert("dirsymlink", pm );
 
   QPixmap pm2 = Resource::loadPixmap( "lockedfolder" );
   QPainter pen(&pm2 );
   pen.drawPixmap(pm2.width()-lnk.width(), pm2.height()-lnk.height(), lnk );
   pm2.setMask( pm2.createHeuristicMask( FALSE ) );
   m_pixmaps->insert("symlinkedlocked", pm2 );
 }
 // if a mime complies with the m_mimeCheck->currentItem
 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;
 }
 /*  check if the mimetype in mime
  *  complies with the  one which is current
  */
 /*
  * We've the mimetype of the file
  * We need to get the stringlist of the current mimetype
  *
  * mime = image/jpeg
  * QStringList = 'image/*'
  * or QStringList = image/jpeg;image/png;application/x-ogg
  * or QStringList = application/x-ogg;image/*;
  * with all these mime filters it should get acceptes
  * to do so we need to look if mime is contained inside
  * the stringlist
  * if it's contained return true
  * if not ( I'm no RegExp expert at all ) we'll look if a '/*'
  * is contained in the mimefilter and then we will
  * look if both are equal until the '/'
  */
 bool OFileSelector::compliesMime( const QString& mime ) {
     qWarning("mimetype is %s", mime.latin1() );
     QString currentText;
     if (m_shChooser )
         currentText = m_mimeCheck->currentText();
 
     qWarning("current text is %s", currentText.latin1() );
     QMap<QString, QStringList>::Iterator it;
     QStringList list;
     if ( currentText == tr("All") ) return true;
     else if ( currentText.isEmpty() && !m_mimetypes.isEmpty() ) {
         it = m_mimetypes.begin();
         list = it.data();
     }else if ( currentText.isEmpty() ) return true;
     else{
         it = m_mimetypes.find(currentText );
         if ( it == m_mimetypes.end() ) qWarning("not there"), list << currentText;
         else qWarning("found"), list = it.data();
     }
 
 
     if ( list.contains(mime) ) return true;
     qWarning("list doesn't contain it ");
     QStringList::Iterator it2;
     int pos;
     for ( it2 = list.begin(); it2 != list.end(); ++it2 ) {
         pos = (*it2).findRev("/*");
         if ( pos >= 0 ) {
             if ( mime.contains( (*it2).left(pos) ) ) return true;
         }
     }
     return false;
 }
 void OFileSelector::slotFileSelected( const QString &string )
 {
   if( m_shLne )
     m_edit->setText( string );
   emit fileSelected( string );
 }
 void OFileSelector::slotFileBridgeSelected( const DocLnk &lnk )
 {
   slotFileSelected( lnk.name() );
   // emit fileSelected( lnk );
 }
 
 
 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) ) {
     case 0:
       ::system(str.utf8().data() );
     break;
     }
   } else {
     QFile::remove( list[0] );
   }
   m_View->takeItem( sel );
   delete sel;
     */
 }
 void OFileSelector::cdUP()
 {
+    // FIXME won't work on non filesystem based systems
+    // better call the Olister
   QDir dir( m_currentDir );
   dir.cdUp();
   if(dir.exists() ){
     m_currentDir = dir.absPath();
     reparse();
     int count = m_location->count();
     slotInsertLocationPath( m_currentDir, count);
     m_location->setCurrentItem( indexByString( m_location, m_currentDir));
-    //this wont work in all instances
-    // FIXME
   }
 }
 void OFileSelector::slotHome()
 {
   cd(QDir::homeDirPath() );
 }
 void OFileSelector::slotDoc()
 {
   cd(QPEApplication::documentDir() );
 }
 void OFileSelector::slotNavigate( )
 {
 
 }
 // fill the View with life
 void OFileSelector::reparse()
 {
   if( m_selector == Normal )
     return;
 
   currentView()->clear();
 
   if( m_shChooser)
     qWarning("reparse %s", m_mimeCheck->currentText().latin1() );
 
   QString currentMimeType;
 
   // let's update the mimetype
   if( m_autoMime ){
     m_mimetypes.clear();
     // ok we can change mimetype so we need to be able to give a selection
     if( m_shChooser ) {
       currentMimeType = m_mimeCheck->currentText();
       m_mimeCheck->clear();
 
       // let's find possible mimetypes
       m_mimetypes = currentLister()->mimeTypes( m_currentDir );
 
       // add them to the chooser
       updateMimeCheck();
       m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) );
       currentMimeType = m_mimeCheck->currentText();
     }
   }else { // no autoMime
       // let the mimetype be set from out side the m_mimeCheck FEATURE
 
     if( m_shChooser )
         currentMimeType = m_mimeCheck->currentText();
 
   }
   // now we got our mimetypes we can add the files
 
   currentLister()->reparse( m_currentDir );
   /* we're done with adding let's sort */
   currentView()->sort();
 
 
   if( m_shTool ){
     m_location->insertItem( m_currentDir );
 
   }
   // reenable painting and updates
 }
 /* switch lister to  @param lister */
 void OFileSelector::setLister(const QString& lister) {
     QStringList listerList = factory()->lister();
 
     if (listerList.contains(lister) ) {
         delete (OLister*) m_lister;
         m_lister = factory()->lister( lister, this );
     }else if (!m_lister ) {
         /*
          * if we do not have a lister
          * we need to take the default one
          */
         m_lister = new OLocalLister(this);
     }
     m_listerName = lister;
 }
 void OFileSelector::setView( const QString& lis ) {
     qWarning("setView ");
     fillList();
     if ( lis == tr("Documents") ) {
         m_selector = Normal;
         delete m_lister;
         delete m_fileView;
         m_lister = 0l;
         m_fileView = 0l;
         initializeOldSelector();
     }else {
         qWarning("lis %s", lis.latin1() );
         QString list;
 
         delete m_lister;
         delete m_fileView;
         delete m_select;
         m_lister =0l;
         m_fileView = 0l;
         m_select = 0l;
         if ( lis.startsWith("All") ) {
             m_selector = ExtendedAll;
             list = lis.mid(4 ).stripWhiteSpace();
         } else{
             list = lis;
             m_selector = Extended;
         }
         setLister(m_listerName);
         m_fileView = factory()->view( list, this, m_mainView );
         m_mainView->setWidget( m_fileView->widget() );
         reparse();
     }
 }
 /*
  * the factory
  */
 void OFileSelector::initFactory() {
     m_fileFactory = new OFileFactory();
     m_fileFactory->addLister(tr("Files"), newLocalLister );
     m_fileFactory->addView(tr("List View"), newFileListView );
     /* the factory is just a dummy */
     m_fileFactory->addView(tr("Documents"), newFileListView );
 }
 void OFileSelector::fillList() {
     qWarning("fill list");
     if (!m_viewCheck )
         return;
 
     m_viewCheck->clear();
diff --git a/libopie/ofileselector/olister.cpp b/libopie/ofileselector/olister.cpp
index ea09940..aaaf6a2 100644
--- a/libopie/ofileselector/olister.cpp
+++ b/libopie/ofileselector/olister.cpp
@@ -1,171 +1,181 @@
 #include <qcombobox.h>
+#include <qlineedit.h>
 
 #include "olister.h"
 #include "ofileview.h"
 #include "opixmapprovider.h"
 #include "ofileselector.h"
 
 
 OLister::OLister( OFileSelector* view)
     : m_view( view ), m_acc( 0l )
 {
     m_prov = new OPixmapProvider( view );
 }
 OLister::~OLister() {
     delete m_prov;
 }
 void OLister::setPixmapProvider( OPixmapProvider* prov ) {
     delete m_prov;
     m_prov = prov;
 }
 bool OLister::showFiles()const {
     return m_view->showFiles();
 }
 bool OLister::showDirs()const {
     return m_view->showDirs();
 }
 void OLister::addFile( const QString& mine,
                        QFileInfo* info,
                        const QString& extra,
                        bool isSymlink ) {
     int t = isSymlink ?  OPixmapProvider::File | OPixmapProvider::Symlink :
             OPixmapProvider::File;
     QPixmap pix = provider()->pixmap(t, mine,
                                      info);
     view()->currentView()->addFile( pix,
                                     mine,
                                     info,
                                     extra,
                                     isSymlink );
 }
 void OLister::addFile( const QString& mine,
                        const QString& path,
                        const QString& file,
                        const QString& extra,
                        bool isSymlink ) {
     int t = isSymlink ? OPixmapProvider::File | OPixmapProvider::Symlink :
             OPixmapProvider::File;
 
     QPixmap pix = provider()->pixmap(t, mine, path, file );
     view()->currentView()->addFile( pix,
                                     mine,
                                     path,
                                     file,
                                     extra,
                                     isSymlink );
 }
 void OLister::addDir( const QString& mine,
                       QFileInfo* info,
                       const QString& extra,
                       bool isSymlink  ) {
     int t = isSymlink ? OPixmapProvider::Dir | OPixmapProvider::Symlink :
             OPixmapProvider::Dir;
     QPixmap pix = provider()->pixmap(t, mine, info );
     view()->currentView()->addDir( pix,
                                    mine,
                                    info,
                                    extra,
                                    isSymlink );
 }
 void OLister::addDir( const QString& mine,
                       const QString& path,
                       const QString& dir,
                       const QString& extra,
                       bool isSymlink ) {
 
     int t = isSymlink ? OPixmapProvider::Dir | OPixmapProvider::Symlink :
             OPixmapProvider::Dir;
     QPixmap pix = provider()->pixmap(t, mine, path, dir );
 
     view()->currentView()->addDir( pix,
                                    mine,
                                    path,
                                    dir,
                                    extra,
                                    isSymlink );
 }
 void OLister::addSymlink( const QString& mine,
                           QFileInfo* info,
                           const QString& extra,
                           bool isSymlink ) {
     QPixmap pix = provider()->pixmap( OPixmapProvider::Symlink, mine, info );
     view()->currentView()->addSymlink( pix,
                                        mine,
                                        info,
                                        extra,
                                        isSymlink );
 }
 void OLister::addSymlink( const QString& mine,
                           const QString& path,
                           const QString& name,
                           const QString& extra,
                           bool isSymlink ) {
     QPixmap pix = provider()->pixmap( OPixmapProvider::Symlink, mine,
                                       path, name );
     view()->currentView()->addSymlink( pix,
                                        mine,
                                        path,
                                        name,
                                        extra,
                                        isSymlink );
 }
 OFileSelector* OLister::view() {
     return m_view;
 }
+OFileSelector* OLister::view()const {
+    return m_view;
+}
 OPixmapProvider* OLister::provider() {
     return m_prov;
 }
 bool OLister::compliesMime( const QString& mime ) {
     return view()->compliesMime( mime );
 }
 void OLister::internFileSelected( const QString& dir ) {
     view()->internFileSelected( dir );
 }
 void OLister::internChangedDir( const QString& dir ) {
     view()->internChangedDir( dir );
 }
 OListerCmbAccess* OLister::comboBox() {
     if (!m_acc )
         m_acc = new OListerCmbAccess( view()->m_location );
 
     return m_acc;
 }
 
 
 OListerCmbAccess::OListerCmbAccess(QComboBox* cmb )
     : m_cmb( cmb )
 {}
 OListerCmbAccess::~OListerCmbAccess() {
 }
 void OListerCmbAccess::clear() {
     if ( m_cmb )
         m_cmb->clear();
 }
 void OListerCmbAccess::setCurrentItem( const QString& add, bool FORCE_ADD) {
     if ( !m_cmb ) return;
 
 
     int c = m_cmb->count();
     for ( int i = 0; i < m_cmb->count(); i++ ) {
         if ( m_cmb->text(i) == add ) {
             m_cmb->setCurrentItem( i );
             return;
         }
     }
     if (!FORCE_ADD ) return;
 
 
     m_cmb->insertItem(add );
     m_cmb->setCurrentItem( c );
 }
 void OListerCmbAccess::insert( const QString& str ) {
     if ( m_cmb )
         m_cmb->insertItem( str );
 }
 QString OListerCmbAccess::currentText()const {
     QString str;
     if (m_cmb )
         str = m_cmb->currentText();
 
     return str;
 }
+QString OLister::lineEdit()const {
+    if ( view()->m_shLne )
+        return view()->m_edit->text();
+
+    return QString::null;
+}
diff --git a/libopie/ofileselector/olister.h b/libopie/ofileselector/olister.h
index cd84316..4adb9f8 100644
--- a/libopie/ofileselector/olister.h
+++ b/libopie/ofileselector/olister.h
@@ -1,128 +1,144 @@
 #ifndef OPIE_FILE_LISTER_H
 #define OPIE_FILE_LISTER_H
 
 #include <qfileinfo.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 class QComboBox;
 class OPixmapProvider;
 class OFileSelector;
 
 class OListerCmbAccess;
 /**
  * lister is something like KIO but very
  * very basic and currently only for
  * populating our views.
  * This is a base class which needs to be implemented.
  * @see OLocalLister for a filesystem based implementation
  */
 
 class OLister {
 public:
     OLister( OFileSelector* );
     virtual ~OLister();
-    virtual void reparse(const QString& path) = 0;
+
+    /**
+     * if path == QString::null reread current dir
+     */
+    virtual void reparse(const QString& path = QString::null ) = 0;
 
     /**
      * return a list of available mimetypes
      */
     virtual QMap<QString, QStringList> mimeTypes( const QString& dir ) = 0;
     void setPixmapProvider( OPixmapProvider* );
 
 
     /* some way a slot */
     virtual void fileSelected( const QString& dir, const QString& file, const QString& extra ) = 0;
     virtual void changedDir( const QString& dir, const QString& file, const QString& extra ) = 0;
+    virtual QString selectedName()const = 0;
+    virtual QStringList selectedNames()const = 0;
 protected:
     /**
      * I hate too big classes
      * this is a way to group
      * access to a ComboBox
      * which might exist or
      * not in a secure way
      */
     OListerCmbAccess* comboBox();
 
     bool showFiles()const;
     bool showDirs()const;
     bool compliesMime( const QString& mime );
     void addFile( const QString& mine,
                   QFileInfo*,
                   const QString& extra = QString::null,
                   bool isSymlink = FALSE );
 
     void addFile( const QString& mine,
                   const QString& path,
                   const QString& file,
                   const QString& extra = QString::null,
                   bool isSymlink = FALSE );
     void addDir( const QString& mine,
                  QFileInfo*,
                  const QString& extra = QString::null,
                  bool isSymlink = FALSE );
     void addDir( const QString& mine,
                  const QString& path,
                  const QString& dir,
                  const QString& extra = QString::null,
                  bool isSymlink = FALSE );
     void addSymlink( const QString& mine,
                      QFileInfo* info,
                      const QString& extra = QString::null,
                      bool isSymlink = FALSE);
     void addSymlink( const QString& mine,
                      const QString& path,
                      const QString& name,
                      const QString& extra = QString::null,
                      bool isSymlink = FALSE );
     OFileSelector* view();
+    OFileSelector* view()const;
     OPixmapProvider* provider();
     void internFileSelected( const QString& file );
     void internChangedDir( const QString& dir );
+
+    /**
+     * try to take
+     * the text from the mainwindows
+     * lineedit
+     * if it's not available QString::null
+     * will be returned
+     */
+    QString lineEdit()const;
 private:
     OFileSelector* m_view;
     OPixmapProvider* m_prov;
     OListerCmbAccess* m_acc;
 
     class Private;
     Private *d;
 };
 
 class OListerCmbAccess {
     friend class OLister;
 public:
     OListerCmbAccess( QComboBox* = 0l);
     ~OListerCmbAccess();
 
     /**
      * clears the combobox
      */
     void clear();
 
     /**
      * set's @param add to be the current Item
      * if the item is not present it'll be removed
      */
     void setCurrentItem( const QString& add,  bool FORECE_ADD = TRUE );
 
     /**
      * inserts the the String at
      * a non predictable position... The position is determined
      * by the QComboBox code
      */
     void insert( const QString& );
 
     /**
      *
      */
     QString currentText()const;
 
 private:
     class Private;
     Private* d;
     QComboBox* m_cmb;
 
 };
 
 #endif
diff --git a/libopie/ofileselector/olocallister.cpp b/libopie/ofileselector/olocallister.cpp
index 5d7884d..4d36d64 100644
--- a/libopie/ofileselector/olocallister.cpp
+++ b/libopie/ofileselector/olocallister.cpp
@@ -1,125 +1,150 @@
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qmap.h>
 
 #include <qpe/mimetype.h>
 
 #include "ofileselector.h"
+#include "ofileview.h"
 #include "olocallister.h"
 
 OLocalLister::OLocalLister( OFileSelector* file )
     : OLister( file )
 {
+    m_dir = QDir::homeDirPath();
 }
 OLocalLister::~OLocalLister() {
 }
 
 QMap<QString, QStringList> OLocalLister::mimeTypes( const QString& curDir ) {
     QMap<QString, QStringList> mimes;
 
     // let's find possible mimetypes
     QDir dir( curDir );
     dir.setFilter( QDir::Files | QDir::Readable );
     dir.setSorting( QDir::Size );
 
     const QFileInfoList *list = dir.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
 
     while( (fi=it.current() ) ) {
         /* skip .desktop */
 	if( fi->extension() == QString::fromLatin1("desktop") ){
             ++it;
             continue;
 	}
 	MimeType type( fi->absFilePath() );
 
         if( !mimes.contains( type.id() ) ){
             mimes.insert( type.id(), type.id() );
 	}
 
 	++it;
     }
 
     return mimes;
 }
 /**
  * FIXME mimecheck
  * use mime check for that
  * filter dirs
  * filter filters
  * filter files
  * filter mimetypes
  */
-void OLocalLister::reparse( const QString& path ) {
+void OLocalLister::reparse( const QString& pa ) {
+    if (!pa.isEmpty() )
+        m_dir = pa;
+
     QString currentMimeType;
-    QDir dir( path );
+    QDir dir( m_dir );
 
     dir.setSorting( view()->sorting() );
     dir.setFilter( view()->filter() );
 
 
     const QFileInfoList *list = dir.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
 
     while( (fi=it.current() ) ){
 
         if( fi->fileName() == QString::fromLatin1("..") ||
             fi->fileName() == QString::fromLatin1(".") ){
             ++it;
             continue;
         }
         if( fi->isSymLink() ){
             QString file = fi->dirPath( true ) + "/" + fi->readLink();
             /*
              * 5 tries to prevent dos attack
              */
             for( int i = 0; i<=4; i++) {
                 QFileInfo info( file );
                 if( !info.exists() ){
                     addSymlink( currentMimeType, fi, QString::null, TRUE );
                     break;
                 }else if( info.isDir() ){
                     if (!showDirs() )
                         break;
 
                     addDir( currentMimeType, fi, QString::null,
                             TRUE );
                     break;
                 }else if( info.isFile() ){
                     /* if not show files skip it */
                     if (!showFiles() )
                         break;
 
                     /* check if we comply to the mimetype */
                     MimeType type( info.absFilePath() );
                     if (compliesMime( type.id() ) )
                         addFile( currentMimeType, fi, QString::null,  TRUE );
 
                     break;
                 }else if( info.isSymLink() ){
                     file = info.dirPath(true ) + "/" + info.readLink() ;
                     break;
                 }else if( i == 4){
                     addSymlink( currentMimeType, fi );
                 }
             }
 
         }else if( fi->isDir() ){
             if (showDirs() )
                 addDir( currentMimeType, fi );
         }else if( fi->isFile() ){
             if ( showFiles() )
                 addFile( currentMimeType, fi );
         }
         ++it;
     } // of while loop
 }
 /* more accepting it code */
 void OLocalLister::fileSelected( const QString& dir, const QString& file, const QString& ) {
     internFileSelected( dir + "/" + file );
 }
 void OLocalLister::changedDir( const QString& dir, const QString& file, const QString& ) {
     internChangedDir( dir + "/" + file );
 }
+/*
+ * assemble the the Url now
+ */
+QString OLocalLister::selectedName()const {
+    QString str = m_dir;
+    QString name = lineEdit();
+
+    if ( name.isEmpty() )
+        name = view()->currentView()->selectedName();
+
+    str += "/" + name;
+
+    return str;
+}
+QStringList OLocalLister::selectedNames()const {
+    QStringList list;
+    list << selectedName();
+
+    return list;
+}
diff --git a/libopie/ofileselector/olocallister.h b/libopie/ofileselector/olocallister.h
index 01e6f3c..0cdf51f 100644
--- a/libopie/ofileselector/olocallister.h
+++ b/libopie/ofileselector/olocallister.h
@@ -1,16 +1,21 @@
 #ifndef OPIE_LOCAL_LISTER
 #define OPIE_LOCAL_LISTER
 
 #include "olister.h"
 
 class OLocalLister : public OLister {
 public:
     OLocalLister( OFileSelector* );
     ~OLocalLister();
     void reparse( const QString& path );
     QMap<QString, QStringList> mimeTypes(const QString& dir );
     void fileSelected( const QString& dir, const QString& file, const QString& );
     void changedDir( const QString& dir, const QString& file,const QString& );
+    QString selectedName()const;
+    QStringList selectedNames()const;
+
+private:
+    QString m_dir;
 };
 
 #endif