comparison mainwindow.h @ 120:c92f5859c707

* Add incremental log (though not incremental relayout)
author Chris Cannam
date Mon, 29 Nov 2010 11:01:19 +0000
parents 4bd17f36d059
children 63c2f3f61c79
comparison
equal deleted inserted replaced
119:005a54380502 120:c92f5859c707
47 QString remoteRepoPath; 47 QString remoteRepoPath;
48 QString workFolderPath; 48 QString workFolderPath;
49 QString currentBranch; 49 QString currentBranch;
50 Changesets currentHeads; 50 Changesets currentHeads;
51 Changesets currentParents; 51 Changesets currentParents;
52 bool needNewLog;
52 53
53 protected: 54 protected:
54 void closeEvent(QCloseEvent *event); 55 void closeEvent(QCloseEvent *event);
55 56
56 public slots: 57 public slots:
57 void hgQueryPaths(); 58 void hgRefresh();
58 void hgStat();
59 void commandCompleted(HgAction action, QString stdout); 59 void commandCompleted(HgAction action, QString stdout);
60 void commandFailed(HgAction action, QString stdout); 60 void commandFailed(HgAction action, QString stdout);
61 void enableDisableActions(); 61 void enableDisableActions();
62 62
63 private slots: 63 private slots:
65 void settings(); 65 void settings();
66 void open(); 66 void open();
67 void startupDialog(); 67 void startupDialog();
68 void clearSelections(); 68 void clearSelections();
69 69
70 void hgQueryPaths();
71 void hgStat();
70 void hgRemove(); 72 void hgRemove();
71 void hgAdd(); 73 void hgAdd();
72 void hgCommit(); 74 void hgCommit();
73 void hgFileDiff(); 75 void hgFileDiff();
74 void hgFolderDiff(); 76 void hgFolderDiff();
96 private: 98 private:
97 void hgQueryBranch(); 99 void hgQueryBranch();
98 void hgQueryHeads(); 100 void hgQueryHeads();
99 void hgQueryParents(); 101 void hgQueryParents();
100 void hgLog(); 102 void hgLog();
103 void hgLogIncremental();
101 void createActions(); 104 void createActions();
102 void connectActions(); 105 void connectActions();
103 void createMenus(); 106 void createMenus();
104 void createToolBars(); 107 void createToolBars();
105 void createStatusBar(); 108 void createStatusBar();
127 bool askToInitExisting(QString); 130 bool askToInitExisting(QString);
128 bool askToInitNew(QString); 131 bool askToInitNew(QString);
129 bool askToOpenParentRepo(QString, QString); 132 bool askToOpenParentRepo(QString, QString);
130 bool askToOpenInsteadOfInit(QString); 133 bool askToOpenInsteadOfInit(QString);
131 134
135 void showIncoming(QString);
136 void showPullResult(QString);
137 void showPushResult(QString);
138
139 void clearState();
140
132 void updateFileSystemWatcher(); 141 void updateFileSystemWatcher();
133 142
134 bool firstStart; 143 bool firstStart;
135 144
136 //Actions enabled flags 145 //Actions enabled flags
146 155
147 //Repo actions 156 //Repo actions
148 QAction *hgIncomingAct; 157 QAction *hgIncomingAct;
149 QAction *hgPushAct; 158 QAction *hgPushAct;
150 QAction *hgPullAct; 159 QAction *hgPullAct;
151 QAction *hgStatAct; 160 QAction *hgRefreshAct;
152 QAction *hgFileDiffAct; 161 QAction *hgFileDiffAct;
153 QAction *hgFolderDiffAct; 162 QAction *hgFolderDiffAct;
154 QAction *hgChgSetDiffAct; 163 QAction *hgChgSetDiffAct;
155 QAction *hgRevertAct; 164 QAction *hgRevertAct;
156 QAction *hgAddAct; 165 QAction *hgAddAct;