bug fix #2 delete

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a378170..e3ab76b 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -737,257 +737,257 @@ QString fs;
         curFile =  currentDir.canonicalPath()+"/"+curFile;
             DocLnk nf(curFile);
             QString execStr = nf.exec();
             qDebug( execStr);
             if( execStr.isEmpty() ) {
             } else {
                 nf.execute();
             }
          }
 //         MimeType mt( curFile);
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
         fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
         qDebug("Filesystemtype is "+fs);
         QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
          if(fileInfo.isExecutable() || fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
                  QCopEnvelope e("QPE/System", "execute(QString)" );
                  e << curFile;
          } else {
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
             DocLnk nf(curFile);
             QString execStr = nf.exec();
             qDebug(execStr);
             if( execStr.isEmpty() ) {
             } else {
                 nf.execute();
             }
          }
 //         MimeType mt( curFile);
     }
 }
 
 void AdvancedFm::runText() {
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
         curFile =  currentDir.canonicalPath()+"/"+curFile;
         QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
         e << curFile;
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
         curFile =  currentRemoteDir.canonicalPath()+"/"+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 ) {
        QString  filename = fileDlg->LineEdit1->text();
        currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
     }
     populateLocalView();
 }
 
 void AdvancedFm::remoteMakDir()
 {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();
         currentRemoteDir.mkdir(  currentRemoteDir.canonicalPath()+"/"+filename);
     }
     populateRemoteView();
 }
 
 void AdvancedFm::localDelete()
 {
     QStringList curFileList = getPath();
     QString myFile;
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         myFile = (*it);
         if( myFile.find(" -> ",0,TRUE) != -1)
             myFile = myFile.left( myFile.find(" -> ",0,TRUE));
                     
         QString f = currentDir.canonicalPath();
         if(f.right(1).find("/",0,TRUE) == -1)
             f+="/";
         f+=myFile;
         if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+
                                           "\nand all it's contents ?"
                                           ,tr("Yes"),tr("No"),0,0,1) ) {
               case 0: {
                   f=f.left(f.length()-1);
                   QString cmd="rm -rf "+f;
                   system( cmd.latin1());
                   populateLocalView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
 
         } else {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                           +" ?",tr("Yes"),tr("No"),0,0,1) ) {
               case 0: {
                   QString cmd="rm "+f;
                   QFile file(f);
                   file.remove();
 //                   system( cmd.latin1());
                   populateLocalView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
         }
     }
 }
 
 void AdvancedFm::remoteDelete()
 {
     QStringList curFileList = getPath();
     QString myFile;
 
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         myFile = (*it);
         if(myFile.find(" -> ",0,TRUE) != -1)
             myFile = myFile.left(myFile.find(" -> ",0,TRUE));
-        QString f = currentDir.canonicalPath();
+        QString f = currentRemoteDir.canonicalPath();
          if(f.right(1).find("/",0,TRUE) == -1)
              f+="/";
         f+=myFile;
         if(QDir(f).exists() && !QFileInfo(f).isSymLink()  ) {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+
                                           "\nand all it's contents ?",
                                           tr("Yes"),tr("No"),0,0,1) ) {
               case 0: {
                   f=f.left(f.length()-1);
                   QString cmd="rm -rf "+f;
                   system( cmd.latin1());
                   populateRemoteView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
 
         } else {
             switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                           +" ?",tr("Yes"),tr("No"),0,0,1) ) {
               case 0: {
                   QString cmd="rm "+f;
                   QFile file(f);
                   file.remove();
 //                   system( cmd.latin1());
                   populateRemoteView();
               }
                   break;
               case 1:
                     // exit
                   break;
             };
         }
     }
 }
 
 void AdvancedFm::localRename()
 {
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->setInputText((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname = currentDir.canonicalPath() + "/" + curFile;
         QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
             QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateLocalView();
 }
 
 void AdvancedFm::remoteRename()
 {
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->setInputText((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile;
         QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
             QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateRemoteView();
 }
 
 void AdvancedFm::switchToLocalTab()
 {
     TabWidget->setCurrentPage(0);
     Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab()
 {
     TabWidget->setCurrentPage(1);
     Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig()
 {
     Config cfg("AdvancedFm");
 }
 
 void AdvancedFm::writeConfig()
 {
     Config cfg("AdvancedFm");
 }
 
 void  AdvancedFm::currentPathComboChanged()
 {
     if (TabWidget->currentPageIndex() == 0) {
         if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
             currentDir.setPath( currentPathCombo->lineEdit()->text() );
             populateLocalView();
         } else {
             QMessageBox::message(tr("Note"),tr("That directory does not exist"));
         }
     }
     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) {
 
     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();
             remoteDirPathStringList.prepend( currentPath );
             currentPathCombo->insertStringList( remoteDirPathStringList,-1);
         }