tr()-fix -- don't use 2 !. One is enough

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 66353bb..d4351b0 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -266,614 +266,614 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem)
           CurrentView()->ensureItemVisible( CurrentView()->firstChild());
         }
       chdir( strItem.latin1());
     }
 }
 
 void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
   switch (mouse) {
   case 1:
   {
     if(renameBox != 0 )
       {
         cancelRename();
       }
   }
   break;
   case 2:
     menuTimer.start( 500, TRUE );
     break;
   };
 }
 
 void AdvancedFm::switchToLocalTab()
 {
   TabWidget->setCurrentTab(0);
   Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab()
 {
   TabWidget->setCurrentTab(1);
   Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig()
 {
   Config cfg("AdvancedFm");
 }
 
 void AdvancedFm::writeConfig()
 {
   Config cfg("AdvancedFm");
 }
 
 void  AdvancedFm::currentPathComboChanged()
 {
   if(QDir( currentPathCombo->lineEdit()->text()).exists())
     {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
       populateView();
     }
   else
     {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath)
 {
 //    qDebug("%d",TabWidget->currentTab());
   if ( whichTab == 1)
     {
       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);
         }
     }
 }
 
 void AdvancedFm::currentPathComboActivated(const QString & currentPath)
 {
     chdir( currentPath.latin1() );
     CurrentDir()->cd( currentPath, TRUE);
     populateView();
     update();
 }
 
 QStringList AdvancedFm::getPath()
 {
   QStringList strList;
   QListView *thisView=CurrentView();
   QList<QListViewItem> * getSelectedItems( QListView * thisView );
   QListViewItemIterator it( thisView );
   for ( ; it.current(); ++it )
     {
       if ( it.current()->isSelected() )
         {
           strList <<  it.current()->text(0);
 //        qDebug(it.current()->text(0));
         }
     }
   return strList;
 }
 
 void AdvancedFm::homeButtonPushed()
 {
   QString current = QDir::homeDirPath();
   chdir( current.latin1() );
   CurrentDir()->cd(  current, TRUE);
   populateView();
   update();
 }
 
 void AdvancedFm::docButtonPushed()
 {
   QString current = QPEApplication::documentDir();
   chdir( current.latin1() );
   CurrentDir()->cd( current, TRUE);
   populateView();
   update();
 }
 
 void AdvancedFm::SDButtonPushed()
 {
   QString current = "/mnt/card";// this can change so fix
   chdir( current.latin1() );
   CurrentDir()->cd( current, TRUE);
   populateView();
   update();
 }
 
 void AdvancedFm::CFButtonPushed()
 {
   QString current;
   if(zaurusDevice)
     current= "/mnt/cf"; //zaurus
   else
     current = "/mnt/hda"; //ipaq
   chdir( current.latin1() );
   CurrentDir()->cd( current, TRUE);
   populateView();
   update();
 }
 
 
 void AdvancedFm::doAbout()
 {
   QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                                        "is copyright 2002-2003 by\n"
                                        "L.J.Potter<llornkcor@handhelds.org>\n"
                                        "and is licensed by the GPL"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e)
 {
 //    e->accept();
   if( CurrentView()->hasFocus()  )
     {
       switch ( e->key() ) {
       case Key_Delete:
         del();
         break;
       case Key_A:
         copyAs();
         break;
       case Key_C:
         copy();
         break;
       case Key_E:
         runThis();
         break;
       case Key_G:
       {
         currentPathCombo->lineEdit()->setFocus();
       }
       break;
 
       case Key_H:
         showHidden();
         break;
       case Key_I:
         fileStatus();
         break;
       case Key_M:
         move();
         break;
       case Key_N:
         mkDir();
         break;
       case Key_P:
         filePerms();
         break;
       case Key_R:
         rn();
         break;
       case Key_U:
         upDir();
         break;
       case Key_1:
         switchToLocalTab();
         break;
       case Key_2:
         switchToRemoteTab();
         break;
       case Key_3:
         CFButtonPushed();
         break;
       case Key_4:
         SDButtonPushed();
         break;
       case Key_5:
         homeButtonPushed();
         break;
       case Key_6:
         docButtonPushed();
         break;
       case Key_7:
         break;
       case Key_8:
         break;
       case Key_9:
         break;
       case Key_0:
         break;
       };
       e->accept();
     }
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
 {
   if( CurrentView()->hasFocus() )
     e->ignore();
 }
 
 
 void AdvancedFm::QPEButtonPushed()
 {
   QString current = QPEApplication::qpeDir();
   chdir( current.latin1() );
     CurrentDir()->cd( current, TRUE);
     populateView();
   update();
 }
 
 void AdvancedFm::parsetab(const QString &fileName)
 {
 
   fileSystemTypeList.clear();
   fsList.clear();
   struct mntent *me;
   FILE *mntfp = setmntent( fileName.latin1(), "r" );
   if ( mntfp )
     {
     while ( (me = getmntent( mntfp )) != 0 )
       {
       QString deviceName = me->mnt_fsname;
       QString filesystemType = me->mnt_type;
       QString mountDir = me->mnt_dir;
       if(deviceName != "none")
         {
         if( fsList.contains(filesystemType) == 0
             & filesystemType.find("proc",0,TRUE) == -1
             & filesystemType.find("cramfs",0,TRUE) == -1
             & filesystemType.find("auto",0,TRUE) == -1)
           fsList << 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 &path)
 {
   struct statfs fss;
   if ( !statfs( path.latin1(), &fss ) ) {
     int blkSize = fss.f_bsize;
       //    int totalBlks = fs.f_blocks;
     int availBlks = fss.f_bavail;
 
     long mult = blkSize / 1024;
     long div = 1024 / blkSize;
     if ( !mult ) mult = 1;
     if ( !div ) div = 1;
 
     return QString::number(availBlks * mult / div);
   }
   return "";
 }
 
 
 void AdvancedFm::showFileMenu()
 {
   QString curApp;
   curApp = CurrentView()->currentItem()->text(0);
 
   MimeType mt( curApp );
   const AppLnk* app = mt.application();
   QFile fi(curApp);
   QPopupMenu *m = new QPopupMenu(0);
   QPopupMenu *n = new QPopupMenu(0);
     //    QPopupMenu *o = new QPopupMenu(0);
   m->insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
 
   if ( QFileInfo(fi).isDir() )
     {
       m->insertSeparator();
       m->insertItem( tr( "Change Directory" ), this, SLOT( doDirChange() ));
     }
   else
     {
 
       if ( app )
         m->insertItem( app->pixmap(), tr( "Open in "
                                           + app->name() ), this, SLOT( runThis() ) );
       else if( QFileInfo(fi).isExecutable() ) //damn opie doesnt like this
         m->insertItem( tr( "Execute" ), this, SLOT( runThis() ) );
       m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
     }
 
   m->insertItem(tr("Actions"),n);
   n->insertItem( tr( "Make Directory" ), this, SLOT( makeDir() ));
 
   n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
 
   n->insertSeparator();
   n->insertItem( tr( "Rename" ), this, SLOT( renameIt() ));
 
   n->insertItem( tr( "Copy" ), this, SLOT( copy() ));
   n->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
   n->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
   n->insertItem( tr( "Move" ), this, SLOT( move() ));
 
   n->insertSeparator();
   n->insertItem( tr( "Delete" ), this, SLOT( doDelete() ));
   m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
 
   m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
   m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
 
   m->insertSeparator();
   m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
 
 #if defined(QT_QWS_OPIE)
   m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
 #endif
   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( QPoint( 4,QCursor::pos().y()) );
 
   if(m) delete m;
 }
 
 
 void AdvancedFm::cancelMenuTimer()
 {
 //  qDebug("selectionChanged: cancel menu timer");
   if( menuTimer.isActive() )
     menuTimer.stop();
 }
 
 QString AdvancedFm::checkDiskSpace(const QString &path)
 {
   struct statfs fss;
   if ( !statfs( path.latin1(), &fss ) )
     {
     int blkSize = fss.f_bsize;
 //    int totalBlks = fs.f_blocks;
     int availBlks = fss.f_bavail;
 
     long mult = blkSize / 1024;
     long div = 1024 / blkSize;
     if ( !mult ) mult = 1;
     if ( !div ) div = 1;
 
 
     return QString::number(availBlks * mult / div);
   }
   return "";
 }
 
 void AdvancedFm::addToDocs()
 {
   QStringList strListPaths = getPath();
   QDir *thisDir = CurrentDir();
 
   if( strListPaths.count() > 0)
     {
     QString curFile;
       for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it )
         {
         curFile = thisDir->canonicalPath()+"/"+(*it);
 //                qDebug(curFile);
         DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
         f.setName((*it));
         f.setFile( curFile);
         f.writeLink();
       }
     }
 }
 
 
 void AdvancedFm::customDirsToMenu()
 {
 
   Config cfg("AdvancedFm");
   cfg.setGroup("Menu");
 
   QStringList list = cfg.readListEntry( "CustomDir", ',');
   menuButton->insertItems(list );
 
 //      for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
 //        {
 //            customDirMenu->insertItem(*it );
 //        }
 }
 
 void AdvancedFm::dirMenuSelected(int item)
 {
   qDebug("menu item %d", item);
   switch(item)
     {
 
     case -21:
     case 0:
       addCustomDir();
       break;
     case -22:
     case 1:
       removeCustomDir();
       break;
     default:
     {
 //            gotoCustomDir( menuButton->text(item));
 //            gotoCustomDir( customDirMenu->text(item));
     }
     break;
 
     };
 }
 
 void AdvancedFm::addCustomDir()
 {
   Config cfg("AdvancedFm");
   cfg.setGroup("Menu");
   QString dir;
   QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
 
   dir =  CurrentDir()->canonicalPath();
 
   bool addIt=true;
   for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
     {
       if( dir == (*it))
         {
           addIt=false;
         }
     }
   if(addIt)
     {
       menuButton->insertItem(dir);
 //          customDirMenu->insertItem(dir);
       list <<  dir;
     }
 
   cfg.writeEntry("CustomDir", list, ',');
   cfg.write();
 }
 
 void AdvancedFm::removeCustomDir()
 {
 //  qDebug("remove custom dir");
   Config cfg("AdvancedFm");
   cfg.setGroup("Menu");
   QString dir;
   QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
   QStringList list2;
   dir =  CurrentDir()->canonicalPath();
   int ramble=2;
 //  int ramble=-24;
 //first remove list
   if(list.grep(dir,true).isEmpty())
     {
-      QMessageBox::message("AdvancedFm",
-                           tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!"));
+      QMessageBox::message(tr( "AdvancedFm" ),
+                           tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!"));
     }
   else
     {
       for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
         {
           if((*it) != dir)//current item is not our current dir, so add it to temp list
             {
               list2 <<(*it);
             }
           else
             {
 //              customDirMenu->removeItem( ramble);
               menuButton->remove( ramble);
 
             }
           ramble++;
 //        ramble--;
         }
 
       cfg.writeEntry("CustomDir", list2, ',');
       cfg.write();
     }
 //    customDirsToMenu();
 
 }
 
 void AdvancedFm::gotoCustomDir(const QString &dir)
 {
 //     qDebug("gotoCustomDir(const QString &dir) " +dir );
   QString curDir = dir;
   QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
   if( curDir == s_addBookmark)
     {
       addCustomDir();
     }
   if( curDir == s_removeBookmark)
     {
       removeCustomDir( );
     }
   else
     {
       if(QDir( curDir).exists() )
         {
           thisDir->setPath( curDir );
           chdir( curDir.latin1() );
           thisDir->cd( curDir, TRUE);
           populateView();
         }
     }
 }
 
 QDir *AdvancedFm::CurrentDir()
 {
   if ( whichTab == 1)
     {
     return &currentDir;
     }
   else
     {
     return &currentRemoteDir;
     }
 }
 
 QDir *AdvancedFm::OtherDir()
 {
   if ( whichTab == 1)
     {
     return &currentRemoteDir;
     }
   else
     {
     return &currentDir;
     }
 }
 
 QListView * AdvancedFm::CurrentView()
 {
   if ( whichTab == 1)
     return Local_View;
   else
     return Remote_View;
 }
 
 QListView * AdvancedFm::OtherView()
 {
   if ( whichTab == 1)
     return Remote_View;
   else
     return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent()
 {
   if ( whichTab == 1)
     TabWidget->setCurrentTab(1);
   else
     TabWidget->setCurrentTab(0);
 }