1 files changed, 36 insertions, 43 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 4de7d38..02898de 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -50,8 +50,7 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
         // rePopulate();
         // currentPathCombo->setFocus();
          channel = new QCopChannel( "QPE/Application/advancedfm", this );
-         connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
-                                                this, SLOT( qcopReceive(const QCString&,const QByteArray&)) );
+         connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
 
         //  if( CurrentView() == Local_View)
         //               qDebug("LOCAL VIEW");
@@ -76,16 +75,19 @@ void AdvancedFm::cleanUp() {
 }
 
 void AdvancedFm::tabChanged(QWidget *wd) {
-                if(wd == tab)
-                                odebug << "LOCAL VIEW SHOWN"<< oendl;
-                else if(wd == tab_2)
-                                odebug<< "REMOTE VIEW SHOWN"<< oendl;
-
+        //      qDebug("tabChanged");
+                if(wd == tab) {
+                                whichTab = 1;
+        //                      qDebug("tabchanged: LOCAL VIEW SHOWN");
+                }
+                else if(wd == tab_2) {
+                                whichTab = 2;
+        //                      qDebug("tabchanged: REMOTE VIEW SHOWN");
+                }
+                qApp->processEvents();
                 QString path = CurrentDir()->canonicalPath();
-   currentPathCombo->lineEdit()->setText( path );
-
+        //      qDebug(path);
          if ( TabWidget->currentWidget() == tab) {
-//   if(whichTab == 1) {
       viewMenu->setItemChecked(viewMenu->idAt(0), true);
       viewMenu->setItemChecked(viewMenu->idAt(1), false);
    } else {
@@ -98,12 +100,7 @@ void AdvancedFm::tabChanged(QWidget *wd) {
    setCaption(tr("AdvancedFm :: ")+fs+" :: "
               +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
    chdir( path.latin1());
-   if( wd == Local_View) {
-      Remote_View->clearFocus();
-   } else {
-      Local_View->clearFocus();
-   }
-         
+                currentPathCombo->lineEdit()->setText(path);
 }
 
 
@@ -218,6 +215,7 @@ void AdvancedFm::populateView() {
 }
 
 void AdvancedFm::rePopulate() {
+        //      qDebug("repopulate views");
      populateView();
      setOtherTabCurrent();
      populateView();
@@ -233,10 +231,10 @@ void AdvancedFm::rePopulate() {
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
-         if ( TabWidget->currentWidget() == tab)
-                         qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local");
-         else
-                         qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote");
+        //      if ( TabWidget->currentWidget() == tab)
+        //                      qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local");
+        //      else
+        //                      qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote");
                          
 
                          if(selectedItem) {
@@ -292,14 +290,18 @@ void AdvancedFm::refreshCurrentTab() {
 }
 
 void AdvancedFm::switchToLocalTab() {
+                qDebug("switchToLocal ");
    TabWidget->setCurrentWidget(0);
    Local_View->setFocus();
+         whichTab = 1;
          
 }
 
 void AdvancedFm::switchToRemoteTab() {
+                qDebug("switchToRemoteTab() ");
    TabWidget->setCurrentWidget(1);
    Remote_View->setFocus();
+         whichTab = 2;
 }
 
 void AdvancedFm::readConfig() {
@@ -398,10 +400,7 @@ void AdvancedFm::CFButtonPushed() {
 
 
 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"));
+   QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
@@ -582,8 +581,7 @@ void AdvancedFm::showFileMenu() {
    } else {
 
       if ( app )
-         m->insertItem( app->pixmap(), tr( "Open in "
-                                           + app->name() ), this, SLOT( runThis() ) );
+         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() ) );
@@ -597,10 +595,10 @@ void AdvancedFm::showFileMenu() {
    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->insertItem(tr("Copy"),this,SLOT(copyTimer()));
+   n->insertItem(tr("Copy As"),this,SLOT(copyAsTimer()));
+   n->insertItem(tr("Copy Same Dir"),this,SLOT(copySameDirTimer()));
+   n->insertItem(tr("Move"),this,SLOT(moveTimer()));
 
    n->insertSeparator();
    n->insertItem( tr( "Delete" ), this, SLOT( doDelete() ));
@@ -788,15 +786,11 @@ void AdvancedFm::gotoCustomDir(const QString &dir) {
 }
 
 QDir *AdvancedFm::CurrentDir() {
-
-         if ( TabWidget->currentWidget() == tab)
-                         qDebug("CurrentTab is Local");
-         else
-                         qDebug("CurrentTab is Remote");
-                         
    if ( whichTab == 1) {
+        //               qDebug("CurrentTab is Local");
       return &currentDir;
    } else {
+        //               qDebug("CurrentTab is Remote");
       return &currentRemoteDir;
    }
 }
@@ -811,14 +805,13 @@ QDir *AdvancedFm::OtherDir() {
 }
 
 QListView * AdvancedFm::CurrentView() {
-                if ( TabWidget->currentWidget() == tab) 
-      odebug << "CurrentView local" << oendl;
-                
         // if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
+        //                      qDebug("CurrentView: local");
       return Local_View;
    } else {
 //      owarn << "CurrentView Tab 2" << oendl;
+        //                      qDebug("CurrentView: remote");
       return Remote_View;
    }
 }
@@ -831,7 +824,7 @@ QListView * AdvancedFm::OtherView() {
 }
 
 void AdvancedFm::setOtherTabCurrent() {
-                qDebug("setOtherTabCurrent() %d",whichTab);
+        //      qDebug("setOtherTabCurrent() %d",whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
@@ -858,7 +851,7 @@ void AdvancedFm::setDocument(const QString &file) {
 }
 
 void AdvancedFm::gotoDirectory(const QString &file) {
-   qDebug("goto dir "+file);
+//   qDebug("goto dir "+file);
    QString curDir = file;
    QDir *thisDir = CurrentDir();
    if(QDir( curDir).exists() )  {
@@ -893,8 +886,8 @@ void AdvancedFm::findFile(const QString &fileName) {
    }
 }
 
-void AdvancedFm::slotSwitchMenu(int ) {
-//   odebug << "Switch " << item << "" << oendl;
+void AdvancedFm::slotSwitchMenu(int item) {
+        //      qDebug( "Switch %d",item);
    //   viewMenu->setItemChecked(item, true);
 }