added add To Documents in menus, and cleaned up compiler warnings

2 files changed, 45 insertions, 13 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 0f2555d..c054465 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -129,24 +129,25 @@ AdvancedFm::AdvancedFm( )
   homeButton->setFixedSize( QSize( 20, 20 ) );
   connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
   layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
 
   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( "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);
@@ -285,25 +286,25 @@ 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 *w)
+void AdvancedFm::tabChanged(QWidget *)
 {
   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->currentPageIndex() == 1) {
     currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
     viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
@@ -323,29 +324,29 @@ void AdvancedFm::populateLocalView()
   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( "%10li", sym.size() );
+      fileS.sprintf( "%10i", sym.size() );
       fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
       fileDate = sym.lastModified().toString();
     } else {
-      fileS.sprintf( "%10li", fi->size() );
+      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;
       }
     }
     QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
     if(fileL !="./" && fi->exists()) {
       item= new QListViewItem( Local_View, fileL, fileS , fileDate);
 
       if(isDir || fileL.find("/",0,TRUE) != -1) {
@@ -422,30 +423,30 @@ void AdvancedFm::populateRemoteView()
 
   QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
   setCaption("AdvancedFm :: "+fs+" :: "+checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" );
   bool isDir=FALSE;
   const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
   QFileInfoListIterator it(*list);
   QFileInfo *fi;
   while ( (fi=it.current()) ) {
     if (fi->isSymLink() ){
       QString symLink=fi->readLink();
       //         qDebug("Symlink detected "+symLink);
       QFileInfo sym( symLink);
-      fileS.sprintf( "%10li", sym.size() );
+      fileS.sprintf( "%10i", sym.size() );
       fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
       fileDate = sym.lastModified().toString();
     } else {
       //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
-      fileS.sprintf( "%10li", fi->size() );
+      fileS.sprintf( "%10i", fi->size() );
       fileL.sprintf( "%s",fi->fileName().data() );
       fileDate= fi->lastModified().toString();
       if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
         fileL+="/";
         isDir=TRUE;
         //     qDebug( fileL);
       }
     }
     QFileInfo fileInfo(  currentRemoteDir.canonicalPath()+"/"+fileL);
     if(fileL !="./" && fi->exists()) {
       item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
       QPixmap pm;
@@ -620,38 +621,38 @@ void AdvancedFm::showRemoteHidden()
 {
   if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     b=TRUE;
 
   }  else {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     b=FALSE;
   }
   populateRemoteView();
 }
 
-void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
+void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int )
 {
   qDebug("list pressed");
   switch (mouse) {
   case 1:
     break;
   case 2:
     menuTimer.start( 750, TRUE );
     qDebug("Start menu timer\n");
     break;
   };
 }
 
-void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
+void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, int )
 {
 
   switch (mouse) {
   case 1:
     break;
   case 2:
     menuTimer.start( 750, TRUE );
     qDebug("Start menu timer");
     break;
   };
 }
 
@@ -1290,25 +1291,25 @@ void AdvancedFm::copySameDir() {
 
       if( fileDlg->result() == 1 ) {
 
         QString filename = fileDlg->LineEdit1->text();
         destFile = currentDir.canonicalPath()+"/"+filename;
 
         QFile f(destFile);
         if( f.exists()) {
           switch (QMessageBox::warning(this,tr("Delete"),
                                        destFile+tr(" already exists\nDo you really want to delete it?"),
                                        tr("Yes"),tr("No"),0,0,1) ) {
           case 0:
-            qDebug("");
+
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
         if(!copyFile(destFile, curFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
           qWarning("nothin doing");
         }
                     
@@ -1791,25 +1792,25 @@ void AdvancedFm::doBeam() {
           if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
           Ir *file = new Ir(this, "IR");
           connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
           file->send( curFile, curFile );
 
         }
       }
     }
   }
 
 }
 
-void AdvancedFm::fileBeamFinished( Ir *ir) {
+void AdvancedFm::fileBeamFinished( Ir *) {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 
 }
 
 void AdvancedFm::showFileMenu() {
 
   QString curApp;
   bool isLocalView = false;
   if (TabWidget->currentPageIndex() == 0) {
     isLocalView = TRUE;
     curApp = Local_View->currentItem()->text(0);
   }   else {
@@ -1847,49 +1848,51 @@ void AdvancedFm::showFileMenu() {
   m->insertSeparator();
 
   if(isLocalView)
     m->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
   else
     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( "Copy Same Dir" ), this, SLOT( copySameDir() ));
   m->insertItem( tr( "Move" ), this, SLOT( move() ));
   m->insertSeparator();
+  m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
 
-  if(isLocalView)
-    m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
-  else
-    m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
+//   if(isLocalView)
+//     m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
+//   else
+//     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();
 
   if(isLocalView)
     m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
   else
     m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
   m->insertSeparator();
   m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
 
   if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )  //bad hack for Sharp zaurus failings
     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);
+
   if(Ir::supported())
     m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
   m->setFocus();
   m->exec( QCursor::pos() );
   sleep(1);
   if(m) delete m;
 }
 
 
 void AdvancedFm::cancelMenuTimer() {
 
   qDebug("selectionChanged: cancel menu timer");
@@ -1906,12 +1909,40 @@ QString AdvancedFm::checkDiskSpace(const QString &path) {
 
     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->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/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 5b714ae..53dad50 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -58,24 +58,25 @@ public:
     QLineEdit *currentPathEdit;
     QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu;
     QToolButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
 //    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
     QDir currentDir, currentRemoteDir;
     QComboBox *currentPathCombo;
     QString filterStr;
     QListViewItem * item;
     bool b;
     QStringList fileSystemTypeList, fsList;
     int currentServerConfig;
 protected slots:
+    void addToDocs();
     void doLocalCd();
     void doRemoteCd();
 //    void copy();
     void mkDir();
     void del();
     void rn();
     void populateLocalView();
     void populateRemoteView();
     void showHidden();
     void showRemoteHidden();
     void writeConfig();
     void readConfig();