Mercurial > hg > easyhg

diff src/uncommitteditem.h @ 399:b1f0fa991c49 item_appearance_adjustments

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use circle presentation for uncommitted merge as well as merge changeset
author Chris Cannam
date Wed, 25 May 2011 14:58:49 +0100
parents b9c153e00e84
children 533519ebc0cb
line wrap: on
line diff
--- a/src/uncommitteditem.h	Wed May 25 14:48:42 2011 +0100
+++ b/src/uncommitteditem.h	Wed May 25 14:58:49 2011 +0100
@@ -39,6 +39,9 @@
 
     bool isNewBranch() const { return m_isNewBranch; }
     void setIsNewBranch(bool s) { m_isNewBranch = s; }
+
+    bool isMerge() const { return m_isMerge; }
+    void setIsMerge(bool m) { m_isMerge = m; }
     
     int column() const { return m_column; }
     int row() const { return m_row; }
@@ -67,10 +70,14 @@
     QString m_branch;
     bool m_showBranch;
     bool m_isNewBranch;
+    bool m_isMerge;
     QFont m_font;
     int m_column;
     int m_row;
     bool m_wide;
+
+    void paintNormal(QPainter *);
+    void paintMerge(QPainter *);
 };
 
 #endif // UNCOMMITTEDITEM_H