ported to HEAD

1 files changed, 14 insertions, 5 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 2201960..9f21245 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -112,213 +112,222 @@ void AdvancedFm::runThis()
 
   if(curFile != "../")
     {
 
       fs = getFileSystemType((const QString &) path);
       QFileInfo fileInfo( path  + "/" + 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
         {
           curFile =  path + "/" + curFile;
           DocLnk nf(curFile);
           QString execStr = nf.exec();
           qDebug( execStr);
           if( execStr.isEmpty() )
             {
             }
           else
             {
               nf.execute();
             }
         }
     }
 }
 
 void AdvancedFm::runText()
 {
   QString curFile = CurrentView()->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;
     }
 }
 
 void AdvancedFm::makeDir()
 {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 )
     {
       QDir *thisDir = CurrentDir();
       QString  filename = fileDlg->LineEdit1->text();
       thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
   }
   populateView();
 }
 
 void AdvancedFm::doDelete()
 {
 
   QStringList curFileList = getPath();
   bool doMsg=true;
   int count = curFileList.count();
   if( count > 0)
     {
       if(count > 1 )
         {
           QString msg;
           msg=tr("Really delete\n%1 files?").arg(count);
           switch ( QMessageBox::warning(this,tr("Delete"),msg
                                         ,tr("Yes"),tr("No"),0,0,1) )
             {
             case 0:
                 doMsg=false;
                 break;
             case 1:
                 return;
                 break;
           };
       }
 
       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() ) //if file is a directory
         {
-        switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete\n") + f +
-                                      "\nand all it's contents ?"
-                                      ,tr("Yes"),tr("No"),0,0,1) )
+        switch ( QMessageBox::warning( this, tr("Delete Directory?"), 
+                                        tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
+                                        tr("Yes"),
+                                        tr("No"),
+                                        0,
+                                        0,
+                                        1) )
           {
         case 0:
         {
           f=f.left(f.length()-1);
           QString cmd="rm -rf "+f;
           startProcess( (const QString)cmd.latin1() );
           populateView();
         }
           break;
         case 1:
           // exit
           break;
         };
 
       } else {
           if(doMsg) {
-        switch ( QMessageBox::warning(this,tr("Delete"),tr("Really delete\n")+f
-                 +" ?",tr("Yes"),tr("No"),0,0,1) ) {
+        switch ( QMessageBox::warning(this,tr("Delete"),
+                                        tr("Really delete\n%1?").arg( f ),
+                                 tr("Yes"),
+                                 tr("No"),
+                                 0,
+                                 0,
+                                 1) ) {
           case 1:
               return;
               break;
         };
           }
         QString cmd="rm "+f;
         QFile file(f);
         if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) {
             qDebug("remove link files "+f);
 //             AppLnk lnk(f);
 //             qDebug(lnk.linkFile());
 //             lnk.removeLinkFile();
            file.remove();
         }
       }
     }
   }
   populateView();
 }
 
 void AdvancedFm::filePerms()
 {
   QStringList curFileList = getPath();
   QString filePath;
 
   filePath = CurrentDir()->canonicalPath()+"/";
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
     {
       filePermissions *filePerm;
       filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
       filePerm->showMaximized();
       filePerm->exec();
       if( filePerm)
         delete  filePerm;
     }
   populateView();
 }
 
 void AdvancedFm::doProperties()
 {
 #if defined(QT_QWS_OPIE)
 
   QStringList curFileList = getPath();
 
   QString filePath;
     filePath = CurrentDir()->canonicalPath()+"/";
 
     qDebug("%d",curFileList.count());
 
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
      {
     qDebug((filePath+*it));
     DocLnk lnk( (filePath+*it));
     LnkProperties prop( &lnk );
     prop.showMaximized();
     prop.exec();
   }
 #endif
 
 }
 
 void AdvancedFm::upDir()
 {
   QDir *thisDir = CurrentDir();
   QString current = thisDir->canonicalPath();
   QDir dir(current);
   dir.cdUp();
   current = dir.canonicalPath();
   chdir( current.latin1() );
   thisDir->cd(  current, TRUE);
 
   populateView();
   update();
 }
 
 void AdvancedFm::copy()
 {
   qApp->processEvents();
   QStringList curFileList = getPath();
 
   QDir *thisDir = CurrentDir();
   QDir *thatDir = OtherDir();
 
   bool doMsg=true;
   int count=curFileList.count();
   if( count > 0) {
     if(count > 1 ){
       QString msg;
       msg=tr("Really copy\n%1 files?").arg(count);
       switch ( QMessageBox::warning(this,tr("Copy"),msg
                                     ,tr("Yes"),tr("No"),0,0,1) )
         {
         case 0:
           doMsg=false;
           break;