Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 23552 → Rev 23553

/trunk/Scribus/scribus/pageitem_textframe.cpp
3954,10 → 3954,10
}
undoManager->action(undoTarget, ip);
}
else if (ss && ss->get("ETEA") == "insert_frametext")
else if (ss && (ss->get("ETEA") == "insert_frametext") && (ss->undoObject() == undoTarget))
ss->set("TEXT_STR", ss->get("TEXT_STR") + QString(QChar(conv)));
else {
ss = new SimpleState(Um::InsertText,"",Um::ICreate);
ss = new SimpleState(Um::InsertText, "", Um::ICreate);
ss->set("INSERT_FRAMETEXT");
ss->set("ETEA", QString("insert_frametext"));
ss->set("TEXT_STR", QString(QChar(conv)));
4400,11 → 4400,12
if (UndoManager::undoEnabled())
{
SimpleState *ss = dynamic_cast<SimpleState*>(undoManager->getLastUndo());
if (ss && ss->get("ETEA") == "insert_frametext")
ss->set("TEXT_STR",ss->get("TEXT_STR") + QString(SpecialChars::TAB));
UndoObject *undoTarget = this;
if (ss && (ss->get("ETEA") == "insert_frametext") && (ss->undoObject() == undoTarget))
ss->set("TEXT_STR", ss->get("TEXT_STR") + QString(SpecialChars::TAB));
else
{
ss = new SimpleState(Um::InsertText,"",Um::ICreate);
ss = new SimpleState(Um::InsertText, "", Um::ICreate);
ss->set("INSERT_FRAMETEXT");
ss->set("ETEA", QString("insert_frametext"));
ss->set("TEXT_STR", QString(SpecialChars::TAB));
4445,7 → 4446,7
}
undoManager->action(undoTarget, ip);
}
else if (ss && ss->get("ETEA") == "insert_frametext")
else if (ss && (ss->get("ETEA") == "insert_frametext") && (ss->undoObject() == undoTarget))
ss->set("TEXT_STR", ss->get("TEXT_STR") + uc);
else
{
/trunk/Scribus/scribus/scribus.cpp
1536,8 → 1536,9
if (UndoManager::undoEnabled())
{
SimpleState *ss = dynamic_cast<SimpleState*>(m_undoManager->getLastUndo());
if (ss && ss->get("ETEA") == "insert_frametext")
ss->set("TEXT_STR",ss->get("TEXT_STR") + QString(QChar(unicodevalue)));
UndoObject *undoTarget = currItem;
if (ss && (ss->get("ETEA") == "insert_frametext") && (ss->undoObject() == undoTarget))
ss->set("TEXT_STR", ss->get("TEXT_STR") + QString(QChar(unicodevalue)));
else
{
ss = new SimpleState(Um::InsertText,"",Um::ICreate);
1545,7 → 1546,6
ss->set("ETEA", QString("insert_frametext"));
ss->set("TEXT_STR", QString(QChar(unicodevalue)));
ss->set("START", currItem->itemText.cursorPosition());
UndoObject * undoTarget = currItem;
if (currItem->isNoteFrame())
{
undoTarget = doc;
1572,8 → 1572,9
if (UndoManager::undoEnabled())
{
SimpleState *ss = dynamic_cast<SimpleState*>(m_undoManager->getLastUndo());
if (ss && ss->get("ETEA") == "insert_frametext")
ss->set("TEXT_STR",ss->get("TEXT_STR") + QString(SpecialChars::SHYPHEN));
UndoObject *undoTarget = currItem;
if (ss && (ss->get("ETEA") == "insert_frametext") && (ss->undoObject() == undoTarget))
ss->set("TEXT_STR", ss->get("TEXT_STR") + QString(SpecialChars::SHYPHEN));
else
{
ss = new SimpleState(Um::InsertText,"", Um::ICreate);
1581,7 → 1582,6
ss->set("ETEA", QString("insert_frametext"));
ss->set("TEXT_STR", QString(SpecialChars::SHYPHEN));
ss->set("START", currItem->itemText.cursorPosition());
UndoObject * undoTarget = currItem;
if (currItem->isNoteFrame())
{
undoTarget = doc;