send as text the real filename is symlink

3 files changed, 29 insertions, 12 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 92804b2..c653b90 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -306,25 +306,26 @@ void AdvancedFm::populateRemoteView() {
   }
 
   Remote_View->setSorting( 3,FALSE);
   fillCombo( (const QString &) currentRemoteDir.canonicalPath() );
 }
 
 void AdvancedFm::localListClicked(QListViewItem *selectedItem) {
   if(selectedItem) {
     QString strItem=selectedItem->text(0);
     QString strSize=selectedItem->text(1);
     strSize=strSize.stripWhiteSpace();
     if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
-      QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
+        QString strItem2 = dealWithSymName((const QString&)strItem);
+//      QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
       if(QDir(strItem2).exists() ) {
         currentDir.cd(strItem2, TRUE);
         populateLocalView();
 
       }
     } else { // not a symlink
       if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
         if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
           strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
           currentDir.cd(strItem,FALSE);
           populateLocalView();
     Local_View->ensureItemVisible(Local_View->firstChild());
@@ -352,25 +353,26 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem) {
     }
     
   }
 }
 
 void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) {
     
   if(selectedItem) {
     QString strItem=selectedItem->text(0);
     QString strSize=selectedItem->text(1);
     strSize=strSize.stripWhiteSpace();
     if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
-      QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
+        QString strItem2 = dealWithSymName((const QString&)strItem);
+//      QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
         currentRemoteDir.cd(strItem2, TRUE);
         populateRemoteView();
     } else { // not a symlink
       if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
         if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) {
           strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
           currentRemoteDir.cd(strItem,FALSE);
           populateRemoteView();
     Remote_View->ensureItemVisible(Remote_View->firstChild());
         } else {
           currentRemoteDir.cdUp();
           populateRemoteView();
@@ -452,25 +454,25 @@ void  AdvancedFm::currentPathComboChanged() {
   if (TabWidget->getCurrentTab() == 0) {
 //  if (TabWidget->currentPageIndex() == 0) {
     if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() );
       populateRemoteView();
     } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
   }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
-
+    qDebug("%d",TabWidget->getCurrentTab());
   if (TabWidget->getCurrentTab() == 0) {
 //  if (TabWidget->currentPageIndex() == 0) {
     currentPathCombo->lineEdit()->setText( currentPath);
     if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
       currentPathCombo->clear();
       localDirPathStringList.prepend( currentPath );
       currentPathCombo->insertStringList( localDirPathStringList,-1);
     }
   } else {
     currentPathCombo->lineEdit()->setText( currentPath);
     if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
       currentPathCombo->clear();
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 9948255..7ced056 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -115,24 +115,25 @@ protected slots:
 protected:
   bool zaurusDevice;
   QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
   QStringList remoteDirPathStringList, localDirPathStringList;
 
   void init();
   void initConnections();
   void keyReleaseEvent( QKeyEvent *);
   QString getFileSystemType(const QString &);
   QString getDiskSpace(const QString &);
   void parsetab(const QString &fileName);
   QString checkDiskSpace(const QString &);
+  QString dealWithSymName(const QString &);
   
 protected slots:
   void showFileMenu();
   void cancelMenuTimer();
   void homeButtonPushed();
   void docButtonPushed();
   void SDButtonPushed();
   void CFButtonPushed();
   void QPEButtonPushed();
   void upDir();
   void currentPathComboChanged();
   void copy();
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 0a9f921..f77554a 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -94,28 +94,36 @@ void AdvancedFm::showHidden() {
 void AdvancedFm::showRemoteHidden() {
   if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
 //    b=TRUE;
 
   }  else {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
 //    b=FALSE;
   }
   populateRemoteView();
 }
 
+QString AdvancedFm::dealWithSymName(const QString &fileName) {
+        QString strItem = fileName;
+        return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
+}
+
 void AdvancedFm::runThis() {
   QString fs;
   if (TabWidget->getCurrentTab() == 0) {
     QString curFile = Local_View->currentItem()->text(0);
+    if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+        curFile = dealWithSymName((const QString&)curFile);
+
     if(curFile != "../") {
 
       fs= getFileSystemType((const QString &) currentDir.canonicalPath());
       QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
       qDebug( fileInfo.owner());
       if( (fileInfo.permission( QFileInfo::ExeUser)
            | fileInfo.permission( QFileInfo::ExeGroup)
            | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
           | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
         QCopEnvelope e("QPE/System", "execute(QString)" );
         e << curFile;
       } else {
@@ -123,24 +131,26 @@ void AdvancedFm::runThis() {
         DocLnk nf(curFile);
         QString execStr = nf.exec();
         qDebug( execStr);
         if( execStr.isEmpty() ) {
         } else {
           nf.execute();
         }
       }
     }
   } else {
     QString curFile = Remote_View->currentItem()->text(0);
     if(curFile != "../") {
+    if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+        curFile = dealWithSymName((const QString&)curFile);
 
       fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
       qDebug("Filesystemtype is "+fs);
       QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
       if( (fileInfo.permission( QFileInfo::ExeUser)
            | fileInfo.permission( QFileInfo::ExeGroup)
            | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
           | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
         QCopEnvelope e("QPE/System", "execute(QString)" );
         e << curFile;
       } else {
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
@@ -151,32 +161,36 @@ void AdvancedFm::runThis() {
         } else {
           nf.execute();
         }
       }
     }
   }
 }
 
 void AdvancedFm::runText() {
   if (TabWidget->getCurrentTab() == 0) {
     QString curFile = Local_View->currentItem()->text(0);
     if(curFile != "../") {
+    if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+        curFile = dealWithSymName((const QString&)curFile);
       curFile =  currentDir.canonicalPath()+"/"+curFile;
       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
       e << curFile;
     }
   } else {
     QString curFile = Remote_View->currentItem()->text(0);
     if(curFile != "../") {
       curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
+    if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+        curFile = dealWithSymName((const QString&)curFile);
       DocLnk nf(curFile);
       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
       e << curFile;
     }
   }
 }
 
 void AdvancedFm::localMakDir() {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 ) {
@@ -473,25 +487,25 @@ void AdvancedFm::copy() {
           if( f.exists()) {
               if(doMsg) {
                   switch ( QMessageBox::warning(this,tr("File Exists!"),
                             item+tr("\nexists. Ok to overwrite?"),
                              tr("Yes"),tr("No"),0,0,1) ) {
                     case 1:
                         return;
                         break;
                   };
               }
               f.remove();                 
           }
-          if(!copyFile(destFile, curFile) ) {
+          if(!copyFile( curFile, destFile) ) {
               QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
           return;
         }
       }
       populateRemoteView();
       TabWidget->setCurrentTab(1);
 
     } else {
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
           item= (*it);
           if(item.find("->",0,TRUE)) //symlink
               item = item.left(item.find("->",0,TRUE));
@@ -504,25 +518,25 @@ void AdvancedFm::copy() {
 
           QFile f(destFile);
           if( f.exists()) {
               switch ( QMessageBox::warning(this,tr("File Exists!"),
                    item+tr("\nexists. Ok to overwrite?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
           case 1:
             return;
             break;
           };
             f.remove();
         }
-        if(!copyFile(destFile, curFile) ) {
+        if(!copyFile( curFile, destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
 
         }
       }
       populateLocalView();
       TabWidget->setCurrentTab(0);
     }
 
   }
 }
@@ -552,25 +566,25 @@ void AdvancedFm::copyAs() {
         if( f.exists()) {
           switch (QMessageBox::warning(this,tr("File Exists!"),
                   item+tr("\nexists. Ok to overwrite?"),
                   tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
-        if(!copyFile(destFile, curFile) ) {
+        if(!copyFile( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
       }
       delete fileDlg;
 
     }
     populateRemoteView();
     TabWidget->setCurrentTab(1);
 
   } else {
@@ -592,25 +606,25 @@ void AdvancedFm::copyAs() {
         if( f.exists()) {
           switch ( QMessageBox::warning(this,tr("File Exists!"),
                    item+tr("\nexists. Ok to overwrite?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
-        if(!copyFile(destFile, curFile) ) {
+        if(!copyFile( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
                         
       }
       delete fileDlg;
 
     }
     populateLocalView();
     TabWidget->setCurrentTab(0);
   }
@@ -642,25 +656,25 @@ void AdvancedFm::copySameDir() {
           switch (QMessageBox::warning(this,tr("Delete"),
                   destFile+tr(" already exists\nDo you really want to delete it?"),
                   tr("Yes"),tr("No"),0,0,1) ) {
           case 0:
 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
-        if(!copyFile(destFile, curFile) ) {
+        if(!copyFile( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
                     
         qDebug("copy "+curFile+" as "+destFile);
       }
       delete fileDlg;
     }
     populateLocalView();
 
   } else {
@@ -680,25 +694,25 @@ void AdvancedFm::copySameDir() {
         if( f.exists()) {
           switch ( QMessageBox::warning(this,tr("Delete"),
                    destFile+tr(" already exists\nDo you really want to delete it?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
-        if(!copyFile(destFile, curFile) ) {
+        if(!copyFile( curFile,destFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
         qDebug("copy "+curFile+" as "+destFile);
       }
       delete fileDlg;
     }
     populateRemoteView();
   }
 }
  
@@ -721,25 +735,25 @@ void AdvancedFm::move() {
         curFile = currentDir.canonicalPath();
 
         qDebug("Destination file is "+destFile);
 
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
 
         curFile+= item;
         qDebug("CurrentFile file is " + curFile);
 
         QFile f( curFile);
         if( f.exists()) {
-          if(!copyFile( destFile, curFile) ) {
+          if(!copyFile(  curFile,destFile) ) {
             QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
             return;
           } else
             QFile::remove(curFile);
         }
       }
 
       TabWidget->setCurrentTab(1);
 
     } else { //view 2
 
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
@@ -753,39 +767,39 @@ void AdvancedFm::move() {
 
         qDebug("Destination file is "+destFile);
 
         curFile = currentRemoteDir.canonicalPath();
 
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
         curFile+= item;
         qDebug("CurrentFile file is " + curFile);
 
         QFile f( curFile);
         if( f.exists()) {
-          if(!copyFile( destFile, curFile) ) {
+          if(!copyFile( curFile, destFile) ) {
             QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile);
             return;
           } else
             QFile::remove( curFile);
         }
         TabWidget->setCurrentTab(0);
       }
     }
     populateRemoteView();
     populateLocalView();
   }
 }
 
-bool AdvancedFm::copyFile( const QString & dest, const QString & src ) {
+bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
   char bf[ 50000 ];
   int  bytesRead;
   bool success = TRUE;
   struct stat status;
 
   QFile s( src );
   QFile d( dest );
 
   if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
     while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
       if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
         success = FALSE;