Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 18883 → Rev 18884

/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
145,12 → 145,12
{
ScItemState<QPair<FPointArray,FPointArray> > *is = new ScItemState<QPair<FPointArray,FPointArray> >(Um::ConnectPath);
is->set("CONNECT_PATH","connect_path");
is->set("OLDX",originalXPos);
is->set("OLDY",originalYPos);
is->set("NEWX",m_item1->xPos());
is->set("NEWY",m_item1->yPos());
is->set("OLDX", originalXPos);
is->set("OLDY", originalYPos);
is->set("NEWX", m_item1->xPos());
is->set("NEWY", m_item1->yPos());
is->setItem(qMakePair(originalPath1, m_item1->PoLine));
UndoManager::instance()->action(m_item1,is);
UndoManager::instance()->action(m_item1, is);
}
m_item1->updateClip();
m_item1->ContourLine = m_item1->PoLine.copy();
157,7 → 157,7
m_doc->m_Selection->removeItem(m_item1);
m_doc->itemSelection_DeleteItem();
m_doc->changed();
if(trans)
if (trans)
{
trans->commit();
delete trans;
184,6 → 184,8
 
void PathConnectPlugin::updateEffect(int effectType, int pointOne, int pointTwo, int mode)
{
// #12119: unnecessary to save actions generated by preview
UndoManager::instance()->setUndoEnabled(false);
if (effectType == -1)
{
m_item1->PoLine = originalPath1.copy();
213,6 → 215,7
}
if (effectType != -1)
firstUpdate = false;
UndoManager::instance()->setUndoEnabled(true);
}
 
FPointArray PathConnectPlugin::computePath(int pointOne, int pointTwo, int mode, FPointArray &p1, FPointArray &p2)