1 files changed, 14 insertions, 16 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 7478dcb..8eec6ba 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -56,39 +56,30 @@ class AdvancedFm : public QMainWindow
 public:
     AdvancedFm();
     ~AdvancedFm();
 protected slots:
     void selectAll();
     void addToDocs();
-    void doLocalCd();
-    void doRemoteCd();
-//    void copy();
+  void doDirChange();
     void mkDir();
     void del();
     void rn();
     void populateLocalView();
     void populateRemoteView();
     void showHidden();
     void showMenuHidden();
-    void showRemoteHidden();
+//  void showRemoteHidden();
     void writeConfig();
     void readConfig();
-    void localListClicked(QListViewItem *);
-    void remoteListClicked(QListViewItem *);
-    void localListPressed( int, QListViewItem *, const QPoint&, int);
-    void remoteListPressed( int, QListViewItem *, const QPoint&, int);
-    void localMakDir();
-    void localDelete();
-    void remoteMakDir();
-    void remoteDelete();
-/*     bool remoteDirList(const QString &); */
-/*     bool remoteChDir(const QString &); */
+  void ListClicked(QListViewItem *);
+  void ListPressed( int, QListViewItem *, const QPoint&, int);
+  void makeDir();
+  void doDelete();
     void tabChanged(QWidget*);
     void cleanUp();
-    void remoteRename();
-    void localRename();
+  void renameIt();
     void runThis();
     void runText();
     void filePerms();
     void doProperties();
     void runCommand();
     void runCommandStd();
@@ -97,12 +88,13 @@ protected slots:
   void switchToLocalTab();
   void switchToRemoteTab();
 
 protected:
 
   OTabWidget *TabWidget;
+  int whichTab;
 //    QTabWidget *TabWidget;
   QWidget *tab, *tab_2, *tab_3;
   QListView *Local_View, *Remote_View;
 
   QLineEdit *currentPathEdit;
   QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
@@ -120,17 +112,23 @@ protected:
   QStringList remoteDirPathStringList, localDirPathStringList;
   QLineEdit *renameBox;
  
   void init();
   void initConnections();
   void keyReleaseEvent( QKeyEvent *);
+  void keyPressEvent( QKeyEvent *);
   QString getFileSystemType(const QString &);
   QString getDiskSpace(const QString &);
   void parsetab(const QString &fileName);
   QString checkDiskSpace(const QString &);
   QString dealWithSymName(const QString &);
+  QDir *CurrentDir();
+  QDir *OtherDir(); 
+  QListView *CurrentView();
+  QListView *OtherView();
+  void PopulateView();
   
 protected slots:
     void dirMenuSelected(int);
   void showFileMenu();
   void cancelMenuTimer();
   void homeButtonPushed();