Mercurial > hg > easyhg
comparison changesetitem.h @ 153:70fe12873106
* Show both parents of uncommitted merge; fixes to right-button menus
author | Chris Cannam |
---|---|
date | Thu, 02 Dec 2010 17:55:21 +0000 |
parents | 2fef6b0dfbe8 |
children | 4bad3c5c053a |
comparison
equal
deleted
inserted
replaced
152:2b997861174b | 153:70fe12873106 |
---|---|
21 #include <QGraphicsItem> | 21 #include <QGraphicsItem> |
22 #include <QFont> | 22 #include <QFont> |
23 | 23 |
24 class Changeset; | 24 class Changeset; |
25 class ChangesetDetailItem; | 25 class ChangesetDetailItem; |
26 | |
27 class QAction; | |
26 | 28 |
27 class ChangesetItem : public QObject, public QGraphicsItem | 29 class ChangesetItem : public QObject, public QGraphicsItem |
28 { | 30 { |
29 Q_OBJECT | 31 Q_OBJECT |
30 Q_INTERFACES(QGraphicsItem) | 32 Q_INTERFACES(QGraphicsItem) |
50 void setCurrent(bool c) { m_current = c; } | 52 void setCurrent(bool c) { m_current = c; } |
51 | 53 |
52 bool isNew() const { return m_new; } | 54 bool isNew() const { return m_new; } |
53 void setNew(bool n) { m_new = n; } | 55 void setNew(bool n) { m_new = n; } |
54 | 56 |
55 bool shouldShowBranch() const { return m_showBranch; } | 57 bool showBranch() const { return m_showBranch; } |
56 void setShowBranch(bool s) { m_showBranch = s; } | 58 void setShowBranch(bool s) { m_showBranch = s; } |
57 | 59 |
58 signals: | 60 signals: |
59 void detailShown(); | 61 void detailShown(); |
60 void detailHidden(); | 62 void detailHidden(); |
68 public slots: | 70 public slots: |
69 void showDetail(); | 71 void showDetail(); |
70 void hideDetail(); | 72 void hideDetail(); |
71 | 73 |
72 private slots: | 74 private slots: |
75 void copyIdActivated(); | |
73 void updateActivated(); | 76 void updateActivated(); |
74 void diffToPreviousActivated(); | 77 void diffToParentActivated(); |
75 void diffToCurrentActivated(); | 78 void diffToCurrentActivated(); |
76 void mergeActivated(); | 79 void mergeActivated(); |
77 void tagActivated(); | 80 void tagActivated(); |
78 | 81 |
79 protected: | 82 protected: |
89 int m_column; | 92 int m_column; |
90 int m_row; | 93 int m_row; |
91 bool m_wide; | 94 bool m_wide; |
92 bool m_current; | 95 bool m_current; |
93 bool m_new; | 96 bool m_new; |
97 | |
98 QMap<QAction *, QString> m_parentDiffActions; | |
94 }; | 99 }; |
95 | 100 |
96 #endif // CHANGESETITEM_H | 101 #endif // CHANGESETITEM_H |