various changes, popupmenu at complete left.

2 files changed, 4 insertions, 3 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 08dc24e..23244a2 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1,143 +1,143 @@
 /***************************************************************************
    AdvancedFm.cpp
   -------------------
   ** Created: Sat Mar 9 23:33:09 2002
     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.                                   *
     ***************************************************************************/
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 
-  #include <opie/otabwidget.h>
+#include <opie/otabwidget.h>
 //  #include <opie/ofileselector.h>
 //  #include <opie/ofiledialog.h>
 
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 #include <qpe/resource.h>
 
 #include <qtabwidget.h>
 #include <qtextstream.h>
 #include <qpushbutton.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qregexp.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <time.h>
 #include <fcntl.h>
 #include <mntent.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #include <sys/utsname.h>
 
 AdvancedFm::AdvancedFm( )
         : QMainWindow( ) {
     init();
     initConnections();
     populateLocalView();
     populateRemoteView();
     currentPathCombo->setFocus();
 }
 
 AdvancedFm::~AdvancedFm() {
 }
 
 void AdvancedFm::cleanUp() {
   QString sfile=QDir::homeDirPath();
   if(sfile.right(1) != "/")
     sfile+="/._temp";
   else
     sfile+="._temp";
   QFile file( sfile);
   if(file.exists())
     file.remove();
 }
 
 void AdvancedFm::tabChanged(QWidget *) {
   if (TabWidget->getCurrentTab() == 0) {
 //  if (TabWidget->currentPageIndex() == 0) {
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
     viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
     viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
   QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
   setCaption("AdvancedFm :: "+fs+" :: "
              +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
     
   }
   if (TabWidget->getCurrentTab() == 1) {
   
 //  if (TabWidget->currentPageIndex() == 1) {
     currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
     viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
     viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
   QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
   setCaption("AdvancedFm :: "+fs+" :: "
              +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" );
   }
 }
 
 
 void AdvancedFm::populateLocalView() {
   QPixmap pm;
   Local_View->clear();
   currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
   currentDir.setMatchAllDirs(TRUE);
   currentDir.setNameFilter(filterStr);
   QString fileL, fileS, fileDate;
   QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
   setCaption("AdvancedFm :: "+fs+" :: "
              +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
   bool isDir=FALSE;
   const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
   QFileInfoListIterator it(*list);
   QFileInfo *fi;
   while ( (fi=it.current()) ) {
     if (fi->isSymLink() ) {
       QString symLink=fi->readLink();
       QFileInfo sym( symLink);
       fileS.sprintf( "%10i", sym.size() );
       fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.filePath().data() );
       fileDate = sym.lastModified().toString();
     } else {
       fileS.sprintf( "%10i", fi->size() );
       fileL.sprintf( "%s",fi->fileName().data() );
       fileDate= fi->lastModified().toString();
       if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
         fileL+="/";
         isDir=TRUE;
       }
     }
@@ -688,188 +688,188 @@ void AdvancedFm::parsetab(const QString &fileName) {
             & filesystemType.find("auto",0,TRUE) == -1)
           fsList << filesystemType;
         fileSystemTypeList << mountDir+"::"+filesystemType;
       }
     }
   }
   endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
   parsetab("/etc/mtab"); //why did TT forget filesystem type?
   QString current = currentText;//.right( currentText.length()-1);
   QString baseFs;
   for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
     QString temp = (*it);
     QString path = temp.left(temp.find("::",0,TRUE) );
     path = path.right( path.length()-1);
     if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
     if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
       return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
     }
   }
   return baseFs;
 }
 
 QString  AdvancedFm::getDiskSpace( const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
      int blkSize = fss.f_bsize;
  //    int totalBlks = fs.f_blocks;
      int availBlks = fss.f_bavail;
  
      long mult = blkSize / 1024;
      long div = 1024 / blkSize;
      if ( !mult ) mult = 1;
      if ( !div ) div = 1;
  
      return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 
 void AdvancedFm::showFileMenu() {
 
     QString curApp;
     bool isLocalView = false;
   if (TabWidget->getCurrentTab() == 0) {
 //    if (TabWidget->currentPageIndex() == 0) {
         isLocalView = TRUE;
         curApp = Local_View->currentItem()->text(0);
     }   else {
         curApp = Remote_View->currentItem()->text(0);
     }
 
      MimeType mt( curApp );
      const AppLnk* app = mt.application();
      QFile fi(curApp);
      QPopupMenu *m = new QPopupMenu(0);
      QPopupMenu *n = new QPopupMenu(0);
      //    QPopupMenu *o = new QPopupMenu(0);
   if (TabWidget->getCurrentTab() == 0) 
      m->insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
   else
      m->insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showRemoteHidden() ));
       
      if ( QFileInfo(fi).isDir() ) {
        m->insertSeparator();
        m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
      } else {
 
        if ( app )
          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() ) );
      }
 
      m->insertItem(tr("Actions"),n);
      if(isLocalView)
        n->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
      else
        n->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
 
      n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
 
     n->insertSeparator();
     
     
     if(isLocalView)
         n->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     else
         n->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
 
     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->insertSeparator();
 
     if(isLocalView)
         n->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
     else
         n->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
 
     m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
 
     m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
     m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
 
     m->insertSeparator();
     m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
 
 #if defined(QT_QWS_OPIE)
     m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
 #endif    
     m->setCheckable(TRUE);
     if (!b)
         m->setItemChecked(m->idAt(0),TRUE);
     else
         m->setItemChecked(m->idAt(0),FALSE);
 
     if(Ir::supported())
         m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
     m->setFocus();
-    m->exec( QCursor::pos() );
-    sleep(1);
+    m->exec( QPoint( 4,QCursor::pos().y()) );
+
     if(m) delete m;
 }
 
 
 void AdvancedFm::cancelMenuTimer() {
 
 //  qDebug("selectionChanged: cancel menu timer");
   if( menuTimer.isActive() )
     menuTimer.stop();
 }
 
 QString AdvancedFm::checkDiskSpace(const QString &path) {
   struct statfs fss;
   if ( !statfs( path.latin1(), &fss ) ) {
     int blkSize = fss.f_bsize;
 //    int totalBlks = fs.f_blocks;
     int availBlks = fss.f_bavail;
 
     long mult = blkSize / 1024;
     long div = 1024 / blkSize;
     if ( !mult ) mult = 1;
     if ( !div ) div = 1;
 
 
     return QString::number(availBlks * mult / div);
   }
   return "";
 }
 
 void AdvancedFm::addToDocs() {
     QStringList strListPaths = getPath();
     if( strListPaths.count() > 0) {
         QString curFile;
   if (TabWidget->getCurrentTab() == 0) {
 //        if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile = currentDir.canonicalPath()+"/"+(*it);
                 qDebug(curFile);
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
                 f.setFile( curFile);
                 f.writeLink();
             }
         } else {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
                 qDebug(curFile);
 
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
                 f.setFile( curFile);
                 f.writeLink();
             }
         }
     }
 }
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index f0a0a35..0966f02 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -1,217 +1,218 @@
 /***************************************************************************
    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/qpeapplication.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include <sys/utsname.h>
 
 
 void AdvancedFm::init() {
 #if defined(QT_QWS_OPIE)
     qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!");
 #endif
     setCaption( tr( "AdvancedFm" ) );
 
   QGridLayout *layout = new QGridLayout( this );
   layout->setSpacing( 2);
   layout->setMargin( 2);
 
 
   QPEMenuBar *menuBar = new QPEMenuBar(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 QToolButton(this,"QPEButton");
   qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
   qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
   layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
 
   cfButton = new QToolButton( this,"CFButton");
   cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
   cfButton ->setFixedSize( QSize( 20, 20 ) );
   layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
 
   sdButton = new QToolButton( this,"SDButton");
   sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
   sdButton->setFixedSize( QSize( 20, 20 ) );
   layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
 
   cdUpButton = new QToolButton( this,"cdUpButton");
   cdUpButton->setPixmap(Resource::loadPixmap("up"));
   cdUpButton ->setFixedSize( QSize( 20, 20 ) );
   layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
 
   docButton = new QToolButton( this,"docsButton");
   docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
   docButton->setFixedSize( QSize( 20, 20 ) );
   layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
 
   homeButton = new QToolButton( this,"homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
   homeButton->setFixedSize( QSize( 20, 20 ) );
   layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
 
   fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
   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( "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);
 
 
   currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
   currentPathCombo->setEditable(TRUE);
   layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
   layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
 
 
   TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab);
 //  TabWidget = new QTabWidget( this, "TabWidget" );
   layout->addMultiCellWidget( TabWidget, 2, 2, 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->addColumn( tr("File"),130);
   Local_View->addColumn( tr("Size"),-1);
   Local_View->setColumnAlignment(1,QListView::AlignRight);
   Local_View->addColumn( tr("Date"),-1);
   Local_View->setColumnAlignment(2,QListView::AlignRight);
   Local_View->setAllColumnsShowFocus(TRUE);
   Local_View->setMultiSelection( TRUE );
   Local_View->setSelectionMode(QListView::Extended);
 
   QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
   tabLayout->addWidget( Local_View, 0, 0 );
 
   TabWidget->addTab( tab,"advancedfm/smFileBrowser.png", tr("1"));
 //  TabWidget->insertTab( tab, tr("1"));
 
   tab_2 = new QWidget( TabWidget, "tab_2" );
   tabLayout_2 = new QGridLayout( tab_2 );
   tabLayout_2->setSpacing( 2);
   tabLayout_2->setMargin( 2);
 
   Remote_View = new QListView( tab_2, "Remote_View" );
   Remote_View->addColumn( tr("File"),130);
   Remote_View->addColumn( tr("Size"),-1);
   Remote_View->setColumnAlignment(1,QListView::AlignRight);
   Remote_View->addColumn( tr("Date"),-1);
   Remote_View->setColumnAlignment(2,QListView::AlignRight);
   Remote_View->setAllColumnsShowFocus(TRUE);
   Remote_View->setMultiSelection( TRUE );
   Remote_View->setSelectionMode(QListView::Extended);
 
 
   QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
   tabLayout_2->addWidget( Remote_View, 0, 0 );
 
   TabWidget->addTab( tab_2, "advancedfm/smFileBrowser.png",tr( "2"));
 //  TabWidget->insertTab( tab_2, tr( "2"));
 
   /*     tab_3 = new QWidget( TabWidget, "tab_3" );
          tabLayout_3 = new QGridLayout( tab_3 );
          tabLayout_3->setSpacing( 2);
          tabLayout_3->setMargin( 2);
 
 
          //     OFileDialog fileDialog;
          // 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();
       }
   }
   
   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() {
   connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
   connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
   connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
   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 & ) ),