Mercurial > hg > easyhg
comparison 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 |
comparison
equal
deleted
inserted
replaced
152:2b997861174b | 153:70fe12873106 |
---|---|
32 virtual QRectF boundingRect() const; | 32 virtual QRectF boundingRect() const; |
33 virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); | 33 virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); |
34 | 34 |
35 QString branch() const { return m_branch; } | 35 QString branch() const { return m_branch; } |
36 void setBranch(QString b) { m_branch = b; } | 36 void setBranch(QString b) { m_branch = b; } |
37 | |
38 bool showBranch() const { return m_showBranch; } | |
39 void setShowBranch(bool s) { m_showBranch = s; } | |
37 | 40 |
38 int column() const { return m_column; } | 41 int column() const { return m_column; } |
39 int row() const { return m_row; } | 42 int row() const { return m_row; } |
40 void setColumn(int c) { m_column = c; setX(c * 100); } | 43 void setColumn(int c) { m_column = c; setX(c * 100); } |
41 void setRow(int r) { m_row = r; setY(r * 90); } | 44 void setRow(int r) { m_row = r; setY(r * 90); } |
45 | 48 |
46 signals: | 49 signals: |
47 void commit(); | 50 void commit(); |
48 void revert(); | 51 void revert(); |
49 void diff(); | 52 void diff(); |
53 void showWork(); | |
50 | 54 |
51 protected: | 55 protected: |
52 virtual void mousePressEvent(QGraphicsSceneMouseEvent *); | 56 virtual void mousePressEvent(QGraphicsSceneMouseEvent *); |
57 virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); | |
53 | 58 |
54 private: | 59 private: |
55 void activateMenu(); | 60 void activateMenu(); |
56 | 61 |
57 QString m_branch; | 62 QString m_branch; |
63 bool m_showBranch; | |
58 QFont m_font; | 64 QFont m_font; |
59 int m_column; | 65 int m_column; |
60 int m_row; | 66 int m_row; |
61 bool m_wide; | 67 bool m_wide; |
62 }; | 68 }; |