Mercurial > hg > easyhg
comparison historywidget.cpp @ 312:f98c8ece3035
Merge from branch "new-branches-with-status-outside-tabs"
author | Chris Cannam |
---|---|
date | Tue, 01 Mar 2011 14:22:53 +0000 |
parents | 4811eb34e819 |
children |
comparison
equal
deleted
inserted
replaced
310:b8ed12c2035f | 312:f98c8ece3035 |
---|---|
266 connect(scene, SIGNAL(showSummary()), | 266 connect(scene, SIGNAL(showSummary()), |
267 this, SIGNAL(showSummary())); | 267 this, SIGNAL(showSummary())); |
268 | 268 |
269 connect(scene, SIGNAL(showWork()), | 269 connect(scene, SIGNAL(showWork()), |
270 this, SIGNAL(showWork())); | 270 this, SIGNAL(showWork())); |
271 | |
272 connect(scene, SIGNAL(newBranch()), | |
273 this, SIGNAL(newBranch())); | |
274 | |
275 connect(scene, SIGNAL(noBranch()), | |
276 this, SIGNAL(noBranch())); | |
271 | 277 |
272 connect(scene, SIGNAL(updateTo(QString)), | 278 connect(scene, SIGNAL(updateTo(QString)), |
273 this, SIGNAL(updateTo(QString))); | 279 this, SIGNAL(updateTo(QString))); |
274 | 280 |
275 connect(scene, SIGNAL(diffToCurrent(QString)), | 281 connect(scene, SIGNAL(diffToCurrent(QString)), |
282 this, SIGNAL(showSummary(Changeset *))); | 288 this, SIGNAL(showSummary(Changeset *))); |
283 | 289 |
284 connect(scene, SIGNAL(mergeFrom(QString)), | 290 connect(scene, SIGNAL(mergeFrom(QString)), |
285 this, SIGNAL(mergeFrom(QString))); | 291 this, SIGNAL(mergeFrom(QString))); |
286 | 292 |
293 connect(scene, SIGNAL(newBranch(QString)), | |
294 this, SIGNAL(newBranch(QString))); | |
295 | |
287 connect(scene, SIGNAL(tag(QString)), | 296 connect(scene, SIGNAL(tag(QString)), |
288 this, SIGNAL(tag(QString))); | 297 this, SIGNAL(tag(QString))); |
289 } | 298 } |