Mercurial > hg > easyhg
comparison mainwindow.h @ 112:4bd17f36d059
* Make diff binary a settings property; some tidying
author | Chris Cannam |
---|---|
date | Fri, 26 Nov 2010 17:02:55 +0000 |
parents | 1721c580c10e |
children | c92f5859c707 |
comparison
equal
deleted
inserted
replaced
111:151209bc5bd6 | 112:4bd17f36d059 |
---|---|
54 void closeEvent(QCloseEvent *event); | 54 void closeEvent(QCloseEvent *event); |
55 | 55 |
56 public slots: | 56 public slots: |
57 void hgQueryPaths(); | 57 void hgQueryPaths(); |
58 void hgStat(); | 58 void hgStat(); |
59 // void tabChanged(int currTab); | |
60 void commandCompleted(HgAction action, QString stdout); | 59 void commandCompleted(HgAction action, QString stdout); |
61 void commandFailed(HgAction action, QString stdout); | 60 void commandFailed(HgAction action, QString stdout); |
62 void enableDisableActions(); | 61 void enableDisableActions(); |
63 | 62 |
64 private slots: | 63 private slots: |
184 QToolBar *repoToolBar; | 183 QToolBar *repoToolBar; |
185 QToolBar *workFolderToolBar; | 184 QToolBar *workFolderToolBar; |
186 | 185 |
187 HgRunner *runner; | 186 HgRunner *runner; |
188 | 187 |
188 void findDiffBinaryName(); | |
189 QString diffBinaryName; | |
190 | |
189 QFileSystemWatcher *fsWatcher; | 191 QFileSystemWatcher *fsWatcher; |
190 | 192 |
191 // int tabPage; | 193 bool justMerged; |
192 // unsigned char initialFileTypesBits; | |
193 bool justMerged; | |
194 }; | 194 }; |
195 | 195 |
196 #endif | 196 #endif |