1 files changed, 22 insertions, 35 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a47edd8..afb44f5 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -26,29 +26,25 @@
 #include <qlineedit.h>
 
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
 using namespace Opie::Ui;
 
-#ifdef NOQUICKLAUNCH
-AdvancedFm::AdvancedFm( )
-#else
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
-#endif
    : QMainWindow( ) {
    init();
    renameBox = 0;
 
    unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
 
    initConnections();
    whichTab=1;
    rePopulate();
    currentPathCombo->setFocus();
    channel = new QCopChannel( "QPE/Application/advancedfm", this );
    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
@@ -62,53 +58,53 @@ AdvancedFm::~AdvancedFm() {
 void AdvancedFm::cleanUp() {
    QString sfile=QDir::homeDirPath();
    if(sfile.right(1) != "/")
       sfile+="/._temp";
    else
       sfile+="._temp";
    QFile file( sfile);
    if(file.exists())
       file.remove();
 }
 
 void AdvancedFm::tabChanged(QWidget *) {
-//   owarn << "tab changed" << oendl; 
+//   owarn << "tab changed" << oendl;
    QString path = CurrentDir()->canonicalPath();
    currentPathCombo->lineEdit()->setText( path );
 
    if(whichTab == 1) {
       viewMenu->setItemChecked(viewMenu->idAt(0), true);
       viewMenu->setItemChecked(viewMenu->idAt(1), false);
    } else {
       viewMenu->setItemChecked(viewMenu->idAt(0), false);
       viewMenu->setItemChecked(viewMenu->idAt(1), true);
    }
 
    QString fs= getFileSystemType( (const QString &)  path);
 
    setCaption(tr("AdvancedFm :: ")+fs+" :: "
               +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
    chdir( path.latin1());
 }
 
 
 void AdvancedFm::populateView() {
 
-// owarn << "PopulateView" << oendl; 
+// owarn << "PopulateView" << oendl;
         QPixmap pm;
         QListView *thisView = CurrentView();
         QDir *thisDir = CurrentDir();
         QString path = thisDir->canonicalPath();
 
-//owarn << "path is "+path << oendl; 
+//owarn << "path is "+path << oendl;
         thisView->clear();
         thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
         thisDir->setMatchAllDirs(TRUE);
         thisDir->setNameFilter(filterStr);
         QString fileL, fileS, fileDate;
         QString fs= getFileSystemType((const QString &) path);
         setCaption(tr("AdvancedFm :: ")+fs+" :: "
                              +checkDiskSpace((const QString &) path)+ tr(" kB free") );
         bool isDir=FALSE;
         const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
         QFileInfoListIterator it(*list);
         QFileInfo *fi;
@@ -151,87 +147,87 @@ void AdvancedFm::populateView() {
                         }
                         else if( !fi->isReadable() )  {
                                 pm = Resource::loadPixmap( "locked" );
                         }
                         else { //everything else goes by mimetype
                                 MimeType mt(fi->filePath());
                                 pm=mt.pixmap(); //sets the correct pixmap for mimetype
                                 if(pm.isNull()) {
                                         pm = unknownXpm;
                                 }
                         }
                         if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
-                                    //  odebug << " overlay link image" << oendl; 
+                                    //  odebug << " overlay link image" << oendl;
                                 pm= Resource::loadPixmap( "advancedfm/symlink" );
                                     //              pm= Resource::loadPixmap( "folder" );
 //                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
 //                QPainter painter( &pm );
 //                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
 //                pm.setMask( pm.createHeuristicMask( FALSE ) );
                         }
                         item->setPixmap( 0,pm);
 
                 }
                 isDir=FALSE;
                 ++it;
         }
 
         if( path.find("dev",0,TRUE) != -1) {
                 struct stat buf;
                 dev_t devT;
                 DIR *dir;
                 struct dirent *mydirent;
 
                 if((dir = opendir( path.latin1())) != NULL)
                         while ((mydirent = readdir(dir)) != NULL) {
                                 lstat( mydirent->d_name, &buf);
-//        odebug << mydirent->d_name << oendl; 
+//        odebug << mydirent->d_name << oendl;
                                 fileL.sprintf("%s", mydirent->d_name);
                                 devT = buf.st_dev;
                                 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
                                 fileDate.sprintf("%s", ctime( &buf.st_mtime));
                                 if( fileL.find(".") == -1 ) {
                                         item= new QListViewItem( thisView, fileL, fileS, fileDate);
                                         pm = unknownXpm;
                                         item->setPixmap( 0,pm);
                                 }
                         }
 
                 closedir(dir);
         }
 
         thisView->setSorting( 3,FALSE);
         fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
      populateView();
      setOtherTabCurrent();
      populateView();
 
 //      int tmpTab = whichTab;
-// //  odebug << "" << tmpTab << "" << oendl; 
+// //  odebug << "" << tmpTab << "" << oendl;
 
 //    for(int i =1; i < 3; i++) {
 //       TabWidget->setCurrentWidget(i - 1);
 //       populateView();
 //    }
 //    TabWidget->setCurrentWidget( tmpTab - 1);
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
-//owarn << "listclicked" << oendl; 
+//owarn << "listclicked" << oendl;
    if(selectedItem) {
       QString strItem=selectedItem->text(0);
-//      owarn << strItem << oendl; 
+//      owarn << strItem << oendl;
       QString strSize=selectedItem->text(1);
       strSize=strSize.stripWhiteSpace();
       bool isDirectory = false;
       QString strItem2;
 
       if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink
          strItem2 = dealWithSymName((const QString&)strItem);
          if(QDir(strItem2).exists() )
             strItem = strItem2;
       }
 
       if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
@@ -250,39 +246,36 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
 }
 
 void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , int ) {
    dealWithSchmooSchmaa( item->listView());
    switch (mouse) {
    case 1:
    {
       if(renameBox != 0 ) {
          cancelRename();
       }
    }
    break;
-   case 2:
-      menuTimer.start( 500, TRUE );
-      break;
    };
 }
 
 
 void AdvancedFm::switchToLocalTab() {
-//owarn << "switch to local view" << oendl; 
+//owarn << "switch to local view" << oendl;
    TabWidget->setCurrentWidget(0);
    Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab() {
-//owarn << "switch to local view" << oendl; 
+//owarn << "switch to local view" << oendl;
    TabWidget->setCurrentWidget(1);
    Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig() {
    Config cfg("AdvancedFm");
 }
 
 void AdvancedFm::writeConfig() {
    Config cfg("AdvancedFm");
 }
 
@@ -320,25 +313,25 @@ void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
    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);
-//        odebug << it.current()->text(0) << oendl; 
+//        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
 void AdvancedFm::homeButtonPushed() {
    QString current = QDir::homeDirPath();
    chdir( current.latin1() );
    CurrentDir()->cd(  current, TRUE);
    populateView();
    update();
 }
@@ -371,25 +364,25 @@ void AdvancedFm::CFButtonPushed() {
    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) {
-//   owarn << "key " << e->key() << "" << oendl; 
+//   owarn << "key " << e->key() << "" << oendl;
 //   if( CurrentView()->hasFocus()  )
    {
       switch ( e->key() ) {
       case Key_Left:
          upDir();
          break;
       case Key_Next:
          break;
       case Key_Return:
       case Key_Enter:
          navigateToSelected();
          break;
@@ -597,30 +590,24 @@ void AdvancedFm::showFileMenu() {
       m->setItemChecked(m->idAt(0),FALSE);
 
    if(Ir::supported())
       m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
    m->setFocus();
 
    m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
 
    if(m) delete m;
 }
 
 
-void AdvancedFm::cancelMenuTimer() {
-
-   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;
 
@@ -629,25 +616,25 @@ QString AdvancedFm::checkDiskSpace(const QString &path) {
    }
    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);
-//                odebug << curFile << oendl; 
+//                odebug << curFile << oendl;
          QFileInfo fi(curFile);
          DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
          f.setName(fi.baseName() );
          f.setFile( curFile);
          f.writeLink();
       }
    }
 }
 
 
 void AdvancedFm::customDirsToMenu() {
@@ -702,25 +689,25 @@ void AdvancedFm::addCustomDir() {
    }
    if(addIt) {
       menuButton->insertItem(dir);
 //          customDirMenu->insertItem(dir);
       list <<  dir;
    }
 
    cfg.writeEntry("CustomDir", list, ',');
    cfg.write();
 }
 
 void AdvancedFm::removeCustomDir() {
-//  odebug << "remove custom dir" << oendl; 
+//  odebug << "remove custom dir" << oendl;
    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(tr( "AdvancedFm" ),
                            tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!"));
@@ -737,25 +724,25 @@ void AdvancedFm::removeCustomDir() {
          ramble++;
 //        ramble--;
       }
 
       cfg.writeEntry("CustomDir", list2, ',');
       cfg.write();
    }
 //    customDirsToMenu();
 
 }
 
 void AdvancedFm::gotoCustomDir(const QString &dir) {
-//     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl; 
+//     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl;
 //  QString curDir = dir;
 //  QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
    if( dir == s_addBookmark) {
       addCustomDir();
    }
    if( dir == s_removeBookmark) {
       removeCustomDir( );
    } else {
       gotoDirectory( dir);
 //       if(QDir( curDir).exists() )
@@ -778,68 +765,68 @@ QDir *AdvancedFm::CurrentDir() {
 }
 
 QDir *AdvancedFm::OtherDir() {
    if ( whichTab == 1) {
       return &currentRemoteDir;
    } else {
       return &currentDir;
    }
 }
 
 QListView * AdvancedFm::CurrentView() {
    if ( whichTab == 1) {
-//      owarn << "CurrentView Tab 1" << oendl; 
+//      owarn << "CurrentView Tab 1" << oendl;
       return Local_View;
    } else {
-//      owarn << "CurrentView Tab 2" << oendl; 
+//      owarn << "CurrentView Tab 2" << oendl;
       return Remote_View;
    }
 }
 
 QListView * AdvancedFm::OtherView() {
    if ( whichTab == 1)
       return Remote_View;
    else
       return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent() {
-//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; 
+//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl;
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
    OtherView()->setFocus();
    OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
-//   odebug << "qcop message "+msg << oendl; 
+//   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
-//      odebug << "received" << oendl; 
+//      odebug << "received" << oendl;
       QString file;
       stream >> file;
       gotoDirectory( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
    gotoDirectory( file);
 
 }
 
 void AdvancedFm::gotoDirectory(const QString &file) {
-//   owarn << "goto dir "+file << oendl; 
+//   owarn << "goto dir "+file << oendl;
    QString curDir = file;
    QDir *thisDir = CurrentDir();
    if(QDir( curDir).exists() )  {
       thisDir->setPath( curDir );
       chdir( curDir.latin1() );
       thisDir->cd( curDir, TRUE);
       populateView();
    }
    else if(QFileInfo(curDir).exists()) {
       QFileInfo fileInfo(curDir);
       curDir=fileInfo.dirPath();
       if(QDir( curDir).exists() )  {
@@ -857,25 +844,25 @@ void AdvancedFm::findFile(const QString &fileName) {
    QFileInfo fi(fileName);
    QListView *thisView = CurrentView();
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if(it.current()->text(0) == fi.fileName()) {
          it.current()->setSelected(true);
          thisView->ensureItemVisible(it.current());
       }
    }
 }
 
 void AdvancedFm::slotSwitchMenu(int ) {
-//   odebug << "Switch " << item << "" << oendl; 
+//   odebug << "Switch " << item << "" << oendl;
    //   viewMenu->setItemChecked(item, true);
 }
 
 void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) {
    tabChanged( w);
    if( w == Local_View) {
       Remote_View->clearFocus();
    } else {
       Local_View->clearFocus();
    }
 }