Mercurial > hg > easyhg
diff uncommitteditem.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 | e6c6b88d19b9 |
children | 4bad3c5c053a |
line wrap: on
line diff
--- a/uncommitteditem.h Thu Dec 02 11:51:15 2010 +0000 +++ b/uncommitteditem.h Thu Dec 02 17:55:21 2010 +0000 @@ -34,6 +34,9 @@ QString branch() const { return m_branch; } void setBranch(QString b) { m_branch = b; } + + bool showBranch() const { return m_showBranch; } + void setShowBranch(bool s) { m_showBranch = s; } int column() const { return m_column; } int row() const { return m_row; } @@ -47,14 +50,17 @@ void commit(); void revert(); void diff(); + void showWork(); protected: virtual void mousePressEvent(QGraphicsSceneMouseEvent *); + virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); private: void activateMenu(); QString m_branch; + bool m_showBranch; QFont m_font; int m_column; int m_row;