Mercurial > hg > easyhg
diff 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 |
line wrap: on
line diff
--- a/changesetitem.h Thu Dec 02 11:51:15 2010 +0000 +++ b/changesetitem.h Thu Dec 02 17:55:21 2010 +0000 @@ -24,6 +24,8 @@ class Changeset; class ChangesetDetailItem; +class QAction; + class ChangesetItem : public QObject, public QGraphicsItem { Q_OBJECT @@ -52,7 +54,7 @@ bool isNew() const { return m_new; } void setNew(bool n) { m_new = n; } - bool shouldShowBranch() const { return m_showBranch; } + bool showBranch() const { return m_showBranch; } void setShowBranch(bool s) { m_showBranch = s; } signals: @@ -70,8 +72,9 @@ void hideDetail(); private slots: + void copyIdActivated(); void updateActivated(); - void diffToPreviousActivated(); + void diffToParentActivated(); void diffToCurrentActivated(); void mergeActivated(); void tagActivated(); @@ -91,6 +94,8 @@ bool m_wide; bool m_current; bool m_new; + + QMap<QAction *, QString> m_parentDiffActions; }; #endif // CHANGESETITEM_H