added qpeDir icon, added ability to execute with 'open'

2 files changed, 69 insertions, 25 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index bb932c5..ab31c91 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -75,76 +75,82 @@ AdvancedFm::AdvancedFm( )
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QPEMenuBar *menuBar = new QPEMenuBar(this);
 //    fileMenu  = new QPopupMenu( this );
     fileMenu = new QPopupMenu( this );
     viewMenu  = new QPopupMenu( this );
 
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
 
     menuBar->insertItem( tr( "File" ), fileMenu);
     menuBar->insertItem( tr( "View" ), viewMenu);
 
+    qpeDirButton= new QPushButton(Resource::loadIconSet("go"),"",this,"QPEButton");
+    qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
+    connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
+    qpeDirButton->setFlat(TRUE);
+    layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
+ 
     cfButton = new QPushButton(Resource::loadIconSet("cardmon/pcmcia"),"",this,"CFButton");
     cfButton ->setFixedSize( QSize( 20, 20 ) );
     connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
     cfButton->setFlat(TRUE);
-    layout->addMultiCellWidget( cfButton , 0, 0, 2, 2);
+    layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
 
     sdButton = new QPushButton(Resource::loadIconSet("sdmon/sdcard"),"",this,"SDButton");
     sdButton->setFixedSize( QSize( 20, 20 ) );
     connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
     sdButton->setFlat(TRUE);
-    layout->addMultiCellWidget( sdButton , 0, 0, 3, 3);
+    layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
 
     cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
     cdUpButton ->setFixedSize( QSize( 20, 20 ) );
     connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
     cdUpButton ->setFlat(TRUE);
-    layout->addMultiCellWidget( cdUpButton , 0, 0, 4, 4);
+    layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
 
     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
     docButton->setFixedSize( QSize( 20, 20 ) );
     connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
     docButton->setFlat(TRUE);
-    layout->addMultiCellWidget( docButton, 0, 0, 5, 5);
+    layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
 
     homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
     homeButton->setFixedSize( QSize( 20, 20 ) );
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
     homeButton->setFlat(TRUE);
-    layout->addMultiCellWidget( homeButton, 0, 0, 6, 6);
+    layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
 //     fileMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
 //     fileMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
 //     fileMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
 
     fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
         fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
     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( "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);
 
     TabWidget = new QTabWidget( this, "TabWidget" );
-    layout->addMultiCellWidget( TabWidget, 1, 1, 0, 6);
+    layout->addMultiCellWidget( TabWidget, 1, 1, 0, 7);
 
     tab = new QWidget( TabWidget, "tab" );
     tabLayout = new QGridLayout( tab );
     tabLayout->setSpacing( 2);
     tabLayout->setMargin( 2);
 
     Local_View = new QListView( tab, "Local_View" );
 //    Local_View->setResizePolicy( QListView::AutoOneFit );
     Local_View->addColumn( tr("File"),130);
     Local_View->addColumn( tr("Size"),-1);
     Local_View->setColumnAlignment(1,QListView::AlignRight);
     Local_View->addColumn( tr("Date"),-1);
@@ -204,36 +210,36 @@ AdvancedFm::AdvancedFm( )
     
 //     TabWidget->insertTab( tab_3, tr( "Files" ) );
 
     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;
     currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
     currentPathCombo->setEditable(TRUE);
-    layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 6);
+    layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 7);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
               this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
     connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
              this,SLOT(currentPathComboChanged()));
 
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
-    layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 6);
+    layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 7);
 
     filterStr="*";
     b=FALSE;
     populateLocalView();
     populateRemoteView();
 }
 
 AdvancedFm::~AdvancedFm()
 {
 }
 
 void AdvancedFm::cleanUp()
@@ -297,34 +303,40 @@ void AdvancedFm::populateLocalView()
         } else {
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
         if(fileL !="./" && fi->exists()) {
             item= new QListViewItem( Local_View, fileL, fileS , fileDate);
-
             if(isDir || fileL.find("/",0,TRUE) != -1) {
                 if( !QDir( fi->filePath() ).isReadable())
                     pm = Resource::loadPixmap( "lockedfolder" );
                 else
                     pm= Resource::loadPixmap( "folder" );
                 item->setPixmap( 0,pm );
             } else {
-                if( !fi->isReadable() )
+                if(fi->isExecutable()) {
+                    pm = Resource::loadPixmap( "exec");
+                    item->setPixmap( 0,pm);
+                }
+                else if( !fi->isReadable() ) {
                     pm = Resource::loadPixmap( "locked" );
+                    item->setPixmap( 0,pm);
+
+                }
                 else {
                     MimeType mt(fi->filePath());
                     pm=mt.pixmap(); //sets the correct pixmap for mimetype
                     if(pm.isNull())
                         pm =  Resource::loadPixmap( "UnknownDocument-14" );
                     item->setPixmap( 0,pm);
                 }
             }
             if(  fileL.find("->",0,TRUE) != -1) {
                   // overlay link image
                 pm= Resource::loadPixmap( "folder" );
                 QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
@@ -414,27 +426,32 @@ void AdvancedFm::populateRemoteView()
         }
         if(fileL !="./" && fi->exists()) {
             item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
             QPixmap pm;
 
             if(isDir || fileL.find("/",0,TRUE) != -1) {
                 if( !QDir( fi->filePath() ).isReadable())
                     pm = Resource::loadPixmap( "lockedfolder" );
                 else
                     pm= Resource::loadPixmap( "folder" );
                 item->setPixmap( 0,pm );
             } else {
-                if( !fi->isReadable() )
+                if(fi->isExecutable()) {
+                    pm = Resource::loadPixmap( "exec");
+                    item->setPixmap( 0,pm);
+                }
+                else if( !fi->isReadable() ) {
                     pm = Resource::loadPixmap( "locked" );
-                else {
+                    item->setPixmap( 0,pm);
+                } else {
                     MimeType mt(fi->filePath());
                     pm=mt.pixmap(); //sets the correct pixmap for mimetype
                     if(pm.isNull())
                         pm =  Resource::loadPixmap( "UnknownDocument-14" );
                     item->setPixmap( 0,pm);
                 }
             }
             if(  fileL.find("->",0,TRUE) != -1) {
                   // overlay link image
                 pm= Resource::loadPixmap( "folder" );
                 QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
                 QPainter painter( &pm );
@@ -689,42 +706,54 @@ void AdvancedFm::showRemoteMenu(QListViewItem * item)
         if (!b)
             m.setItemChecked(m.idAt(0),TRUE);
         else
             m.setItemChecked(m.idAt(0),FALSE);
         m.exec( QCursor::pos() );
     }    
 }
 
 void AdvancedFm::runThis() {
 //    QFileInfo *fi;
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
-        curFile =  currentDir.canonicalPath()+"/"+curFile;
-        DocLnk nf(curFile);
-        QString execStr = nf.exec();
-        qDebug( execStr);
-        if( execStr.isEmpty() ) {
+        QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
+        if(fileInfo.isExecutable()) {
+            QCopEnvelope e("QPE/System", "execute(QString)" );
+            e << curFile;
         } else {
-        nf.execute();
+        curFile =  currentDir.canonicalPath()+"/"+curFile;
+            DocLnk nf(curFile);
+            QString execStr = nf.exec();
+            qDebug( execStr);
+            if( execStr.isEmpty() ) {
+            } else {
+                nf.execute();
+            }
         }
 //         MimeType mt( curFile);
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
-        curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
-        DocLnk nf(curFile);
-        QString execStr = nf.exec();
-        qDebug(execStr);
-        if( execStr.isEmpty() ) {
+        QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
+        if(fileInfo.isExecutable()) {
+                QCopEnvelope e("QPE/System", "execute(QString)" );
+                e << curFile;
         } else {
-        nf.execute();
+        curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
+            DocLnk nf(curFile);
+            QString execStr = nf.exec();
+            qDebug(execStr);
+            if( execStr.isEmpty() ) {
+            } else {
+                nf.execute();
+            }
         }
 //         MimeType mt( curFile);
     }
 }
 
 void AdvancedFm::runText() {
     if (TabWidget->currentPageIndex() == 0) {
         QString curFile = Local_View->currentItem()->text(0);
         curFile =  currentDir.canonicalPath()+"/"+curFile;
         QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
         e << curFile;
     } else {
@@ -1469,12 +1498,26 @@ void AdvancedFm::mkSym() {
         system(cmd.latin1() );
         populateRemoteView();
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
         if(curFile.right(1) == "/") curFile = curFile.left(curFile.length() - 1);
         QString destName = currentDir.canonicalPath()+"/"+curFile;
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
         cmd = "ln -s "+curFile+" "+destName;
         system(cmd.latin1() );
         populateLocalView();
     }
 }
+
+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();
+
+}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index c00713f..5c2719e 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -43,25 +43,25 @@ class AdvancedFm : public QMainWindow
 {
     Q_OBJECT
 public:
     AdvancedFm();
     ~AdvancedFm();
 
     QTabWidget *TabWidget;
     QWidget *tab, *tab_2, *tab_3;
     QListView *Local_View, *Remote_View;
 
     QLineEdit *currentPathEdit;
     QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu;
-    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton;
+    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
     QDir currentDir, currentRemoteDir;
     QComboBox *currentPathCombo;
     QString filterStr;
     QListViewItem * item;
     bool b;
     int currentServerConfig;
 protected slots:
     void showLocalMenu( QListViewItem *);
     void showRemoteMenu( QListViewItem *);
     void doLocalCd();
     void doRemoteCd();
 //    void copy();
@@ -99,24 +99,25 @@ protected slots:
   void switchToLocalTab();
   void switchToRemoteTab();
 
 protected:
   QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
   QStringList remoteDirPathStringList, localDirPathStringList;
   void keyReleaseEvent( QKeyEvent *);    
 protected slots:
   void homeButtonPushed();
   void docButtonPushed();
   void SDButtonPushed();
   void CFButtonPushed();
+  void QPEButtonPushed();
   void upDir();
   void currentPathComboChanged();
   void copy();
   void copyAs();
   void currentPathComboActivated(const QString &);
   void fillCombo(const QString &);
   bool copyFile( const QString & , const QString & );
   void move();
   void fileStatus();
   void doAbout();
 };