comparison changesetitem.h @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus

 #include <QGraphicsItem>
 #include <QFont>
 
 class Changeset;
 class ChangesetDetailItem;
+
+class QAction;
 
 class ChangesetItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)

     void setCurrent(bool c) { m_current = c; }
 
     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:
     void detailShown();
     void detailHidden();

 public slots:
     void showDetail();
     void hideDetail();
 
 private slots:
+    void copyIdActivated();
     void updateActivated();
-    void diffToPreviousActivated();
+    void diffToParentActivated();
     void diffToCurrentActivated();
     void mergeActivated();
     void tagActivated();
 
 protected:

     int m_column;
     int m_row;
     bool m_wide;
     bool m_current;
     bool m_new;
+
+    QMap<QAction *, QString> m_parentDiffActions;
 };
 
 #endif // CHANGESETITEM_H