comparison mainwindow.cpp @ 241:4e98950f72e8

* Small simplification to watcher management

 
 
 MainWindow::MainWindow(QString myDirPath) :
     m_myDirPath(myDirPath),
     m_fsWatcherGeneralTimer(0),
-    m_fsWatcherRestoreTimer(0)
+    m_fsWatcherRestoreTimer(0),
+    m_fsWatcherSuspended(false)
 {
     setWindowIcon(QIcon(":images/easyhg-icon.png"));
 
     QString wndTitle;
 

     createMenus();
     createToolBars();
     createStatusBar();
 
     runner = new HgRunner(myDirPath, this);
+    connect(runner, SIGNAL(commandStarting(HgAction)),
+            this, SLOT(commandStarting(HgAction)));
     connect(runner, SIGNAL(commandCompleted(HgAction, QString)),
             this, SLOT(commandCompleted(HgAction, QString)));
     connect(runner, SIGNAL(commandFailed(HgAction, QString)),
             this, SLOT(commandFailed(HgAction, QString)));
     statusBar()->addPermanentWidget(runner);

     mergeTargetRevision = "";
     mergeCommitComment = "";
     stateUnknown = true;
     needNewLog = true;
     if (fsWatcher) {
+        delete m_fsWatcherGeneralTimer;
+        m_fsWatcherGeneralTimer = 0;
+        delete m_fsWatcherRestoreTimer;
+        m_fsWatcherRestoreTimer = 0;
         delete fsWatcher;
         fsWatcher = 0;
     }
 }
 

 
 void MainWindow::suspendFileSystemWatcher()
 {
     DEBUG << "MainWindow::suspendFileSystemWatcher" << endl;
     if (fsWatcher) {
-        m_fsWatcherRestoreTimer->stop();
+        m_fsWatcherSuspended = true;
+        if (m_fsWatcherRestoreTimer) {
+            delete m_fsWatcherRestoreTimer;
+            m_fsWatcherRestoreTimer = 0;
+        }
         m_fsWatcherGeneralTimer->stop();
-        fsWatcher->blockSignals(true);
     }
 }
 
 void MainWindow::restoreFileSystemWatcher()
 {

 }
 
 void MainWindow::actuallyRestoreFileSystemWatcher()
 {
     DEBUG << "MainWindow::actuallyRestoreFileSystemWatcher" << endl;
-    if (fsWatcher) fsWatcher->blockSignals(false);
+    if (fsWatcher) {
+        m_fsWatcherSuspended = false;
+        m_fsWatcherGeneralTimer->start();
+    }
 }
 
 void MainWindow::checkFilesystem()
 {
     DEBUG << "MainWindow::checkFilesystem" << endl;

 }
 
 void MainWindow::fsDirectoryChanged(QString d)
 {
     DEBUG << "MainWindow::fsDirectoryChanged " << d << endl;
-    hgStat();
+    if (!m_fsWatcherSuspended) {
+        hgStat();
+    }
 }
 
 void MainWindow::fsFileChanged(QString f)
 {
     DEBUG << "MainWindow::fsFileChanged " << f << endl;
-    hgStat();
+    if (!m_fsWatcherSuspended) {
+        hgStat();
+    }
 }
 
 QString MainWindow::format3(QString head, QString intro, QString code)
 {
     code = xmlEncode(code).replace("\n", "<br>")