fix stuff

1 files changed, 43 insertions, 34 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index def6fe2..2234b3c 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -48,56 +48,24 @@ class QLineEdit;
 class MenuButton;
 
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
     Q_OBJECT
 public:
     static QString appName() { return QString::fromLatin1("advancedfm"); }
    AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
    ~AdvancedFm();
-protected slots:
-   void slotSwitchMenu(int);
-   void selectAll();
-   void addToDocs();
-   void doDirChange();
-   void mkDir();
-   void del();
-   void rn();
-   void populateView();
-   void rePopulate();
-   void showHidden();
-   void showMenuHidden();
-   void writeConfig();
-   void readConfig();
-   void ListClicked(QListViewItem *);
-   void ListPressed( int, QListViewItem *, const QPoint&, int);
-   void makeDir();
-   void doDelete();
-   void tabChanged(QWidget*);
-   void cleanUp();
-   void renameIt();
-   void runThis();
-   void runText();
-   void filePerms();
-   void doProperties();
-   void runCommand();
-   void runCommandStd();
-   QStringList getPath();
-   void mkSym();
-   void switchToLocalTab();
-   void switchToRemoteTab();
-         void refreshCurrentTab();
 protected:
 
    Opie::Ui::OSplitter *TabWidget;
    QCopChannel * channel;
    QPixmap unknownXpm;
    int whichTab;
 //    QTabWidget *TabWidget;
    QWidget *tab, *tab_2, *tab_3;
    QListView *Local_View, *Remote_View;
 
    QLineEdit *currentPathEdit;
    QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
@@ -121,66 +89,107 @@ protected:
    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 setOtherTabCurrent();
 
+//protected signals:
+        //      void newPath(QString);
+    
 protected slots:
+   void slotSwitchMenu(int);
+   void selectAll();
+   void addToDocs();
+   void doDirChange();
+   void mkDir();
+   void del();
+   void rn();
+   void populateView();
+   void rePopulate();
+   void showHidden();
+   void showMenuHidden();
+   void writeConfig();
+   void readConfig();
+   void ListClicked(QListViewItem *);
+   void ListPressed( int, QListViewItem *, const QPoint&, int);
+   void makeDir();
+   void doDelete();
+   void tabChanged(QWidget*);
+   void cleanUp();
+   void renameIt();
+   void runThis();
+   void runText();
+   void filePerms();
+   void doProperties();
+   void runCommand();
+   void runCommandStd();
+   QStringList getPath();
+   void mkSym();
+   void switchToLocalTab();
+   void switchToRemoteTab();
+         void refreshCurrentTab();
 
    void openSearch();
    void dirMenuSelected(int);
    void showFileMenu();   
    void homeButtonPushed();
    void docButtonPushed();
    void SDButtonPushed();
    void CFButtonPushed();
    void QPEButtonPushed();
    void upDir();
    void currentPathComboChanged();
+
    void copy();
+   void copyTimer();
    void copyAs();
+   void copyAsTimer();
    void copySameDir();
+   void copySameDirTimer();
+   void move();
+   void moveTimer();
+
    void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    bool copyFile( const QString & , const QString & );
-   void move();
    void fileStatus();
    void doAbout();
    void doBeam();
    void fileBeamFinished( Ir *);
    bool copyDirectory( const QString & , const QString & );
 //   void navigateToSelected();
    bool moveDirectory( const QString & , const QString & );
          
 //   void slotSwitchtoLocal(int);
 
 private:
    MenuButton *menuButton;
-   QString oldName;
+   QString oldName, localViewDir, remoteViewDir;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    void gotoDirectory(const QString &);
    void navigateToSelected();
    void findFile(const QString &);
 
 private slots:
    void processEnded(Opie::Core::OProcess *);
    void oprocessStderr(Opie::Core::OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
+        // void doMenu(int
 
 };
 
 #endif // ADVANCEDFM_H