3 files changed, 264 insertions, 43 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9edf7c1..d8bdff7 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -15,8 +15,9 @@
 #include <opie/otabwidget.h>
 //  #include <opie/ofileselector.h>
 //  #include <opie/ofiledialog.h>
 
+#include <qpe/config.h>
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
@@ -26,9 +27,12 @@
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 #include <qpe/resource.h>
+#include <qpe/menubutton.h>
+
 
+#include <qregexp.h>
 #include <qtabwidget.h>
 #include <qtextstream.h>
 #include <qpushbutton.h>
 #include <qdatetime.h>
@@ -89,9 +93,9 @@ void AdvancedFm::cleanUp() {
     file.remove();
 }
 
 void AdvancedFm::tabChanged(QWidget *w) {
-    qDebug("tab changed %d",TabWidget->getCurrentTab());
+//    qDebug("tab changed %d",TabWidget->getCurrentTab());
 
     if ( w == tab) {
 //    if (TabWidget->getCurrentTab() == 0) {
 //  if (TabWidget->currentPageIndex() == 0) {
@@ -193,9 +197,9 @@ void AdvancedFm::populateLocalView() {
     struct dirent *mydirent;
     if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL)
       while ((mydirent = readdir(dir)) != NULL) {
         lstat( mydirent->d_name, &buf);
-        qDebug(mydirent->d_name);
+//        qDebug(mydirent->d_name);
         fileL.sprintf("%s", mydirent->d_name);
         devT = buf.st_dev;
         fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
         fileDate.sprintf("%s", ctime( &buf.st_mtime));
@@ -292,9 +296,9 @@ void AdvancedFm::populateRemoteView() {
     struct dirent *mydirent;
     if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
       while ((mydirent = readdir(dir)) != NULL) {
         lstat( mydirent->d_name, &buf);
-        qDebug(mydirent->d_name);
+//        qDebug(mydirent->d_name);
         fileL.sprintf("%s", mydirent->d_name);
         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 ){
@@ -406,17 +410,17 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
   case 1:
   {
         if(renameBox != 0 )
     {
-        qDebug("cancel rename");
+//        qDebug("cancel rename");
         cancelRename();
     }
 
   }
     break;
   case 2:
     menuTimer.start( 500, TRUE );
-    qDebug("Start menu timer\n");
+//    qDebug("Start menu timer\n");
     break;
   };
 }
 
@@ -426,16 +430,16 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, in
       case 1:
       {
           if(renameBox != 0 )
             {
-                qDebug("cancel rename");
+//                qDebug("cancel rename");
                 cancelRename();
             }
       }
       break;
       case 2:
           menuTimer.start( 500, TRUE );
-          qDebug("Start menu timer");
+//          qDebug("Start menu timer");
           break;
     };
 }
 
@@ -479,9 +483,9 @@ void  AdvancedFm::currentPathComboChanged() {
   }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
-    qDebug("%d",TabWidget->getCurrentTab());
+//    qDebug("%d",TabWidget->getCurrentTab());
   if (TabWidget->getCurrentTab() == 0) {
 //  if (TabWidget->currentPageIndex() == 0) {
     currentPathCombo->lineEdit()->setText( currentPath);
     if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
@@ -522,9 +526,9 @@ QStringList AdvancedFm::getPath() {
     QListViewItemIterator it( Local_View );
     for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
         strList <<  it.current()->text(0);
-        qDebug(it.current()->text(0));
+//        qDebug(it.current()->text(0));
       }
     }
     return strList;
   } else {
@@ -532,9 +536,9 @@ QStringList AdvancedFm::getPath() {
     QListViewItemIterator it( Remote_View );
     for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
         strList << it.current()->text(0);
-        qDebug(it.current()->text(0));
+//        qDebug(it.current()->text(0));
       }
     }
     return strList;
   }
@@ -874,9 +878,9 @@ void AdvancedFm::addToDocs() {
   if (TabWidget->getCurrentTab() == 0) {
 //        if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile = currentDir.canonicalPath()+"/"+(*it);
-                qDebug(curFile);
+//                qDebug(curFile);
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
                 f.setFile( curFile);
@@ -884,9 +888,9 @@ void AdvancedFm::addToDocs() {
             }
         } else {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
-                qDebug(curFile);
+//                qDebug(curFile);
 
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
@@ -896,4 +900,185 @@ void AdvancedFm::addToDocs() {
         }
     }
 }
 
+
+void AdvancedFm::customDirsToMenu()
+{
+ 
+    Config cfg("AdvancedFm");
+    cfg.setGroup("Menu");
+
+    QStringList list = cfg.readListEntry( "CustomDir", ',');
+    menuButton->insertItems(list );
+
+//      for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+//        {
+//            customDirMenu->insertItem(*it );
+//        }
+}
+
+void AdvancedFm::dirMenuSelected(int item)
+{
+    qDebug("menu item %d", item);
+    switch(item)
+      {
+          
+        case -21:
+        case 0: 
+            addCustomDir();
+            break;
+        case -22:
+        case 1:   
+            removeCustomDir();
+            break;
+        default:
+        {
+//            gotoCustomDir( menuButton->text(item));            
+//            gotoCustomDir( customDirMenu->text(item));            
+        }
+        break;
+        
+      };
+}
+
+void AdvancedFm::addCustomDir()
+{
+    Config cfg("AdvancedFm");
+    cfg.setGroup("Menu");
+    QString dir;
+    QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
+
+    if (TabWidget->getCurrentTab() == 0)
+      {
+          dir =  currentDir.canonicalPath();
+      }
+    else
+      {
+          dir =  currentRemoteDir.canonicalPath();
+      }
+
+    bool addIt=true; 
+    for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+      {
+          if( dir == (*it))
+            {
+                addIt=false;
+            }
+      }
+    if(addIt)
+      {
+          menuButton->insertItem(dir);
+//          customDirMenu->insertItem(dir);
+          list <<  dir;
+      }
+
+    cfg.writeEntry("CustomDir", list, ',');
+    cfg.write();
+}
+
+void AdvancedFm::removeCustomDir()
+{
+//  qDebug("remove custom dir");
+  Config cfg("AdvancedFm");
+  cfg.setGroup("Menu");
+  QString dir;
+  QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
+  QStringList list2;
+
+  if (TabWidget->getCurrentTab() == 0)
+      {
+          dir =  currentDir.canonicalPath();
+      }
+    else
+      {
+          dir =  currentRemoteDir.canonicalPath();
+      }
+  int ramble=2;
+//  int ramble=-24;
+//first remove list
+  if(list.grep(dir,true).isEmpty())
+    {
+        QMessageBox::message("AdvancedFm",tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!"));
+    }
+  else
+    {
+        for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+          {
+              if((*it) != dir)//current item is not our current dir, so add it to temp list
+                {
+                    list2 <<(*it);
+                }
+              else
+                {
+//              customDirMenu->removeItem( ramble);
+                    menuButton->remove( ramble);
+              
+                }
+              ramble++;
+//        ramble--;
+          }
+
+        cfg.writeEntry("CustomDir", list2, ',');
+        cfg.write();
+    }
+//    customDirsToMenu();
+
+}
+
+void AdvancedFm::gotoCustomDir(const QString &dir)
+{
+//     qDebug("gotoCustomDir(const QString &dir) " +dir );
+    QString curDir = dir;
+//     if( curDir.isEmpty()) {
+//     }
+     if( curDir == s_addBookmark)
+       {
+           addCustomDir();
+       }
+     if( curDir == s_removeBookmark)
+       {
+           removeCustomDir( );
+       }
+     else
+       {
+           if(QDir( curDir).exists() )
+             {
+                 if (TabWidget->getCurrentTab() == 0)
+                   {
+                       currentDir.setPath( curDir );
+                       chdir( curDir.latin1() );
+                       currentDir.cd( curDir, TRUE);
+                       populateLocalView();
+                   }
+                 else
+                   {
+                       currentRemoteDir.setPath( curDir );
+                       chdir( curDir.latin1() );
+                       currentRemoteDir.cd( curDir, TRUE);
+                       populateRemoteView();
+                   }
+             }
+       }
+//    menuButton
+//    qDebug("gotoCustomDir(const QString &dir) " +dir );
+//     QString curDir = dir;
+//     if(QDir( curDir).exists() )
+//       {
+//           if (TabWidget->getCurrentTab() == 0)
+//             {
+//                 currentDir.setPath( curDir );
+//                 chdir( curDir.latin1() );
+//                 currentDir.cd( curDir, TRUE);
+//                 populateLocalView();
+//             }
+//           else
+//             {
+//                 currentRemoteDir.setPath( curDir );
+//                 chdir( curDir.latin1() );
+//                 currentRemoteDir.cd( curDir, TRUE);
+//                 populateRemoteView();
+//             }
+//       }
+//     menuButton->setLabel(" ");
+//    menuButton
+}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 42775ee..7478dcb 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -43,8 +43,9 @@ class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
+class MenuButton;
 
 //class QPushButton;
 class QToolButton;
 class Ir;
@@ -54,25 +55,8 @@ class AdvancedFm : public QMainWindow
     Q_OBJECT
 public:
     AdvancedFm();
     ~AdvancedFm();
-
-    OTabWidget *TabWidget;
-//    QTabWidget *TabWidget;
-    QWidget *tab, *tab_2, *tab_3;
-    QListView *Local_View, *Remote_View;
-
-    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 selectAll();
     void addToDocs();
     void doLocalCd();
@@ -113,8 +97,25 @@ protected slots:
   void switchToLocalTab();
   void switchToRemoteTab();
 
 protected:
+
+  OTabWidget *TabWidget;
+//    QTabWidget *TabWidget;
+  QWidget *tab, *tab_2, *tab_3;
+  QListView *Local_View, *Remote_View;
+
+  QLineEdit *currentPathEdit;
+  QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
+  QToolButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
+//    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
+  QDir currentDir, currentRemoteDir;
+  QComboBox *currentPathCombo;
+  QString filterStr, s_addBookmark, s_removeBookmark;
+  QListViewItem * item;
+  bool b;
+  QStringList fileSystemTypeList, fsList;
+  int currentServerConfig;
   bool zaurusDevice;
   QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
   QStringList remoteDirPathStringList, localDirPathStringList;
   QLineEdit *renameBox;
@@ -128,8 +129,9 @@ protected:
   QString checkDiskSpace(const QString &);
   QString dealWithSymName(const QString &);
   
 protected slots:
+    void dirMenuSelected(int);
   void showFileMenu();
   void cancelMenuTimer();
   void homeButtonPushed();
   void docButtonPushed();
@@ -150,16 +152,22 @@ protected slots:
   void doBeam();
   void fileBeamFinished( Ir *);
 
 private:
+    MenuButton *menuButton;
     QString oldName;
     QTimer menuTimer;
     void startProcess(const QString &);
     bool eventFilter( QObject * , QEvent * );
     void cancelRename();
     void doRename(QListView *);
     void okRename();
+    void customDirsToMenu();
+    void addCustomDir();
+    void removeCustomDir();
+
 private slots:
     void processEnded();
+    void gotoCustomDir(const QString &); 
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 0966f02..bb80dc6 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -15,8 +15,10 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
+#include <qpe/menubutton.h>
+#include <qpe/config.h>
 
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qcombobox.h>
@@ -42,43 +44,50 @@ void AdvancedFm::init() {
 
   QPEMenuBar *menuBar = new QPEMenuBar(this);
   fileMenu = new QPopupMenu( this );
   viewMenu  = new QPopupMenu( this );
+//  customDirMenu  = new QPopupMenu( this );
 
   layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
 
   menuBar->insertItem( tr( "File" ), fileMenu);
   menuBar->insertItem( tr( "View" ), viewMenu);
+//  menuBar->insertItem( tr( "^" ), customDirMenu);
+
+  cdUpButton = new QToolButton( this,"cdUpButton");
+  cdUpButton->setPixmap(Resource::loadPixmap("up"));
+  cdUpButton->setFixedSize( QSize( 20, 20 ) );
+  layout->addMultiCellWidget( cdUpButton , 0, 0, 2, 2);
+
+   menuButton = new MenuButton(this);
+   menuButton->setFixedSize( QSize( 20, 20 ) );
+   layout->addMultiCellWidget( menuButton , 0, 0, 3, 3);
 
   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);
+  layout->addMultiCellWidget( qpeDirButton , 0, 0, 4, 4);
 
   cfButton = new QToolButton( this,"CFButton");
   cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
   cfButton ->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
+  layout->addMultiCellWidget( cfButton , 0, 0, 5, 5);
 
   sdButton = new QToolButton( this,"SDButton");
   sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
   sdButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
+  layout->addMultiCellWidget( sdButton , 0, 0, 6, 6);
 
-  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);
+  layout->addMultiCellWidget( docButton, 0, 0, 7, 7);
 
   homeButton = new QToolButton( this,"homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
   homeButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
+  layout->addMultiCellWidget( homeButton, 0, 0, 8, 8);
 
   fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
   fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
   fileMenu->insertSeparator();
@@ -98,22 +107,36 @@ void AdvancedFm::init() {
   viewMenu->insertSeparator();
   viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
   viewMenu->setCheckable(TRUE);
 
+  s_addBookmark = tr("Bookmark Directory");
+  s_removeBookmark = tr("Remove Current Directory from Bookmarks");
+
+  menuButton->setUseLabel(false);
+  menuButton->insertItem( s_addBookmark);
+  menuButton->insertItem( s_removeBookmark);
+  menuButton->insertSeparator();
+//    menuButton->insertItem("");
+
+//     customDirMenu->insertItem(tr("Add This Directory"));
+//     customDirMenu->insertItem(tr("Remove This Directory"));
+//     customDirMenu->insertSeparator();
+
+    customDirsToMenu();
 
   currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
   currentPathCombo->setEditable(TRUE);
-  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
-  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
 
 
   TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab);
 //  TabWidget = new QTabWidget( this, "TabWidget" );
-  layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7);
+  layout->addMultiCellWidget( TabWidget, 2, 2, 0, 8);
 
   tab = new QWidget( TabWidget, "tab" );
   tabLayout = new QGridLayout( tab );
   tabLayout->setSpacing( 2);
@@ -213,9 +236,9 @@ void AdvancedFm::initConnections() {
   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( homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
   connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
            this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
   connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
@@ -232,10 +255,15 @@ void AdvancedFm::initConnections() {
            this,SLOT( remoteListClicked(QListViewItem *)) );
   connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
 
-  connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
+  connect( TabWidget,SIGNAL(currentChanged(QWidget *)),
           this,SLOT(tabChanged(QWidget*)));
 
   connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
 
+  connect( menuButton, SIGNAL( selected(const QString &)), SLOT(gotoCustomDir(const QString&)));
+//  connect( menuButton, SIGNAL( selected( int)), SLOT( dirMenuSelected(int)));
+
+//  connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
+
 }