comparison changesetitem.cpp @ 278:f7cdd5b31aed new-branches

Add "Start new branch" function. I'm not quite satisfied with the location of this one
author Chris Cannam
date Wed, 09 Feb 2011 12:03:15 +0000
parents be483734bde5
children 5b4aa1c24407
comparison
equal deleted inserted replaced
277:b6e4643d6c05 278:f7cdd5b31aed
151 QAction *merge = menu->addAction(tr("Merge from here to current")); 151 QAction *merge = menu->addAction(tr("Merge from here to current"));
152 connect(merge, SIGNAL(triggered()), this, SLOT(mergeActivated())); 152 connect(merge, SIGNAL(triggered()), this, SLOT(mergeActivated()));
153 153
154 menu->addSeparator(); 154 menu->addSeparator();
155 155
156 QAction *branch = menu->addAction(tr("Start new branch..."));
157 branch->setEnabled(m_current);
158 connect(branch, SIGNAL(triggered()), this, SLOT(newBranchActivated()));
159
156 QAction *tag = menu->addAction(tr("Add tag...")); 160 QAction *tag = menu->addAction(tr("Add tag..."));
157 connect(tag, SIGNAL(triggered()), this, SLOT(tagActivated())); 161 connect(tag, SIGNAL(triggered()), this, SLOT(tagActivated()));
158 162
159 menu->exec(QCursor::pos()); 163 menu->exec(QCursor::pos());
160 164
188 192
189 void ChangesetItem::updateActivated() { emit updateTo(getId()); } 193 void ChangesetItem::updateActivated() { emit updateTo(getId()); }
190 void ChangesetItem::diffToCurrentActivated() { emit diffToCurrent(getId()); } 194 void ChangesetItem::diffToCurrentActivated() { emit diffToCurrent(getId()); }
191 void ChangesetItem::mergeActivated() { emit mergeFrom(getId()); } 195 void ChangesetItem::mergeActivated() { emit mergeFrom(getId()); }
192 void ChangesetItem::tagActivated() { emit tag(getId()); } 196 void ChangesetItem::tagActivated() { emit tag(getId()); }
197 void ChangesetItem::newBranchActivated() { emit newBranch(getId()); }
193 198
194 void 199 void
195 ChangesetItem::paint(QPainter *paint, const QStyleOptionGraphicsItem *option, 200 ChangesetItem::paint(QPainter *paint, const QStyleOptionGraphicsItem *option,
196 QWidget *w) 201 QWidget *w)
197 { 202 {