1 files changed, 197 insertions, 12 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
@@ -18,2 +18,3 @@
 
+#include <qpe/config.h>
 #include <qpe/filemanager.h>
@@ -29,3 +30,6 @@
 #include <qpe/resource.h>
+#include <qpe/menubutton.h>
+
 
+#include <qregexp.h>
 #include <qtabwidget.h>
@@ -92,3 +96,3 @@ void AdvancedFm::cleanUp() {
 void AdvancedFm::tabChanged(QWidget *w) {
-    qDebug("tab changed %d",TabWidget->getCurrentTab());
+//    qDebug("tab changed %d",TabWidget->getCurrentTab());
 
@@ -196,3 +200,3 @@ void AdvancedFm::populateLocalView() {
         lstat( mydirent->d_name, &buf);
-        qDebug(mydirent->d_name);
+//        qDebug(mydirent->d_name);
         fileL.sprintf("%s", mydirent->d_name);
@@ -295,3 +299,3 @@ void AdvancedFm::populateRemoteView() {
         lstat( mydirent->d_name, &buf);
-        qDebug(mydirent->d_name);
+//        qDebug(mydirent->d_name);
         fileL.sprintf("%s", mydirent->d_name);
@@ -409,3 +413,3 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
     {
-        qDebug("cancel rename");
+//        qDebug("cancel rename");
         cancelRename();
@@ -417,3 +421,3 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
     menuTimer.start( 500, TRUE );
-    qDebug("Start menu timer\n");
+//    qDebug("Start menu timer\n");
     break;
@@ -429,3 +433,3 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, in
             {
-                qDebug("cancel rename");
+//                qDebug("cancel rename");
                 cancelRename();
@@ -436,3 +440,3 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, in
           menuTimer.start( 500, TRUE );
-          qDebug("Start menu timer");
+//          qDebug("Start menu timer");
           break;
@@ -482,3 +486,3 @@ void  AdvancedFm::currentPathComboChanged() {
 void  AdvancedFm::fillCombo(const QString &currentPath) {
-    qDebug("%d",TabWidget->getCurrentTab());
+//    qDebug("%d",TabWidget->getCurrentTab());
   if (TabWidget->getCurrentTab() == 0) {
@@ -525,3 +529,3 @@ QStringList AdvancedFm::getPath() {
         strList <<  it.current()->text(0);
-        qDebug(it.current()->text(0));
+//        qDebug(it.current()->text(0));
       }
@@ -535,3 +539,3 @@ QStringList AdvancedFm::getPath() {
         strList << it.current()->text(0);
-        qDebug(it.current()->text(0));
+//        qDebug(it.current()->text(0));
       }
@@ -877,3 +881,3 @@ void AdvancedFm::addToDocs() {
                 curFile = currentDir.canonicalPath()+"/"+(*it);
-                qDebug(curFile);
+//                qDebug(curFile);
                 DocLnk f;
@@ -887,3 +891,3 @@ void AdvancedFm::addToDocs() {
                 curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
-                qDebug(curFile);
+//                qDebug(curFile);
 
@@ -899 +903,182 @@ 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
+}