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
@@ -526,25 +526,28 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem)
                     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);
@@ -564,25 +567,28 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
                     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());
 }
 
@@ -652,25 +658,25 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint
     };
 }
 
 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() ));
@@ -688,25 +694,25 @@ void AdvancedFm::showLocalMenu(QListViewItem * item)
     }
 }
 
 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() ));
@@ -1028,24 +1034,31 @@ void AdvancedFm::filePerms() {
     } 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));
@@ -1393,28 +1406,28 @@ void AdvancedFm::runCommand() {
                 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());
     }
@@ -1547,36 +1560,40 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
           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();