2 files changed, 48 insertions, 44 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9aa0c77..8cc5d7b 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -60,43 +60,39 @@ 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 *wd) {
-        //      qDebug("tabChanged");
                 if(wd == tab) {
                                 whichTab = 1;
                                 viewMenu->setItemChecked(viewMenu->idAt(0), true);
                                 viewMenu->setItemChecked(viewMenu->idAt(1), false);
         //                      qDebug("tabchanged: LOCAL VIEW SHOWN");
                 }
+
                 else if(wd == tab_2) {
                                 whichTab = 2;
                                 viewMenu->setItemChecked(viewMenu->idAt(0), false);
                                 viewMenu->setItemChecked(viewMenu->idAt(1), true);
         //                      qDebug("tabchanged: REMOTE VIEW SHOWN");
                 }
                 qApp->processEvents();
                 QString path = CurrentDir()->canonicalPath();
-        //      qDebug(path);
-                if ( TabWidget->currentWidget() == tab) {
-                } else {
-                }
 
                 chdir( path.latin1());
                 currentPathCombo->lineEdit()->setText(path);
 }
 
 
 void AdvancedFm::populateView() {
 
                 QPixmap pm;
                 QListView *thisView = CurrentView();
                 QDir *thisDir = CurrentDir();
                 QString path = thisDir->canonicalPath();
@@ -257,33 +253,33 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
 //       menuTimer.start( 50, TRUE );
 //       break;
    };
 }
 
 
 void AdvancedFm::refreshCurrentTab() {
      populateView();
         // if ( TabWidget->currentWidget() == tab) {
 }
 
 void AdvancedFm::switchToLocalTab() {
-                TabWidget->setCurrentWidget(0);
-        //      Local_View->setFocus();
-                whichTab = 1;
+                TabWidget->setCurrentWidget(tab);
+                Local_View->setFocus();
+        //      whichTab = 1;
 }
 
 void AdvancedFm::switchToRemoteTab() {
-                TabWidget->setCurrentWidget(1);
-        //      Remote_View->setFocus();
-                whichTab = 2;
+                TabWidget->setCurrentWidget(tab_2);
+                Remote_View->setFocus();
+        //      whichTab = 2;
 }
 
 void  AdvancedFm::currentPathComboChanged() {
                 QString pDir = currentPathCombo->lineEdit()->text();
    if(QDir(pDir).exists()) {
       CurrentDir()->setPath(pDir );
       populateView();
    } else {
       QMessageBox::message(tr("Note"),tr("<p>%1 does not exist</p>").arg(pDir));
    }
 }
 
@@ -749,21 +745,27 @@ void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
       QString file;
       stream >> file;
       changeTo( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
    changeTo( file);
 }
 
 
 void AdvancedFm::slotSwitchMenu(int item) {
-                Q_UNUSED(item);
-        //      qDebug( "Switch %d",item);
-   //   viewMenu->setItemChecked(item, true);
+   if(item == -23)  {
+      switchToLocalTab();
+      tabChanged( tab);
+    }
+
+    if(item == -24) {
+      switchToRemoteTab();
+      tabChanged( tab_2);
+    }
 }
 
 void AdvancedFm::navigateToSelected() {
    if( !CurrentView()->currentItem()) return;
    doDirChange();
 }
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 171e7c4..4802771 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -35,25 +35,25 @@ using namespace Opie::Core;
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/sendfile.h>
 #include <fcntl.h>
 
 void AdvancedFm::doDirChange() {
    QString pathItem = CurrentView()->currentItem()->text(0);
    if( pathItem == "../") {
       ListClicked( CurrentView()->currentItem());
    } else {
       if( pathItem.find(" -> ",0,TRUE) != -1)
          pathItem = dealWithSymName((const QString&)pathItem)+"/";
-//      owarn << pathItem << oendl; 
+//      owarn << pathItem << oendl;
       changeTo( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
    }
 }
 
 void AdvancedFm::showMenuHidden() {
                 if (b) {
                                 CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
                                 OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
                                 fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
     } else {
                                 CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
                                 OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
@@ -86,37 +86,37 @@ void AdvancedFm::runThis() {
 
                 QString curFile = CurrentView()->currentItem()->text(0);
                 QString path = thisDir->canonicalPath();
 
                 if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
 
                                 curFile = dealWithSymName((const QString&)curFile);
 
                 if(curFile != "../") {
 
                                 fs = getFileSystemType((const QString &) path);
                                 QFileInfo fileInfo( path  + "/" + curFile);
-//      odebug << fileInfo.owner() << oendl; 
+//      odebug << fileInfo.owner() << oendl;
 
                                 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();
-//          odebug << execStr << oendl; 
+//          odebug << execStr << oendl;
                                                 if( execStr.isEmpty() ) {
             } else {
                                                                 nf.execute();
             }
         }
     }
 }
 
 void AdvancedFm::runText() {
                 if( !CurrentView()->currentItem()) return;
                 QString curFile = CurrentView()->currentItem()->text(0);
                 if(curFile != "../") {
@@ -196,30 +196,30 @@ void AdvancedFm::doDelete() {
                                              tr("<p>Really delete %1?</p>").arg( myFile ),
                                              tr("Yes"), tr("No"), 0, 0, 1) ) {
                case 1:
                   return;
                   break;
                };
             }
 
             QString cmd="rm "+f;
             QFile file(f);
             QFileInfo fi(myFile);
             if( fi.fileName().find("../",0,TRUE)==-1) {
-//               odebug << "remove link files "+myFile << oendl; 
+//               odebug << "remove link files "+myFile << oendl;
 
 //               DocLnk lnk(f);
                  DocLnk *lnk;
                  lnk = new DocLnk(f);
-//                 odebug << "Deleting doclnk " + lnk->linkFile() << oendl; 
+//                 odebug << "Deleting doclnk " + lnk->linkFile() << oendl;
                  if(lnk->isValid())
                     lnk->removeLinkFile();
                // delete lnk;
                file.remove();
             }
          }
       }
    }
     populateView();
 }
 
 void AdvancedFm::filePerms() {
@@ -237,28 +237,28 @@ void AdvancedFm::filePerms() {
    }
     populateView();
 }
 
 void AdvancedFm::doProperties() {
 #if defined(QT_QWS_OPIE)
 
    QStringList curFileList = getPath();
 
    QString filePath;
    filePath = CurrentDir()->canonicalPath()+"/";
 
-//   odebug << "" << curFileList.count() << "" << oendl; 
+//   odebug << "" << curFileList.count() << "" << oendl;
 
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-//      odebug << (filePath+*it) << oendl; 
+//      odebug << (filePath+*it) << oendl;
       DocLnk lnk( (filePath+*it));
       LnkProperties prop( &lnk );
       QPEApplication::execDialog( &prop );
    }
 #endif
 
 }
 
 void AdvancedFm::upDir() {
 
   QDir dir( CurrentDir()->canonicalPath());
   dir.cdUp();
@@ -293,26 +293,26 @@ void AdvancedFm::copy() {
                                                         };
                                 }
 
                                 QString curFile, item, destFile;
                                 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
                                                 item=(*it);
                                                 if(item.find("->",0,TRUE)) //symlink
                                                                 item = item.left(item.find("->",0,TRUE));
 
                                                 curFile = thisDir->canonicalPath()+"/"+ item;
                                                 destFile = thatDir->canonicalPath()+"/"+ item;
 
-//          odebug << "Destination file is "+destFile << oendl; 
-//          odebug << "CurrentFile file is " + curFile << oendl; 
+//          odebug << "Destination file is "+destFile << oendl;
+//          odebug << "CurrentFile file is " + curFile << oendl;
 
                                                 QFile f(destFile);
                                                 if( f.exists()) {
                                                                 if(doMsg) {
                                                                                 switch ( QMessageBox::warning(this,tr("File Exists!"),
                                                                                                                                                                                                         tr("<p>%1 already  exists. Ok to overwrite?</P>").arg(item),
                                                                                                                                                                                                         tr("Yes"),tr("No"),0,0,1)) {
                                                                                         case 1:
                                                                                                         return;
                                                                                                         break;
                                                                                 };
                                                                 }
@@ -417,25 +417,25 @@ void AdvancedFm::copySameDir() {
                 f.remove();
                 break;
               case 1:
                 return;
                 break;
               };
             }
           if(!copyFile( curFile,destFile) )  {
               QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
               return;
             }
 
-//          odebug << "copy "+curFile+" as "+destFile << oendl; 
+//          odebug << "copy "+curFile+" as "+destFile << oendl;
         }
       delete fileDlg;
     }
             rePopulate();
 }
 
 void AdvancedFm::moveTimer() {
                 QTimer::singleShot(125,this,SLOT(move()));
 }
 
 void AdvancedFm::move() {
 
@@ -443,31 +443,31 @@ void AdvancedFm::move() {
                 if( curFileList.count() > 0) {
                                 QString curFile, destFile, item;
 
                                 QDir *thisDir = CurrentDir();
                                 QDir *thatDir = OtherDir();
                                 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
                                                 item=(*it);
                                                 QString destFile =  thatDir->canonicalPath();
 
                                                 if(destFile.right(1).find("/",0,TRUE) == -1)
                                                                 destFile+="/";
                                                 destFile += item;
-//          odebug << "Destination file is "+destFile << oendl; 
+//          odebug << "Destination file is "+destFile << oendl;
 
                                                 curFile = thisDir->canonicalPath();
                                                 if(curFile.right(1).find("/",0,TRUE) == -1)
                                                                 curFile +="/";
                                                 curFile+= item;
-//           odebug << "CurrentFile file is " + curFile << oendl; 
+//           odebug << "CurrentFile file is " + curFile << oendl;
 
                                                 if(QFileInfo(curFile).isDir()) {
                                                                 moveDirectory( curFile, destFile );
                                                                 rePopulate();
                                                                 return;
                                                 }
                                                 QFile f( destFile);
                                                 if( f.exists()) {
                                                                 switch ( QMessageBox::warning(this,tr("File Exists!"),
                                                                                                                                                                                         tr("<p>%1 already  exists. Ok to overwrite?</P>").arg(destFile),
                                                                                                                                                                                         tr("Yes"),tr("No"),0,0,1)) {
                                                                         case 1:
@@ -495,25 +495,25 @@ bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
                                 err = -1;
 
                 if(err!=0) {
                                 QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg( src));
                                 return false;
                 }
                 return true;
 }
 
 bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
 
                 QString cmd = "/bin/cp -fpR " + src + " " + dest;
-    owarn << cmd << oendl; 
+    owarn << cmd << oendl;
                 int    err = system( (const char *) cmd );
                 if ( err != 0 ) {
                                 QMessageBox::message("AdvancedFm", tr( "<p>Could not copy %1 to %2</p>").arg( src ).arg( dest ) );
                                 return false;
                 }
 
                 return true;
 }
 
 
 bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
                 if(QFileInfo(src).isDir()) {
@@ -528,47 +528,47 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
 
 
                 bool success = true;
                 struct stat status;
                 QFile srcFile(src);
                 QFile destFile(dest);
                 int err=0;
                 int read_fd=0;
                 int write_fd=0;
                 struct stat stat_buf;
                 off_t offset = 0;
                 if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
-//         owarn << "open failed" << oendl; 
+//         owarn << "open failed" << oendl;
                                 return success = false;
                 }
                 read_fd = srcFile.handle();
                 if(read_fd != -1) {
                                 fstat (read_fd, &stat_buf);
                                 if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
-//       owarn << "destfile open failed" << oendl; 
+//       owarn << "destfile open failed" << oendl;
                                                 return success = false;
                                 }
                                 write_fd = destFile.handle();
                                 if(write_fd != -1) {
                                                 err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
                                                 if( err == -1) {
                                                                 QString msg;
                                                                 switch(err) {
                                                                         case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
                                                                         case EINVAL: msg = "Descriptor is not valid or locked. ";
                                                                         case ENOMEM: msg = "Insufficient memory to read from in_fd.";
                                                                         case EIO: msg = "Unspecified error while reading from in_fd.";
                                                                 };
                                                                 success = false;
-//              owarn << msg << oendl; 
+//              owarn << msg << oendl;
                                                 }
                                 } else {
                                                 success = false;
                                 }
                 } else {
                                 success = false;
                 }
                 srcFile.close();
                 destFile.close();
                         // Set file permissions
                 if( stat( QFile::encodeName(src), &status ) == 0 )  {
                                 chmod( QFile::encodeName(dest), status.st_mode );
@@ -582,25 +582,25 @@ void AdvancedFm::runCommand() {
    QDir *thisDir = CurrentDir();
 
    QString curFile;
    curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);
 
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
    fileDlg->setInputText(curFile);
    fileDlg->exec();
    //QString command;
 
    if( fileDlg->result() == 1 ) {
-//      odebug << fileDlg->LineEdit1->text() << oendl; 
+//      odebug << fileDlg->LineEdit1->text() << oendl;
       QStringList command;
 
       command << "/bin/sh";
       command << "-c";
       command <<  fileDlg->LineEdit1->text();
       Output *outDlg;
       outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
       QPEApplication::execDialog( outDlg );
       qApp->processEvents();
 
    }
 }
@@ -665,25 +665,25 @@ void AdvancedFm::mkSym() {
           QString destName = thatDir->canonicalPath()+"/"+(*it);
           if(destName.right(1) == "/") {
               destName = destName.left( destName.length() -1);
             }
 
           QString curFile =  thisDir->canonicalPath()+"/"+(*it);
 
           if( curFile.right(1) == "/") {
               curFile = curFile.left( curFile.length() -1);
             }
 
           cmd = "ln -s "+curFile+" "+destName;
-//          odebug << cmd << oendl; 
+//          odebug << cmd << oendl;
           startProcess( (const QString)cmd );
         }
             rePopulate();
             setOtherTabCurrent();
     }
 }
 
 void AdvancedFm::doBeam() {
    Ir ir;
    if(!ir.supported())  {
    } else {
       QStringList curFileList = getPath();
@@ -715,76 +715,78 @@ void AdvancedFm::selectAll() {
 void AdvancedFm::startProcess(const QString & cmd) {
   QStringList command;
   OProcess *process;
   process = new OProcess();
   connect(process,SIGNAL(processExited(Opie::Core::OProcess*)),this,SLOT(processEnded(Opie::Core::OProcess*)));
   connect(process,SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),this,SLOT(oprocessStderr(Opie::Core::OProcess*,char*,int)));
 
   command << "/bin/sh";
   command << "-c";
   command << cmd.latin1();
   *process << command;
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
-    odebug << "could not start process" << oendl; 
+    odebug << "could not start process" << oendl;
 }
 
 void AdvancedFm::processEnded(OProcess *) {
             rePopulate();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
-//    owarn << "received stderrt " << buflen << " bytes" << oendl; 
+//    owarn << "received stderrt " << buflen << " bytes" << oendl;
 
     QString lineStr = buffer;
     QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
 }
 
 bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
                 if ( o->inherits( "QLineEdit" ) )  {
                                 if ( e->type() == QEvent::KeyPress ) {
                                                 QKeyEvent *ke = (QKeyEvent*)e;
                                                 if ( ke->key() == Key_Return ||
                                                                  ke->key() == Key_Enter )  {
                                                                 okRename();
                                                                 return true;
             }
                                                 else if ( ke->key() == Key_Escape ) {
                 cancelRename();
                 return true;
                                                 }
         }
                                 else if ( e->type() == QEvent::FocusOut ) {
             cancelRename();
             return true;
                                 }
     }
-/*   if ( o->inherits( "QListView" ) ) {
+   if ( o->inherits( "QListView" ) ) {
        if ( e->type() == QEvent::FocusIn ) {
-//            if( o == Local_View) { //keep track of which view
-        //                                              qDebug("local view");
-//               whichTab = 1;
-//            } else {
-//               whichTab = 2;
-        //                                       qDebug("remote view");
-//            }
+            if( o == Local_View) { //keep track of which view
+               whichTab = 1;
+                                       viewMenu->setItemChecked(viewMenu->idAt(0), true);
+                                       viewMenu->setItemChecked(viewMenu->idAt(1), false);
+            } else {
+               whichTab = 2;
+                                       viewMenu->setItemChecked(viewMenu->idAt(0), false);
+                                       viewMenu->setItemChecked(viewMenu->idAt(1), true);
+            }
        }
        OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
      }
-*/
+
   return QWidget::eventFilter( o, e );
 }
 
 
 void AdvancedFm::cancelRename() {
-//  odebug << "cancel rename" << oendl; 
+//  odebug << "cancel rename" << oendl;
   QListView * view;
   view = CurrentView();
 
   bool resetFocus = view->viewport()->focusProxy() == renameBox;
   delete renameBox;
   renameBox = 0;
   if ( resetFocus ) {
       view->viewport()->setFocusProxy( view);
       view->setFocus();
     }
 }