1 files changed, 25 insertions, 17 deletions

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
@@ -41,40 +41,24 @@ class QWidget;
 class QPEToolBar;
 class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
+class MenuButton;
 
 //class QPushButton;
 class QToolButton;
 class Ir;
 
 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();
     void doRemoteCd();
 //    void copy();
@@ -111,12 +95,29 @@ protected slots:
     QStringList getPath();
     void mkSym();
   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;
  
   void init();
@@ -126,12 +127,13 @@ protected:
   QString getDiskSpace(const QString &);
   void parsetab(const QString &fileName);
   QString checkDiskSpace(const QString &);
   QString dealWithSymName(const QString &);
   
 protected slots:
+    void dirMenuSelected(int);
   void showFileMenu();
   void cancelMenuTimer();
   void homeButtonPushed();
   void docButtonPushed();
   void SDButtonPushed();
   void CFButtonPushed();
@@ -148,18 +150,24 @@ protected slots:
   void fileStatus();
   void doAbout();
   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