file selector fix

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
@@ -23,4 +23,5 @@ QString KFileDialog::getSaveFileName( const QString & fn,
     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 );
@@ -48,4 +49,5 @@ QString KFileDialog::getOpenFileName( const QString & fn,
     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();
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
@@ -386,4 +386,5 @@ OFileSelector* OFileViewFileListView::selector() {
 
 bool OFileViewFileListView::eventFilter (QObject *o, QEvent *e) {
+#if 0
     if ( e->type() == QEvent::KeyPress ) {
         QKeyEvent *k = (QKeyEvent *)e;
@@ -393,4 +394,5 @@ bool OFileViewFileListView::eventFilter (QObject *o, QEvent *e) {
         }
     }
+#endif
     return false;
 }
@@ -402,4 +404,8 @@ void OFileViewFileListView::connectSlots() {
     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) {
@@ -424,4 +430,24 @@ void OFileViewFileListView::slotCurrentChanged( QListViewItem* item) {
 #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) )
@@ -436,5 +462,5 @@ void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const
             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();
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
@@ -127,4 +127,5 @@ private slots:
     void slotCurrentChanged( QListViewItem* );
     void slotClicked(int, QListViewItem*, const QPoint&, int );
+    void slotDoubleClicked(QListViewItem*);
     void slotFSActivated(int);