Fix bugs #94 and #96

1 files changed, 32 insertions, 7 deletions

diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 824acf2..3c3a6c4 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -329,11 +329,15 @@ QString OFileSelector::selectedName() const
     const DocLnk *lnk = m_select->selected();
     name = lnk->file();
     delete lnk;
   }else if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){
-    QListViewItem *item  = m_View->currentItem();
-    if( item != 0 )
-      name = m_currentDir + "/" + item->text( 1 );
+      if ( m_shLne ) {
+          name = m_currentDir + "/" +m_edit->text();
+      }else{
+          QListViewItem *item  = m_View->currentItem();
+          if( item != 0 )
+              name = m_currentDir + "/" + item->text( 1 );
+      }
   }else { // installed view
     ;
   }
   return name;
@@ -520,12 +524,23 @@ void OFileSelector::slotMimeCheck(const QString &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)
 {
-  cd(file.left(file.find("<-",0,TRUE)));
-  reparse();
+    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;
@@ -543,12 +558,22 @@ void OFileSelector::slotInsertLocationPath(const QString &currentPath, int count
       pathList.append( currentPath );
     m_location->insertStringList( pathList,-1);
   }
 }
+/*
+ * Do not crash anymore
+ * don't try to change dir to a file
+ */
 void OFileSelector::locationComboChanged()
 {
-  cd( m_location->lineEdit()->text());
-  reparse();
+    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()
 {
   m_lay = new QVBoxLayout( this );