From 1919ddd25fb835b0eb03a44cbfbf4713d45266b8 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 18 Jun 2005 16:38:24 +0000
Subject: fixed links

---
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
@@ -10,6 +10,9 @@ If in TodoView is selected "do not show compledted todos" then completed todos a
 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 ************
 
 KO/Pi:
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
@@ -156,10 +156,23 @@ OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap,
                                       bool isLocked, bool isDir )
     : 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;
     m_locked = isLocked;
@@ -190,7 +203,12 @@ QString OFileSelectorItem::key( int id, bool )const {
             ke.append( text(1) );
         }
         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 );
 
 }
@@ -345,9 +363,11 @@ 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 );
                   break;
@@ -358,7 +378,7 @@ void OFileViewFileListView::reread( bool all ) {
                   addFile( fi, TRUE );
                   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
                   addSymlink( fi );
@@ -486,7 +506,7 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) {
     dir = info->dirPath( true );
     locked = false;
     if ( symlink )
-        name = info->fileName() + " -> " + info->dirPath() + "/" + info->readLink();
+        name = info->fileName() + " -> " + info->readLink();
     else{
         name = info->fileName();
         if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) ||
@@ -512,7 +532,7 @@ void OFileViewFileListView::addDir( QFileInfo* info, bool symlink ) {
     }else
         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();
 
     (void)new OFileSelectorItem( m_view, pix, name,
--
cgit v0.9.0.2