3 files changed, 30 insertions, 1 deletions

diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp
index 977499e..309f8dc 100644
--- a/microkde/kfiledialog.cpp
+++ b/microkde/kfiledialog.cpp
@@ -1,74 +1,76 @@
 #include <kfiledialog.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qapplication.h>
 
 #ifndef DESKTOP_VERSION
 //US orig#include <ofileselector.h>
 #include <ofileselector_p.h>
 QString KFileDialog::getSaveFileName( const QString & fn,
                                              const QString & cap , QWidget * par )
 {
     QString retfile = "";
     QDialog dia ( par, "input-dialog", true ); 
     QVBoxLayout lay( &dia );
     lay.setMargin(7); 
     lay.setSpacing(7); 
     dia.setCaption( cap );
     QString file = fn;
     if ( file.isEmpty() )
         file = QDir::homeDirPath()+"/*";
     QFileInfo fi ( file );
     OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Save, fi.dirPath(true), fi.fileName() );
+    QObject::connect (  &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) );
     lay.addWidget( &o);
     // o.setNewVisible( true );
     // o.setNameVisible( true );
     dia.showMaximized();
     int res = dia.exec();
     if ( res )
         retfile = o.selectedName();
     return retfile;
 }
 
 QString KFileDialog::getOpenFileName( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
    QString retfile = "";
     QDialog dia ( par, "input-dialog", true ); 
     // QLineEdit lab ( &dia ); 
     QVBoxLayout lay( &dia );
     lay.setMargin(7); 
     lay.setSpacing(7);
     dia.setCaption( cap );
     QString file = fn;
     if ( file.isEmpty() )
         file = QDir::homeDirPath()+"/*";;
     QFileInfo fi ( file );
     OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Open, fi.dirPath(true), fi.fileName() );
+    QObject::connect (  &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) );
     lay.addWidget( &o);
     dia.showMaximized();
     int res = dia.exec();
     if ( res )
         retfile = o.selectedName();
     return retfile;
 }
 
 #else
 
 #include <qfiledialog.h> 
 
 QString KFileDialog::getSaveFileName( const QString & fn,
                                              const QString & cap , QWidget * par )
 {
     return QFileDialog::getSaveFileName( fn, QString::null, par, "openfile", cap );
 }
 QString KFileDialog::getOpenFileName( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
 
     return QFileDialog::getOpenFileName( fn, QString::null, par, "openfile", cap );
 }
 #endif
 
diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp
index fd5f965..f85f8f4 100644
--- a/microkde/ofileselector_p.cpp
+++ b/microkde/ofileselector_p.cpp
@@ -324,179 +324,205 @@ void OFileViewFileListView::reread( bool all ) {
         filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
     else
         filter = QDir::Files | QDir::Dirs | QDir::All;
     dir.setFilter( filter );
 
     // now go through all files
     const QFileInfoList *list = dir.entryInfoList();
     if (!list) {
         cdUP();
         return;
     }
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while( (fi=it.current() ) ){
       if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") ){
           ++it;
           continue;
       }
 
       /*
        * It is a symlink we try to resolve it now but don't let us attack by DOS
        *
        */
       if( fi->isSymLink() ){
           QString file = fi->dirPath( true ) + "/" + fi->readLink();
           for( int i = 0; i<=4; i++) { // 5 tries to prevent dos
               QFileInfo info( file );
               if( !info.exists() ){
                   addSymlink( fi, TRUE );
                   break;
               }else if( info.isDir() ){
                   addDir( fi, TRUE );
                   break;
               }else if( info.isFile() ){
                   addFile( fi, TRUE );
                   break;
               }else if( info.isSymLink() ){
                   file = info.dirPath(true ) + "/" + info.readLink() ;
                   break;
               }else if( i == 4){ // couldn't resolve symlink add it as symlink
                   addSymlink( fi );
               }
         } // off for loop for symlink resolving
       }else if( fi->isDir() )
           addDir(  fi );
       else if( fi->isFile() )
         addFile( fi );
 
       ++it;
     } // of while loop
   m_view->sort();
 
 }
 int OFileViewFileListView::fileCount()const{
     return m_view->childCount();
 }
 QString OFileViewFileListView::currentDir()const{
     return m_currentDir;
 }
 OFileSelector* OFileViewFileListView::selector() {
     return m_sel;
 }
 
 bool OFileViewFileListView::eventFilter (QObject *o, QEvent *e) {
+#if 0
     if ( e->type() == QEvent::KeyPress ) {
         QKeyEvent *k = (QKeyEvent *)e;
         if ( (k->key()==Key_Enter) || (k->key()==Key_Return)) {
             slotClicked( Qt::LeftButton,m_view->currentItem(),QPoint(0,0),0);
             return true;
         }
     }
+#endif
     return false;
 }
 
 
 void OFileViewFileListView::connectSlots() {
     connect(m_view, SIGNAL(clicked(QListViewItem*) ),
             this, SLOT(slotCurrentChanged(QListViewItem*) ) );
     connect(m_view, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint&, int ) ),
             this, SLOT(slotClicked(int, QListViewItem*, const QPoint&, int ) ) );
+    connect(m_view, SIGNAL(doubleClicked( QListViewItem* )),
+            this, SLOT(slotDoubleClicked(QListViewItem* ) ) );
+    connect(m_view, SIGNAL(returnPressed( QListViewItem* )),
+            this, SLOT(slotDoubleClicked(QListViewItem* ) ) );
 }
 void OFileViewFileListView::slotCurrentChanged( QListViewItem* item) {
     if (!item)
         return;
 #if 0
 
     OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
 
     if (!sel->isDir() ) {
         selector()->m_lneEdit->setText( sel->text(1) );
         // if in fileselector mode we will emit selected
         if ( selector()->mode() == OFileSelector::FileSelector ) {
             qWarning("slot Current Changed");
             QStringList str = QStringList::split("->", sel->text(1) );
             QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
             emit selector()->fileSelected( path );
             DocLnk lnk( path );
             emit selector()->fileSelected( lnk );
         }
     }
 #endif
 }
+void OFileViewFileListView::slotDoubleClicked(QListViewItem* item ) {
+    if (!item ) return;
+    OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
+    if (!sel->isLocked() ) {
+        QStringList str = QStringList::split("->", sel->text(1) );
+        if (sel->isDir() ) {
+            m_currentDir = sel->directory() + "/" + str[0].stripWhiteSpace();
+            emit selector()->dirSelected( m_currentDir );
+            reread( m_all );
+        }else { // file
+            //qWarning("slot Clicked");
+            selector()->m_lneEdit->setText( str[0].stripWhiteSpace() );
+            QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
+            emit selector()->fileSelected( path );
+            DocLnk lnk( path );
+            emit selector()->fileSelected( lnk );
+            emit selector()->ok();
+        }
+    } // not locked
+}
 void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const QPoint&, int ) {
     if (!item || ( button != Qt::LeftButton) )
         return;
 
     OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
     if (!sel->isLocked() ) {
         QStringList str = QStringList::split("->", sel->text(1) );
         if (sel->isDir() ) {
             m_currentDir = sel->directory() + "/" + str[0].stripWhiteSpace();
             emit selector()->dirSelected( m_currentDir );
             reread( m_all );
         }else { // file
-            qWarning("slot Clicked");
+            //qWarning("slot Clicked");
             selector()->m_lneEdit->setText( str[0].stripWhiteSpace() );
             QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
             emit selector()->fileSelected( path );
             DocLnk lnk( path );
             emit selector()->fileSelected( lnk );
         }
     } // not locked
 }
 void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) {
     MimeType type( info->absFilePath() );
     if (!compliesMime( type.id() ) )
         return;
 
     QPixmap pix = type.pixmap();
     QString dir, name; bool locked;
     if ( pix.isNull() ) {
         QWMatrix matrix;
         QPixmap pixer(Resource::loadPixmap("UnknownDocument") );
         matrix.scale( .4, .4 );
         pix = pixer.xForm( matrix );
     }
     dir = info->dirPath( true );
     locked = false;
     if ( symlink )
         name = info->fileName() + " -> " + info->dirPath() + "/" + info->readLink();
     else{
         name = info->fileName();
         if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) ||
              ( (selector()->mode() == OFileSelector::Save)&& !info->isWritable() ) ) {
             locked = true; pix = Resource::loadPixmap("locked");
         }
     }
     (void)new OFileSelectorItem( m_view, pix, name,
                                  KGlobal::locale()->formatDateTime(info->lastModified(),true, true, KLocale::ISODate),
                                  QString::number( info->size() ),
                                  dir, locked );
 }
 void OFileViewFileListView::addDir( QFileInfo* info, bool symlink ) {
     bool locked = false; QString name; QPixmap pix;
 
     if ( ( ( selector()->mode() == OFileSelector::Open )  && !info->isReadable() ) ||
          ( ( selector()->mode() == OFileSelector::Save )  && !info->isWritable() ) ) {
         locked = true;
         if ( symlink )
             pix = Resource::loadPixmap( "symlink" );
         else
             pix = Resource::loadPixmap( "lockedfolder" );
     }else
         pix = symlink ? Resource::loadPixmap( "symlink") : Resource::loadPixmap("folder");
 
     name = symlink ? info->fileName() + " -> " + info->dirPath(true) + "/" + info->readLink() :
            info->fileName();
 
     (void)new OFileSelectorItem( m_view, pix, name,
                                  KGlobal::locale()->formatDateTime(info->lastModified(),true, true, KLocale::ISODate),
                                  QString::number( info->size() ),
                                  info->dirPath( true ), locked, true );
 
 
 }
 void OFileViewFileListView::addSymlink( QFileInfo* , bool ) {
 
 }
 void OFileViewFileListView::cdUP() {
diff --git a/microkde/ofileselector_p.h b/microkde/ofileselector_p.h
index b371806..834fd70 100644
--- a/microkde/ofileselector_p.h
+++ b/microkde/ofileselector_p.h
@@ -65,128 +65,129 @@ private:
     OFileSelector* m_selector;
 };
 
 
 /* THE Document View hosting a FileSelector*/
 class ODocumentFileView : public OFileViewInterface {
 public:
     ODocumentFileView( OFileSelector* selector );
     ~ODocumentFileView();
 
     QString selectedName() const;
     QString selectedPath() const;
 
     QString directory() const;
     void reread();
     int fileCount()const;
     DocLnk selectedDocument()const;
 
     QWidget* widget( QWidget* parent );
 
 private:
     mutable FileSelector* m_selector;
 
 };
 
 class OFileSelectorItem : public QListViewItem {
 public:
     OFileSelectorItem( QListView* view, const QPixmap& pixmap,
                        const QString& path, const QString& date,
                        const QString& size, const QString& mDir,
                        bool isLocked = false, bool isDir = false );
     ~OFileSelectorItem();
     bool isLocked()const;
     bool isDir()const;
     QString directory()const;
     QString path()const;
     QString key(int id, bool )const;
 
 private:
     bool m_locked : 1;
     bool m_isDir    : 1;
     QString m_dir;
 };
 
 class OFileViewFileListView : public QWidget {
     Q_OBJECT
 public:
     OFileViewFileListView( QWidget* parent, const QString& dir, OFileSelector* selector );
     ~OFileViewFileListView();
 
     OFileSelectorItem* currentItem()const;
     void reread( bool all = false );
     int fileCount()const;
     QString currentDir()const;
 protected:
     bool eventFilter (QObject *o, QEvent *e);
 private slots:
     void slotNew(); // will emit newSelected
     void cdUP();
     void cdHome();
     void cdDoc();
     void changeDir( const QString& );
     void slotCurrentChanged( QListViewItem* );
     void slotClicked(int, QListViewItem*, const QPoint&, int );
+    void slotDoubleClicked(QListViewItem*);
     void slotFSActivated(int);
 
 protected:
 
     OFileSelector* selector();
 
 private:
     QMap<QString, QString> m_dev;
     bool m_all : 1;
     OFileSelector* m_sel;
     QPopupMenu* m_fsPop;
     bool compliesMime( const QString& );
     QStringList m_mimes; // used in compy mime
     QString m_currentDir;
     QToolButton *m_btnNew, *m_btnClose;
     void connectSlots();
     void addFile( QFileInfo* info, bool symlink = FALSE );
     void addDir ( QFileInfo* info, bool symlink = FALSE );
     void addSymlink( QFileInfo* info, bool = FALSE );
 
 
 private:
     QListView* m_view;
 };
 
 typedef QMap<QString, QStringList> MimeTypes;
 
 class OFileViewInterface;
 class OFileViewFileListView;
 class QLineEdit;
 class QComboBox;
 class QWidgetStack;
 class QHBox;
 class OFileSelector : public QWidget {
     Q_OBJECT
     friend class OFileViewInterface;
     friend class OFileViewFileListView;
 public:
     enum Mode { Open=1, Save=2, FileSelector=4, OPEN=1, SAVE=2, FILESELECTOR=4 };
 //    enum OldMode { OPEN=1, SAVE=2, FILESELECTOR = 4 };
     enum Selector { Normal = 0, Extended=1,  ExtendedAll =2, Default=3,  NORMAL=0,EXTENDED=1, EXTENDED_ALL =2, DEFAULT=3 };
 //    enum OldSelector { NORMAL = 0, EXTENDED =1, EXTENDED_ALL = 2};
 
     OFileSelector(QWidget* parent, int mode, int selector,
                   const QString& dirName,
                   const QString& fileName,
                   const MimeTypes& mimetypes = MimeTypes(),
                   bool newVisible = FALSE, bool closeVisible = FALSE );
 
     OFileSelector(const QString& mimeFilter, QWidget* parent,
                   const char* name = 0,  bool newVisible = TRUE, bool closeVisible = FALSE );
     ~OFileSelector();
 
     const DocLnk* selected();
 
     QString selectedName()const;
     QString selectedPath()const;
     QString directory()const;
 
     DocLnk selectedDocument()const;
 
     int fileCount()const;
     void reread();