comparison mainwindow.h @ 109:1721c580c10e

* Add a queueing mechanism for Hg actions, instead of refusing to start an action if something else is already happening.  This is essential now that actions can be prompted by asynchronous events (e.g. filesystem watcher).
 * Make Revert behave sensibly

 
 #include "hgtabwidget.h"
 #include "hgrunner.h"
 #include "common.h"
 #include "changeset.h"
+#include "hgaction.h"
 
 #include <QMainWindow>
 #include <QListWidget>
 #include <QFileSystemWatcher>
 
 QT_BEGIN_NAMESPACE
 class QAction;
 class QMenu;
 QT_END_NAMESPACE
-
-enum HGACTIONS
-{
-    ACT_NONE,
-    ACT_PATHS,
-    ACT_BRANCH,
-    ACT_STAT,
-    ACT_HEADS,
-    ACT_PARENTS,
-    ACT_LOG,
-    ACT_REMOVE,
-    ACT_ADD,
-    ACT_INCOMING,
-    ACT_PUSH,
-    ACT_PULL,
-    ACT_CLONEFROMREMOTE,
-    ACT_INIT,
-    ACT_COMMIT,
-    ACT_ANNOTATE,
-    ACT_FILEDIFF,
-    ACT_FOLDERDIFF,
-    ACT_CHGSETDIFF,
-    ACT_UPDATE,
-    ACT_REVERT,
-    ACT_MERGE,
-    ACT_RESOLVE_LIST,
-    ACT_SERVE,
-    ACT_RESOLVE_MARK,
-    ACT_RETRY_MERGE,
-    ACT_TAG,
-    ACT_HG_IGNORE,
-};
-
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 

 
 protected:
     void closeEvent(QCloseEvent *event);
 
 public slots:
-    void hgPaths();
+    void hgQueryPaths();
     void hgStat();
-    void tabChanged(int currTab);
-    void commandCompleted();
-    void commandFailed();
+//    void tabChanged(int currTab);
+    void commandCompleted(HgAction action, QString stdout);
+    void commandFailed(HgAction action, QString stdout);
     void enableDisableActions();
 
 private slots:
     void about();
     void settings();

 
     void fsDirectoryChanged(QString);
     void fsFileChanged(QString);
 
 private:
-    void hgBranch();
-    void hgHeads();
-    void hgParents();
+    void hgQueryBranch();
+    void hgQueryHeads();
+    void hgQueryParents();
     void hgLog();
     void createActions();
     void connectActions();
     void createMenus();
     void createToolBars();

 
     QToolBar *fileToolBar;
     QToolBar *repoToolBar;
     QToolBar *workFolderToolBar;
 
-    HGACTIONS   runningAction;
-    HgRunner    *runner;
+    HgRunner *runner;
 
     QFileSystemWatcher *fsWatcher;
 
-    int             tabPage;
-    unsigned char   initialFileTypesBits;
+//    int             tabPage;
+//    unsigned char   initialFileTypesBits;
     bool            justMerged;
 };
 
 #endif