bug fix

1 files changed, 23 insertions, 6 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index f4ca349..b9e254e 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -490,259 +490,265 @@ void AdvancedFm::populateRemoteView()
                 fileL.sprintf("%s", mydirent->d_name);
 //                fileS.sprintf("%d, %d",  ); //this isn't correct
                 fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
                 fileDate.sprintf("%s", ctime( &buf.st_mtime));
                 if( fileL.find(".") == -1 ){
                     item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
                     item->setPixmap( 0,pm);
                 }
             }
             
         closedir(dir);
     }
 
     Remote_View->setSorting( 3,FALSE);
     fillCombo( (const QString &) currentRemoteDir.canonicalPath() );
 }
 
 void AdvancedFm::localListClicked(QListViewItem *selectedItem)
 {
     if(selectedItem) {
         QString strItem=selectedItem->text(0);
         QString strSize=selectedItem->text(1);
         strSize=strSize.stripWhiteSpace();
         if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
               // is symlink
             QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
             if(QDir(strItem2).exists() ) {
                 currentDir.cd(strItem2, TRUE);
                 populateLocalView();
             }
         } else { // not a symlink
             if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
                 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
                     strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                     currentDir.cd(strItem,FALSE);
                     populateLocalView();
                 } else {
                     currentDir.cdUp();
                     populateLocalView();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateLocalView();
                 }
             } else {
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
-//                 qDebug("upload "+strItem);
+                 qDebug("clicked item "+strItem);
+    DocLnk doc( strItem, FALSE );
+    doc.execute();
+    //    Local_View->clearSelection();
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
     }
 }
 
 void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
 {
     if(selectedItem) {
         QString strItem=selectedItem->text(0);
         QString strSize=selectedItem->text(1);
         strSize=strSize.stripWhiteSpace();
         if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
               // is symlink
             QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
             if(QDir(strItem2).exists() ) {
                 currentRemoteDir.cd(strItem2, TRUE);
                 populateRemoteView();
             }
         } else { // not a symlink
             if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
                 if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) {
                     strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
                     currentRemoteDir.cd(strItem,FALSE);
                     populateRemoteView();
                 } else {
                     currentRemoteDir.cdUp();
                     populateRemoteView();
                 }
                 if(QDir(strItem).exists()){
                     currentRemoteDir.cd(strItem, TRUE);
                     populateRemoteView();
                 }
             } else {
                 strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
-//                 qDebug("upload "+strItem);
+                 qDebug("clicked item "+strItem);
+    DocLnk doc( strItem, FALSE );
+    doc.execute();
+    //    Remote_View->clearSelection();
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
     }
 }
 
 void AdvancedFm::doLocalCd()
 {
     localListClicked( Local_View->currentItem());
 }
 
 void AdvancedFm::doRemoteCd()
 {
     localListClicked( Remote_View->currentItem());
 }
 
 void AdvancedFm::showHidden()
 {
     if (b) {
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
 //     localMenu->setItemChecked(localMenu->idAt(0),TRUE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
 
     }  else {
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
 //     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
     }
     populateLocalView();
         
 }
 
 void AdvancedFm::showRemoteHidden()
 {
     if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
 //     viewMenu->setItemChecked(localMenu->idAt(0),TRUE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
 
     }  else {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
 //     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
     }
     populateRemoteView();
 }
 
 void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
     switch (mouse) {
       case 1:
           break;
       case 2:
           showLocalMenu(item);
           Local_View->clearSelection();
     break;
     };
 }
 
 void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
  switch (mouse) {
       case 1:
           break;
       case 2:
           showRemoteMenu(item);
           Remote_View->clearSelection();
       break;
     };
 }
 
 void AdvancedFm::showLocalMenu(QListViewItem * item)
 {
     if(item) {
         QPopupMenu  m;
         m.insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
         m.insertSeparator();
         if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1)
             m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
         else
-            m.insertItem( tr( "Open" ), this, SLOT( runThis() ));
+            m.insertItem( tr( "Open / Execute" ), this, SLOT( runThis() ));
         m.insertItem( tr( "Open as Text" ), this, SLOT( runText() ));
         m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
         m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
         m.insertSeparator();
         m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
         m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
         m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
         m.insertItem( tr( "Move" ), this, SLOT( move() ));
         m.insertSeparator();
         m.insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
         m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
         m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
         m.insertSeparator();
         m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
         m.insertSeparator();
         m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
         m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
         m.setCheckable(TRUE);
         if (!b)
             m.setItemChecked(m.idAt(0),TRUE);
         else
             m.setItemChecked(m.idAt(0),FALSE);
         m.exec( QCursor::pos() );
     }
 }
 
 void AdvancedFm::showRemoteMenu(QListViewItem * item)
 {
     if(item) {
         QPopupMenu  m;
         m.insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showRemoteHidden() ));
         m.insertSeparator();
         if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1)
             m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
         else
-            m.insertItem( tr( "Open" ), this, SLOT( runThis() ));
+            m.insertItem( tr( "Open / Execute" ), this, SLOT( runThis() ));
         m.insertItem( tr( "Open as Text" ), this, SLOT( runText() ));
         m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
         m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
         m.insertSeparator();
         m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
         m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
         m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
         m.insertItem( tr( "Move" ), this, SLOT( move() ));
         m.insertSeparator();
         m.insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
         m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
         m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
         m.insertSeparator();
         m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
         m.insertSeparator();
         m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
         m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
         m.setCheckable(TRUE);
         if (!b)
             m.setItemChecked(m.idAt(0),TRUE);
         else
             m.setItemChecked(m.idAt(0),FALSE);
         m.exec( QCursor::pos() );
     }    
 }
 
 void AdvancedFm::runThis() {
 //    QFileInfo *fi;
 QString fs;    
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
 
         fs= getFileSystemType((const QString &) currentDir.canonicalPath());
         QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
         qDebug( fileInfo.owner());
         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") ) {
 //        if( fileInfo.isExecutable() |
             QCopEnvelope e("QPE/System", "execute(QString)" );
             e << curFile;
          } else {
         curFile =  currentDir.canonicalPath()+"/"+curFile;
             DocLnk nf(curFile);
             QString execStr = nf.exec();
             qDebug( execStr);
             if( execStr.isEmpty() ) {
@@ -992,96 +998,103 @@ void  AdvancedFm::fillCombo(const QString &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) {
     if (TabWidget->currentPageIndex() == 0) {
         chdir( currentPath.latin1() );
         currentDir.cd( currentPath, TRUE);
         populateLocalView();
         update();
     } else {
         chdir( currentPath.latin1() );
         currentRemoteDir.cd( currentPath, TRUE);
         populateRemoteView();
         update();
     }
 }
 
 void AdvancedFm::filePerms() {
 
     QStringList curFileList = getPath();
     QString filePath;
 
     if (TabWidget->currentPageIndex() == 0) {
         filePath = currentDir.canonicalPath()+"/";
     } else {
         filePath= currentRemoteDir.canonicalPath()+"/";
     }
 
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         filePermissions *filePerm;
         filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
         filePerm->showMaximized();
         filePerm->exec();
         if( filePerm)
             delete  filePerm;
     }
+    if (TabWidget->currentPageIndex() == 0) {
+        populateLocalView();
+    } else {
+        populateRemoteView();
+    }
+
+    
 }
 
 void AdvancedFm::doProperties() {
     QStringList curFileList = getPath();
     QString filePath;
     if (TabWidget->currentPageIndex() == 0) {
         filePath = currentDir.canonicalPath()+"/";
     } else {
         filePath= currentRemoteDir.canonicalPath()+"/";
     }
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         DocLnk lnk( (filePath+*it));
         LnkProperties prop( &lnk );
 //  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
         prop.showMaximized();
         prop.exec();
     }
 }
 
 QStringList AdvancedFm::getPath() {
     QStringList strList;
     if (TabWidget->currentPageIndex() == 0) {
         QList<QListViewItem> * getSelectedItems( QListView * Local_View );
         QListViewItemIterator it( Local_View );
         for ( ; it.current(); ++it ) {
             if ( it.current()->isSelected() ) {
                 strList <<  it.current()->text(0);
             }
         }
         return strList;
     } else {
         QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
         QListViewItemIterator it( Remote_View );
         for ( ; it.current(); ++it ) {
             if ( it.current()->isSelected() ) {
                 strList << it.current()->text(0);
             }
         }
         return strList;
     }
     return "";
 }
 
 void AdvancedFm::homeButtonPushed() {
     QString current = QDir::homeDirPath();
     chdir( current.latin1() );
     if (TabWidget->currentPageIndex() == 0) {
         currentDir.cd(  current, TRUE);
@@ -1357,100 +1370,100 @@ void AdvancedFm::runCommand() {
      if (TabWidget->currentPageIndex() == 0) {
          if( Local_View->currentItem())
          curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
      } else {
          if(Remote_View->currentItem())
          curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->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 ) {
         command = fileDlg->LineEdit1->text();
 
 //         int err=0;
         Output *outDlg;
         outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
         outDlg->showMaximized();
         outDlg->show();
         qApp->processEvents();
         FILE *fp;
         char line[130];
         sleep(1);
 //         if(command.find("2>",0,TRUE) != -1)
             command +=" 2>&1";
         fp = popen(  (const char *) command, "r"); 
         if ( !fp ) {
             qDebug("Could not execute '" + command + "'! err=%d", fp); 
             QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
             pclose(fp);             
             return;
         } else {
             while ( fgets( line, sizeof line, fp)) {
                 QString lineStr = line;
                 lineStr=lineStr.left(lineStr.length()-1);
                 outDlg->OutputEdit->append(lineStr);
                 outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
             }
         }
     }
 }
 
 void AdvancedFm::runCommandStd() {
     QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
         if( Local_View->currentItem())
-            curFile = currentDir.canonicalPath() + Local_View->currentItem()->text(0);
+            curFile = currentDir.canonicalPath() +"/"+  Local_View->currentItem()->text(0);
     } else {
         if(Remote_View->currentItem())
-            curFile = currentRemoteDir.canonicalPath() + Remote_View->currentItem()->text(0);
+            curFile = currentRemoteDir.canonicalPath() +"/"+  Remote_View->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 ) {
         qApp->processEvents();
         command = fileDlg->LineEdit1->text() + " &";
         system(command.latin1());
     }
 }
 
 void AdvancedFm::fileStatus() {
     QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
         curFile = Local_View->currentItem()->text(0);
     } else {
         curFile = Remote_View->currentItem()->text(0);
     }
     QString command = " stat -l "+ curFile +" 2>&1";
 //     int err=0;
     Output *outDlg;
     outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
     outDlg->showMaximized();
     outDlg->show();
     qApp->processEvents();
     FILE *fp;
     char line[130];
     sleep(1);
     fp = popen(  (const char *) command, "r"); 
     if ( !fp ) {
         qDebug("Could not execute '" + command + "'! err=%d", fp); 
         QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
         pclose(fp);             
         return;
     } else {
         while ( fgets( line, sizeof line, fp)) {
             outDlg->OutputEdit->append(line);
             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                   
         }
               
     }
 }
 
 void AdvancedFm::mkDir() {
@@ -1511,108 +1524,112 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
           fileStatus();
           break;
       case Key_U:
           upDir();
           break;
       case Key_P:
           filePerms();
           break;
       case Key_N:
           mkDir();
           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;          
     }
 }
 
 void AdvancedFm::mkSym() {
     QString cmd;
     QStringList curFileList = getPath();
 
     if (TabWidget->currentPageIndex() == 0) {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
             QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
+            if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
             QString curFile =  currentDir.canonicalPath()+"/"+(*it);
+            if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
             cmd = "ln -s "+curFile+" "+destName;
             qDebug(cmd);
             system(cmd.latin1() );
         }
             populateRemoteView();
             TabWidget->setCurrentPage(1);
     } else {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
             QString destName = currentDir.canonicalPath()+"/"+(*it);
+            if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
             QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
+            if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
 
             cmd = "ln -s "+curFile+" "+destName;
             qDebug(cmd);
             system(cmd.latin1() );
         }
             populateLocalView();
             TabWidget->setCurrentPage(0);
     }
 }
 
 void AdvancedFm::QPEButtonPushed() {
     QString current = QPEApplication::qpeDir();
     chdir( current.latin1() );
     if (TabWidget->currentPageIndex() == 0) {
         currentDir.cd( current, TRUE);
         populateLocalView();
     } else {
         currentRemoteDir.cd( current, TRUE);
         populateRemoteView();
     }
     update();
 }
 
 void AdvancedFm::parsetab(const QString &fileName) {
 
     fileSystemTypeList.clear();
      fsList.clear();
     struct mntent *me;
 //     if(fileName == "/etc/mtab") {
     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;
 //                 deviceList << deviceName;
 //                qDebug(mountDir+"::"+filesystemType);
                 fileSystemTypeList << mountDir+"::"+filesystemType;
             }
         }
     }
     endmntent( mntfp );