show file selected if setDoc/openDir qcop is file

4 files changed, 54 insertions, 7 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 6b7fa1f..60558e7 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -889,24 +889,47 @@ void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
       qDebug("received");
       QString file;
       stream >> file;
       gotoDirectory( (const QString &) file);
    }
 }
 
  void AdvancedFm::setDocument(const QString &file) {
       gotoDirectory( file);
 
  }
 
 void AdvancedFm::gotoDirectory(const QString &file) {
 
   QString curDir = file;
   QDir *thisDir = CurrentDir();
-
-  if(QDir( curDir).exists() )  {
+ 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() )  {
+       thisDir->setPath( curDir );
+       chdir( curDir.latin1() );
+       thisDir->cd( curDir, TRUE);
+       populateView();
+    }
+    findFile(file);
+ }
+  
+}
+
+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());
+      }
+   }
 }
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index c9a5525..94d7bd7 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -152,27 +152,29 @@ protected slots:
    void doBeam();
    void fileBeamFinished( Ir *);
 
 private:
    MenuButton *menuButton;
    QString oldName;
    QTimer menuTimer;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    void gotoDirectory(const QString &);
+   void openSearch();
+   void findFile(const QString &);
 
 private slots:
    void processEnded(OProcess *);
    void oprocessStderr(OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
    
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index d0de442..a120f35 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -1,30 +1,32 @@
 /***************************************************************************
    advancedfmData.cpp
                              -------------------
 ** Created: Mon 09-23-2002 13:24:11
     copyright            : (C) 2002 by ljp
     email                : ljp@llornkcor.com
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include "advancedfm.h"
 
 #include <opie/otabwidget.h>
+#include <qpe/storage.h>
+
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qmenubar.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include <sys/utsname.h>
 
 
 void AdvancedFm::init() {
@@ -70,32 +72,34 @@ void AdvancedFm::init() {
   sdButton->setAutoRaise( true );
   menuBar->insertItem( sdButton );
 
   docButton = new QToolButton( 0,"docsButton");
   docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
   docButton->setAutoRaise( true );
   menuBar->insertItem( docButton );
 
   homeButton = new QToolButton( 0, "homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
   homeButton->setAutoRaise( true );
   menuBar->insertItem( homeButton );
 
   fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
   fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
   fileMenu->insertSeparator();
+  fileMenu->insertItem( tr( "File Search" ), this, SLOT( openSearch() ));
+  fileMenu->insertSeparator();
   fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
   fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
   fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
   fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
   fileMenu->insertSeparator();
   fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
   fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
   fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
   fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
   fileMenu->setCheckable(TRUE);
 
   viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
   viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
 //   viewMenu->insertSeparator();
 //   viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
   viewMenu->setCheckable(TRUE);
@@ -185,43 +189,51 @@ void AdvancedFm::init() {
          // fileDialog;
          //    fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy
          //     fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow");
          //      OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/");
 
          QListView *fileTree;
          fileTree = new QListView( tab_3, "tree" );
 
 
          tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
 
          TabWidget->insertTab( tab_3, tr( "Remote" ) );
   */
 
   ///////////////
 
+
   struct utsname name; /* check for embedix kernel running on the zaurus*/
   if (uname(&name) != -1) {
       QString release=name.release;
       if(release.find("embedix",0,TRUE) !=-1) {
           zaurusDevice=TRUE;
      } else {
           zaurusDevice=FALSE;
-          sdButton->hide();
       }
   }
 
+  if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
+     qDebug("not have sd");
+     sdButton->hide();
+  }
+  if( !StorageInfo::hasCf() ) {
+     qDebug("not have cf");
+     cfButton->hide();
+  }
   currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
   currentDir.setPath( QDir::currentDirPath());
 
   currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
   currentRemoteDir.setPath( QDir::currentDirPath());
 
   b = TRUE;
 
   filterStr="*";
   b=FALSE;
   TabWidget->setCurrentTab(0);
 
 }
 
 void AdvancedFm::initConnections()
 {
@@ -235,32 +247,33 @@ void AdvancedFm::initConnections()
   connect( sdButton ,SIGNAL(released()),
            this,SLOT( SDButtonPushed()) );
   connect( cdUpButton ,SIGNAL(released()),
            this,SLOT( upDir()) );
   connect( docButton,SIGNAL(released()),
            this,SLOT( docButtonPushed()) );
   connect( homeButton,SIGNAL(released()),
            this,SLOT( homeButtonPushed()) );
   connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
            this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
   connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
            this,SLOT(currentPathComboChanged()));
 
   connect( Local_View, SIGNAL( clicked( QListViewItem*)),
            this,SLOT( ListClicked(QListViewItem *)) );
+
   connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
   connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
 
   connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
            this,SLOT( ListClicked(QListViewItem *)) );
   connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
   connect( TabWidget,SIGNAL(currentChanged(QWidget *)),
           this,SLOT(tabChanged(QWidget*)));
 
   connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
 
   connect( menuButton, SIGNAL( selected(const QString &)), SLOT(gotoCustomDir(const QString&)));
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 575833a..2201960 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,22 +1,22 @@
 /***************************************************************************
    AdvancedFm.cpp
   -------------------
   ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
-    email                : ljp@llornkcor.com
+    email               : ljp@llornkcor.com
     *   This program is free software; you can redistribute it and/or modify  *
     *   it under the terms of the GNU General Public License as published by  *
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #include "advancedfm.h"
 #include "output.h"
 #include "filePermissions.h"
 
 #include <opie/otabwidget.h>
 #include <opie/oprocess.h>
 
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -190,64 +190,69 @@ void AdvancedFm::doDelete()
                 return;
                 break;
           };
       }
 
       QString myFile;
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
       {
       myFile = (*it);
       if( myFile.find(" -> ",0,TRUE) != -1)
         myFile = myFile.left( myFile.find(" -> ",0,TRUE));
 
       QString f = CurrentDir()->canonicalPath();
       if(f.right(1).find("/",0,TRUE) == -1)
         f += "/";
       f += myFile;
-      if(QDir(f).exists() && !QFileInfo(f).isSymLink() )
+      if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) //if file is a directory
         {
         switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete\n") + f +
                                       "\nand all it's contents ?"
                                       ,tr("Yes"),tr("No"),0,0,1) )
           {
         case 0:
         {
           f=f.left(f.length()-1);
           QString cmd="rm -rf "+f;
           startProcess( (const QString)cmd.latin1() );
           populateView();
         }
           break;
         case 1:
           // exit
           break;
         };
 
       } else {
           if(doMsg) {
         switch ( QMessageBox::warning(this,tr("Delete"),tr("Really delete\n")+f
                  +" ?",tr("Yes"),tr("No"),0,0,1) ) {
           case 1:
               return;
               break;
         };
           }
         QString cmd="rm "+f;
         QFile file(f);
-        if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1)
-            file.remove();
+        if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) {
+            qDebug("remove link files "+f);
+//             AppLnk lnk(f);
+//             qDebug(lnk.linkFile());
+//             lnk.removeLinkFile();
+           file.remove();
+        }
       }
     }
   }
   populateView();
 }
 
 void AdvancedFm::filePerms()
 {
   QStringList curFileList = getPath();
   QString filePath;
 
   filePath = CurrentDir()->canonicalPath()+"/";
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
     {
       filePermissions *filePerm;
@@ -872,16 +877,20 @@ void AdvancedFm::okRename()
   QListView * view = CurrentView();
   QString path =  CurrentDir()->canonicalPath() + "/";
   oldName = path + oldName;
   newName = path + newName;
 
   if(  view->currentItem() == NULL)
     return;
   if( rename( oldName.latin1(), newName.latin1())== -1)
     QMessageBox::message(tr("Note"),tr("Could not rename"));
   else
     oldName = "";
 
   view->takeItem( view->currentItem() );
   delete view->currentItem();
   populateView();
 }
+
+void AdvancedFm::openSearch() {
+
+}