Mercurial > hg > easyhg
view src/changesetscene.cpp @ 530:2262f753b19e
Add more useful message for merge with working directory ancestor
author | Chris Cannam |
---|---|
date | Wed, 23 Nov 2011 11:24:23 +0000 |
parents | 306a62fe851e |
children | 533519ebc0cb |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* EasyMercurial Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen Copyright (c) 2011 Chris Cannam Copyright (c) 2011 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include "changesetscene.h" #include "changesetitem.h" #include "uncommitteditem.h" #include "debug.h" #include <QPainter> ChangesetScene::ChangesetScene() // Supply a non-NULL but trivial scene rect to inhibit automatic // updates from QGraphicsScene, because we will set the rect // explicitly in itemAddCompleted : QGraphicsScene(QRectF(0, 0, 1, 1)), m_detailShown(0) { } void ChangesetScene::addChangesetItem(ChangesetItem *item) { addItem(item); connect(item, SIGNAL(detailShown()), this, SLOT(changesetDetailShown())); connect(item, SIGNAL(detailHidden()), this, SLOT(changesetDetailHidden())); connect(item, SIGNAL(updateTo(QString)), this, SIGNAL(updateTo(QString))); connect(item, SIGNAL(diffToCurrent(QString)), this, SIGNAL(diffToCurrent(QString))); connect(item, SIGNAL(diffToParent(QString, QString)), this, SIGNAL(diffToParent(QString, QString))); connect(item, SIGNAL(showSummary(Changeset *)), this, SIGNAL(showSummary(Changeset *))); connect(item, SIGNAL(mergeFrom(QString)), this, SIGNAL(mergeFrom(QString))); connect(item, SIGNAL(newBranch(QString)), this, SIGNAL(newBranch(QString))); connect(item, SIGNAL(closeBranch(QString)), this, SIGNAL(closeBranch(QString))); connect(item, SIGNAL(tag(QString)), this, SIGNAL(tag(QString))); } void ChangesetScene::addUncommittedItem(UncommittedItem *item) { addItem(item); connect(item, SIGNAL(commit()), this, SIGNAL(commit())); connect(item, SIGNAL(revert()), this, SIGNAL(revert())); connect(item, SIGNAL(diff()), this, SIGNAL(diffWorkingFolder())); connect(item, SIGNAL(showSummary()), this, SIGNAL(showSummary())); connect(item, SIGNAL(showWork()), this, SIGNAL(showWork())); connect(item, SIGNAL(newBranch()), this, SIGNAL(newBranch())); connect(item, SIGNAL(noBranch()), this, SIGNAL(noBranch())); } void ChangesetScene::addDateRange(QString label, int minrow, int nrows, bool even) { DateRange dr; dr.label = label; dr.minrow = minrow; dr.nrows = nrows; dr.even = even; m_dateRanges[minrow] = dr; } void ChangesetScene::itemAddCompleted() { connect(this, SIGNAL(changed(const QList<QRectF> &)), this, SLOT(recalculateSceneRect())); recalculateSceneRect(); } void ChangesetScene::recalculateSceneRect() { QRectF existingSr = sceneRect(); QRectF r = itemsBoundingRect(); float minwidth = 300; //!!! DEBUG << "ChangesetScene::recalculateSceneRect: minwidth = " << minwidth << ", r = " << r << endl; if (r.width() < minwidth) { float edgediff = (minwidth - r.width()) / 2; r.setLeft(r.left() - edgediff); r.setRight(r.right() + edgediff); } DEBUG << "ChangesetScene::recalculateSceneRect: r now is " << r << endl; setSceneRect(r.united(existingSr)); } void ChangesetScene::changesetDetailShown() { ChangesetItem *csi = qobject_cast<ChangesetItem *>(sender()); if (!csi) return; if (m_detailShown && m_detailShown != csi) { m_detailShown->hideDetail(); } m_detailShown = csi; } void ChangesetScene::changesetDetailHidden() { m_detailShown = 0; itemAddCompleted(); } void ChangesetScene::drawBackground(QPainter *paint, const QRectF &rect) { QGraphicsScene::drawBackground(paint, rect); } ChangesetItem * ChangesetScene::getItemById(QString id) { foreach (QGraphicsItem *it, items()) { ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it); if (csit && csit->getId() == id) return csit; } return 0; }