comparison uncommitteditem.h @ 153:70fe12873106

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

     virtual QRectF boundingRect() const;
     virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
 
     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; }
     void setColumn(int c) { m_column = c; setX(c * 100); }
     void setRow(int r) { m_row = r; setY(r * 90); }

 
 signals:
     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;
     bool m_wide;
 };