fixed links

2 files changed, 30 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index eaf4b56..dd02be5 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -11,4 +11,7 @@ KA/Pi:
 In the addressee selection dialog now the formatted name is shown, if not empty.
 
+Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
+Fixed the sorting for size in the file selector on the Z.
+
 ********** VERSION 2.1.7 ************
 
diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp
index f85f8f4..e2af32b 100644
--- a/microkde/ofileselector_p.cpp
+++ b/microkde/ofileselector_p.cpp
@@ -157,8 +157,21 @@ OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap,
     : QListViewItem( view )
 {
+
+    QString kind;
+    QString _path = path;
+    if ( isDir )
+        kind = "dir";
+    else
+        kind = "file";
     setPixmap(0, pixmap );
-    setText(1, path );
+    int arrow = path.find( "->" );
+    if (arrow > 0 ) {
+        kind += path.mid( arrow );
+        _path = path.left(arrow);
+    } 
+    setText(1, _path );
     setText(2, size );
     setText(3, date );
+    setText(4, kind );
     m_isDir = isDir;
     m_dir = dir;
@@ -191,5 +204,10 @@ QString OFileSelectorItem::key( int id, bool )const {
         }
         return ke;
-    }else
+    } else if ( id == 2 ) {
+        QString sort = "00000000";
+        sort = sort.left( 9-text( 2 ).length()) +  text( 2 );
+        return sort;
+
+    } else 
         return text( id );
 
@@ -346,7 +364,9 @@ void OFileViewFileListView::reread( bool all ) {
        */
       if( fi->isSymLink() ){
-          QString file = fi->dirPath( true ) + "/" + fi->readLink();
-          for( int i = 0; i<=4; i++) { // 5 tries to prevent dos
+          qDebug("SYMLINK ");
+          QString file = fi->readLink();
+          for( int i = 0; i<=5; i++) { // 5 tries to prevent dos
               QFileInfo info( file );
+              qDebug("FILE %s ", file.latin1());
               if( !info.exists() ){
                   addSymlink( fi, TRUE );
@@ -359,5 +379,5 @@ void OFileViewFileListView::reread( bool all ) {
                   break;
               }else if( info.isSymLink() ){
-                  file = info.dirPath(true ) + "/" + info.readLink() ;
+                  file = info.readLink() ;
                   break;
               }else if( i == 4){ // couldn't resolve symlink add it as symlink
@@ -487,5 +507,5 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) {
     locked = false;
     if ( symlink )
-        name = info->fileName() + " -> " + info->dirPath() + "/" + info->readLink();
+        name = info->fileName() + " -> " + info->readLink();
     else{
         name = info->fileName();
@@ -513,5 +533,5 @@ void OFileViewFileListView::addDir( QFileInfo* info, bool symlink ) {
         pix = symlink ? Resource::loadPixmap( "symlink") : Resource::loadPixmap("folder");
 
-    name = symlink ? info->fileName() + " -> " + info->dirPath(true) + "/" + info->readLink() :
+    name = symlink ? info->fileName() + " -> "  + info->readLink() :
            info->fileName();