comparison src/mainwindow.h @ 548:dca5bd5b2a06

Merge from branch "fswatcher"

 #include "hgaction.h"
 #include "settingsdialog.h"
 
 #include <QMainWindow>
 #include <QListWidget>
-#include <QFileSystemWatcher>
 
 QT_BEGIN_NAMESPACE
 class QAction;
 class QMenu;
 class QTimer;
 QT_END_NAMESPACE
 
 class WorkStatusWidget;
+class FsWatcher;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 

     void hgRedoFileMerges(QStringList);
     void hgMarkFilesResolved(QStringList);
     void hgIgnoreFiles(QStringList);
     void hgUnIgnoreFiles(QStringList);
 
-    void fsDirectoryChanged(QString);
-    void fsFileChanged(QString);
+    void updateFsWatcher();
     void checkFilesystem();
-    void actuallyRestoreFileSystemWatcher();
 
     void newerVersionAvailable(QString);
 
 private:
     void hgQueryBranch();

     int extractChangeCount(QString);
     QString format1(QString);
     QString format3(QString, QString, QString);
 
     void clearState();
-
-    void updateFileSystemWatcher();
-    void suspendFileSystemWatcher();
-    void restoreFileSystemWatcher();
 
     void updateClosedHeads();
 
     void updateWorkFolderAndRepoNames();
 

 
     // Help menu actions
     QAction *m_aboutAct;
     QAction *m_helpAct;
 
-    QToolBar *m_fileToolBar;
     QToolBar *m_repoToolBar;
     QToolBar *m_workFolderToolBar;
 
     QDialog *m_helpDialog;
 

 
     QString getDiffBinaryName();
     QString getMergeBinaryName();
     QString getEditorBinaryName();
 
-    QFileSystemWatcher *m_fsWatcher;
-    QTimer *m_fsWatcherGeneralTimer;
-    QTimer *m_fsWatcherRestoreTimer;
-    bool m_fsWatcherSuspended;
+    FsWatcher *m_fsWatcher;
+    int m_fsWatcherToken;
+    bool m_commandSequenceInProgress;
 
     QString m_lastStatOutput;
     QStringList m_lastRevertedFiles;
 
     bool m_justMerged;