comparison mainwindow.h @ 125:63c2f3f61c79

* Add Incoming dialog and better layouts for dialogs generally
author Chris Cannam
date Mon, 29 Nov 2010 17:03:17 +0000
parents c92f5859c707
children aaeab914f2a3
comparison
equal deleted inserted replaced
124:1f27f71a7034 125:63c2f3f61c79
133 bool askToOpenInsteadOfInit(QString); 133 bool askToOpenInsteadOfInit(QString);
134 134
135 void showIncoming(QString); 135 void showIncoming(QString);
136 void showPullResult(QString); 136 void showPullResult(QString);
137 void showPushResult(QString); 137 void showPushResult(QString);
138 int extractChangeCount(QString);
139 QString format3(QString, QString, QString);
138 140
139 void clearState(); 141 void clearState();
140 142
141 void updateFileSystemWatcher(); 143 void updateFileSystemWatcher();
142 144