comparison changesetitem.h @ 312:f98c8ece3035

Merge from branch "new-branches-with-status-outside-tabs"
author Chris Cannam
date Tue, 01 Mar 2011 14:22:53 +0000
parents 5b4aa1c24407
children
comparison
equal deleted inserted replaced
310:b8ed12c2035f 312:f98c8ece3035
63 void updateTo(QString); 63 void updateTo(QString);
64 void diffToCurrent(QString); 64 void diffToCurrent(QString);
65 void diffToParent(QString child, QString parent); 65 void diffToParent(QString child, QString parent);
66 void showSummary(Changeset *); 66 void showSummary(Changeset *);
67 void mergeFrom(QString); 67 void mergeFrom(QString);
68 void newBranch(QString);
68 void tag(QString); 69 void tag(QString);
69 70
70 public slots: 71 public slots:
71 void showDetail(); 72 void showDetail();
72 void hideDetail(); 73 void hideDetail();
77 void diffToParentActivated(); 78 void diffToParentActivated();
78 void showSummaryActivated(); 79 void showSummaryActivated();
79 void diffToCurrentActivated(); 80 void diffToCurrentActivated();
80 void mergeActivated(); 81 void mergeActivated();
81 void tagActivated(); 82 void tagActivated();
83 void newBranchActivated();
82 84
83 protected: 85 protected:
84 virtual void mousePressEvent(QGraphicsSceneMouseEvent *); 86 virtual void mousePressEvent(QGraphicsSceneMouseEvent *);
85 87
86 private: 88 private: