Mercurial > hg > easyhg
comparison uncommitteditem.h @ 311:4811eb34e819 new-branches-with-status-outside-tabs
Add Start New Branch and Cancel New Branch to uncommitted item menu; add branch name to Commit dialog
author | Chris Cannam |
---|---|
date | Tue, 01 Mar 2011 14:22:29 +0000 |
parents | 8fd71f570884 |
children |
comparison
equal
deleted
inserted
replaced
308:7f50c040e13d | 311:4811eb34e819 |
---|---|
34 QString branch() const { return m_branch; } | 34 QString branch() const { return m_branch; } |
35 void setBranch(QString b) { m_branch = b; } | 35 void setBranch(QString b) { m_branch = b; } |
36 | 36 |
37 bool showBranch() const { return m_showBranch; } | 37 bool showBranch() const { return m_showBranch; } |
38 void setShowBranch(bool s) { m_showBranch = s; } | 38 void setShowBranch(bool s) { m_showBranch = s; } |
39 | |
40 bool isNewBranch() const { return m_isNewBranch; } | |
41 void setIsNewBranch(bool s) { m_isNewBranch = s; } | |
39 | 42 |
40 int column() const { return m_column; } | 43 int column() const { return m_column; } |
41 int row() const { return m_row; } | 44 int row() const { return m_row; } |
42 void setColumn(int c) { m_column = c; setX(c * 100); } | 45 void setColumn(int c) { m_column = c; setX(c * 100); } |
43 void setRow(int r) { m_row = r; setY(r * 90); } | 46 void setRow(int r) { m_row = r; setY(r * 90); } |
49 void commit(); | 52 void commit(); |
50 void revert(); | 53 void revert(); |
51 void diff(); | 54 void diff(); |
52 void showSummary(); | 55 void showSummary(); |
53 void showWork(); | 56 void showWork(); |
57 void newBranch(); | |
58 void noBranch(); | |
54 | 59 |
55 protected: | 60 protected: |
56 virtual void mousePressEvent(QGraphicsSceneMouseEvent *); | 61 virtual void mousePressEvent(QGraphicsSceneMouseEvent *); |
57 virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); | 62 virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); |
58 | 63 |
59 private: | 64 private: |
60 void activateMenu(); | 65 void activateMenu(); |
61 | 66 |
62 QString m_branch; | 67 QString m_branch; |
63 bool m_showBranch; | 68 bool m_showBranch; |
69 bool m_isNewBranch; | |
64 QFont m_font; | 70 QFont m_font; |
65 int m_column; | 71 int m_column; |
66 int m_row; | 72 int m_row; |
67 bool m_wide; | 73 bool m_wide; |
68 }; | 74 }; |