1 files changed, 59 insertions, 55 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index f97ae99..d0ccc3f 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1204,292 +1204,292 @@ void AdvancedFm::copy()
         }
         populateRemoteView();
         TabWidget->setCurrentPage(1);
 
     } else {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
             QString destFile = currentDir.canonicalPath()+"/"+(*it);
             curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
 
             QFile f(destFile);
             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) ) {
-                    QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                    QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
 
                     qWarning("nothin doing");
             }
         }
         populateLocalView();
         TabWidget->setCurrentPage(0);
     }
     }
 }
 
 void AdvancedFm::copyAs()
 {
     QStringList curFileList = getPath();
     if( curFileList.count() > 0) {
         QString curFile;
         InputDialog *fileDlg;
         fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
 
         if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
                 QString destFile;
                 curFile = currentDir.canonicalPath()+"/"+(*it);
 //             InputDialog *fileDlg;
 //             fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
                 fileDlg->setInputText((const QString &) destFile );
                 fileDlg->exec();
                 if( fileDlg->result() == 1 ) {
                     QString  filename = fileDlg->LineEdit1->text();
                     destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
 
                     QFile f(destFile);
                     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) ) {
-                        QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                        QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                         qWarning("nothin doing");
                     }
                 }
             }
             populateRemoteView();
             TabWidget->setCurrentPage(1);
         } else {
             if (TabWidget->currentPageIndex() == 0) {
                 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                     curFile = currentDir.canonicalPath()+"/"+(*it);
                     QString destFile;
                     fileDlg->setInputText((const QString &) destFile);
                     fileDlg->exec();
                     if( fileDlg->result() == 1 ) {
                         QString  filename = fileDlg->LineEdit1->text();
                         destFile = currentDir.canonicalPath()+"/"+(*it);
 
                         QFile f(destFile);
                         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) ) {
-                            QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                             qWarning("nothin doing");
                         }
                         
                     }
                 }
                 populateLocalView();
                 TabWidget->setCurrentPage(0);
             }
         }
     }
 
 }
 
 void AdvancedFm::copySameDir() {
     QStringList curFileList = getPath();
     if( curFileList.count() > 0) {
         QString curFile;
         InputDialog *fileDlg;
 
         if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
                 QString destFile;
                 curFile = currentDir.canonicalPath()+"/"+(*it);
                 fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
 //             InputDialog *fileDlg;
 //             fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
                 fileDlg->setInputText((const QString &) destFile );
                 fileDlg->exec();
                 if( fileDlg->result() == 1 ) {
                     QString filename = fileDlg->LineEdit1->text();
                     destFile = currentDir.canonicalPath()+"/"+filename;
 
                     QFile f(destFile);
                     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:
                               qDebug("");
                               f.remove();
                               break;
                           case 1:
                               return;
                               break;
                         };
                     }
                     if(!copyFile(destFile, curFile) ) {
-                        QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                         qWarning("nothin doing");
                     }
                     
                     qDebug("copy "+curFile+" as "+destFile);
                 }
                 delete fileDlg;
             }
             populateRemoteView();
             TabWidget->setCurrentPage(1);
         } else {
             if (TabWidget->currentPageIndex() == 0) {
                 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                     curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
                     fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
                     QString destFile;
                     fileDlg->setInputText((const QString &) destFile);
                     fileDlg->exec();
                     if( fileDlg->result() == 1 ) {
                         QString  filename = fileDlg->LineEdit1->text();
                         destFile = currentDir.canonicalPath()+"/"+filename;
 
                         QFile f(destFile);
                         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) ) {
-                            QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
                             qWarning("nothin doing");
                         }
                         qDebug("copy "+curFile+" as "+destFile);
                     }
                     delete fileDlg;
                 }
                 populateLocalView();
                 TabWidget->setCurrentPage(0);
             }
         }
     }
 
 }
  
 void AdvancedFm::move() {
 
     QStringList curFileList = getPath();
     if( curFileList.count() > 0) {
         QString curFile;
 //    qDebug(curFile);
         QString destFile;
 
         if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
                 QString destFile =  currentRemoteDir.canonicalPath();
                 if(destFile.right(1).find("/",0,TRUE) == -1)
                     destFile+="/";
                 destFile +=(*it);
                 curFile = currentDir.canonicalPath();
                 qDebug("Destination file is "+destFile);
                 if(curFile.right(1).find("/",0,TRUE) == -1)
                     curFile +="/";
                 curFile+=(*it);
 
                 QFile f(destFile);
                 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) ) {
-                        QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
+                        QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
                         return;
                     }
                     QFile::remove(curFile);
                 }
             }
             TabWidget->setCurrentPage(1);
         } else {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
                 QString destFile = currentRemoteDir.canonicalPath();
                 if(destFile.right(1).find("/",0,TRUE) == -1)
                     destFile+="/";
                 destFile +=(*it);
                 qDebug("Destination file is "+destFile);
                 curFile = currentDir.canonicalPath();
                 if(curFile.right(1).find("/",0,TRUE) == -1)
                     curFile +="/";
                 curFile+=(*it);
 
                 QFile f(destFile);
                 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) ) {
-                        QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
+                        QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
                         return;
                     }
                 }
                     QFile::remove(curFile);
                     TabWidget->setCurrentPage(0);
                 }
             }
             populateRemoteView();
             populateLocalView();
         }
 }
 
  bool AdvancedFm::copyFile( const QString & dest, const QString & src )
 {
     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 ) ) {
@@ -1524,49 +1524,49 @@ void AdvancedFm::runCommand() {
      }
 
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
     fileDlg->setInputText(curFile);
     fileDlg->exec();
     QString command;
     if( fileDlg->result() == 1 ) {
         command = fileDlg->LineEdit1->text();
 
 //         int err=0;
         Output *outDlg;
         outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
         outDlg->showMaximized();
         outDlg->show();
         qApp->processEvents();
         FILE *fp;
         char line[130];
         sleep(1);
 //         if(command.find("2>",0,TRUE) != -1)
             command +=" 2>&1";
         fp = popen(  (const char *) command, "r");
         if ( !fp ) {
             qDebug("Could not execute '" + command + "'! err=%d", fp);
-            QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
+            QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
             pclose(fp);
             return;
         } else {
             while ( fgets( line, sizeof line, fp)) {
                 QString lineStr = line;
                 lineStr=lineStr.left(lineStr.length()-1);
                 outDlg->OutputEdit->append(lineStr);
                 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
             }
         }
     }
 }
 
 void AdvancedFm::runCommandStd() {
     QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
         if( Local_View->currentItem())
             curFile = currentDir.canonicalPath() +"/"+  Local_View->currentItem()->text(0);
     } else {
         if(Remote_View->currentItem())
             curFile = currentRemoteDir.canonicalPath() +"/"+  Remote_View->currentItem()->text(0);
     }
 
     InputDialog *fileDlg;
@@ -1580,89 +1580,89 @@ void AdvancedFm::runCommandStd() {
         system(command.latin1());
     }
 }
 
 void AdvancedFm::fileStatus() {
     QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
         curFile = Local_View->currentItem()->text(0);
     } else {
         curFile = Remote_View->currentItem()->text(0);
     }
     QString command = " stat -l "+ curFile +" 2>&1";
 //     int err=0;
     Output *outDlg;
     outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
     outDlg->showMaximized();
     outDlg->show();
     qApp->processEvents();
     FILE *fp;
     char line[130];
     sleep(1);
     fp = popen(  (const char *) command, "r");
     if ( !fp ) {
         qDebug("Could not execute '" + command + "'! err=%d", fp);
-        QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
+        QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
         pclose(fp);
         return;
     } else {
         while ( fgets( line, sizeof line, fp)) {
             outDlg->OutputEdit->append(line);
             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
         }
 
     }
 }
 
 void AdvancedFm::mkDir() {
     if (TabWidget->currentPageIndex() == 0)
         localMakDir();
     else
         remoteMakDir();
 
 }
 
 void AdvancedFm::rn() {
     if (TabWidget->currentPageIndex() == 0)
         localRename();
     else
         remoteRename();
 
 }
 
 void AdvancedFm::del() {
     if (TabWidget->currentPageIndex() == 0)
         localDelete();
     else
         remoteDelete();
 }
 
 void AdvancedFm::doAbout() {
-    QMessageBox::message("AdvancedFm","Advanced FileManager\n"
+    QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                          "is copyright 2002 by\n"
                          "L.J.Potter<llornkcor@handhelds.org>\n"
-                         "and is licensed by the GPL");
+                         "and is licensed by the GPL"));
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
 {
   if( TabWidget->hasFocus()) 
     switch ( e->key() ) {
       case Key_Delete:
           del();
           break;
       case Key_H:
           showHidden();
           break;
       case Key_E:
           runThis();
           break;
       case Key_C:
           copy();
           break;
       case Key_A:
           copyAs();
           break;
       case Key_M:
           move();
           break;
@@ -1781,48 +1781,51 @@ void AdvancedFm::parsetab(const QString &fileName) {
 //                qDebug(mountDir+"::"+filesystemType);
                 fileSystemTypeList << mountDir+"::"+filesystemType;
             }
         }
     }
     endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
     parsetab("/etc/mtab"); //why did TT forget filesystem type?
     QString current = currentText;//.right( currentText.length()-1);
     QString baseFs;
     for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
         QString temp = (*it);
         QString path = temp.left(temp.find("::",0,TRUE) );
         path = path.right( path.length()-1);
         if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
         if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
             return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
         }
     }
     return baseFs;
 }
 
+QString  AdvancedFm::getDiskSpace( const QString &) {
+
+}
 
 void AdvancedFm::doBeam() {
     Ir ir;
     if(!ir.supported()){
     } else {
 
         QStringList curFileList = getPath();
         if( curFileList.count() > 0) {
 
         if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                 QString curFile =  currentDir.canonicalPath()+"/"+(*it);
                 if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
                 Ir *file = new Ir(this, "IR");
                 connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
                 file->send( curFile, curFile );
             }
 
         }  else {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                 QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
                 if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
@@ -1847,101 +1850,102 @@ void AdvancedFm::fileBeamFinished( Ir *ir) {
 //     QListViewItemIterator it( Local_View );
 //     for ( ; it.current(); ++it ) {
 //         if ( it.current()->isSelected() ) {
 //             QString strItem = it.current()->text(0);
 //             QString localFile = currentDir.canonicalPath()+"/"+strItem;
 //             QFileInfo fi(localFile);
 //         }
 //     }
 
 void AdvancedFm::showFileMenu() {
 
   QString curApp;
   bool isLocalView = false;
   if (TabWidget->currentPageIndex() == 0) {
     isLocalView = TRUE;
     curApp = Local_View->currentItem()->text(0);
   }   else {
     curApp = Remote_View->currentItem()->text(0);
   }
 
   MimeType mt( curApp );
   const AppLnk* app = mt.application();
   QFile fi(curApp);
 
-//  QPopupMenu m;
+  //  QPopupMenu m;
   QPopupMenu *m = new QPopupMenu(0);
 
   m->insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
   m->insertSeparator();
   if ( QFileInfo(fi).isDir() ) {
     m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
   } else {
 
     if ( app )
       m->insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( runThis() ) );
     else if( QFileInfo(fi).isExecutable() )
       m->insertItem(  tr( "Execute" ), this, SLOT( runThis() ) );
 
     m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
   }
-    m->insertSeparator();
+  m->insertSeparator();
 
 
-    if(isLocalView)
-      m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
-    else
-      m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+  if(isLocalView)
+    m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
+  else
+    m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
 
-    m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
-    m->insertSeparator();
+  m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
+  m->insertSeparator();
 
-    if(isLocalView)
-      m->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
-    else
-      m->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+  if(isLocalView)
+    m->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
+  else
+    m->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+
+  m->insertItem( tr( "Copy" ), this, SLOT( copy() ));
+  m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
+  m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
+  m->insertItem( tr( "Move" ), this, SLOT( move() ));
+  m->insertSeparator();
 
-    m->insertItem( tr( "Copy" ), this, SLOT( copy() ));
-    m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
-    m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
-    m->insertItem( tr( "Move" ), this, SLOT( move() ));
-    m->insertSeparator();
+  if(isLocalView)
+    m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
+  else
+    m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
 
-    if(isLocalView)
-      m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
-    else
-      m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
+  m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
+  m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
+  m->insertSeparator();
 
-    m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
-    m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
-    m->insertSeparator();
+  if(isLocalView)
+    m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
+  else
+    m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
-    if(isLocalView)
-      m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
-    else
-      m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
-
-    m->insertSeparator();
-    m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
-    if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )  //bad hack for Sharp zaurus failings
-      m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
-    m->setCheckable(TRUE);
-    if (!b)
-      m->setItemChecked(m->idAt(0),TRUE);
-    else
-      m->setItemChecked(m->idAt(0),FALSE);
-    if(Ir::supported())
-      m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
-    m->setFocus();
-    m->exec( QCursor::pos() );
-    sleep(1);
-    if(m) delete m;
+  m->insertSeparator();
+  m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
+
+  if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )  //bad hack for Sharp zaurus failings
+    m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
+  m->setCheckable(TRUE);
+  if (!b)
+    m->setItemChecked(m->idAt(0),TRUE);
+  else
+    m->setItemChecked(m->idAt(0),FALSE);
+  if(Ir::supported())
+    m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
+  m->setFocus();
+  m->exec( QCursor::pos() );
+  sleep(1);
+  if(m) delete m;
 }
 
 
 void AdvancedFm::cancelMenuTimer()
 {
 
     qDebug("selectionChanged: cancel menu timer");
     if( menuTimer.isActive() )
     menuTimer.stop();
 }