Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 12901 → Rev 12902

/trunk/Scribus/scribus/story.cpp
274,6 → 274,16
if (k->modifiers() & Qt::AltModifier)
keyMod |= Qt::ALT;
 
QKeySequence currKeySeq = QKeySequence(k->key() | keyMod);
QKeySequence uniKeySeq = doc->scMW()->scrActions["specialUnicodeSequenceBegin"]->shortcut();
if(currKeySeq.matches(uniKeySeq)==QKeySequence::ExactMatch)
{
unicodeTextEditMode = true;
unicodeInputCount = 0;
unicodeInputString = "";
return;
}
 
QString uc = k->text();
if ((k->modifiers() == Qt::ControlModifier) ||
(k->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) ||
364,12 → 374,6
case Qt::Key_Alt:
wasMod = true;
break;
case Qt::Key_F12:
unicodeTextEditMode = true;
unicodeInputCount = 0;
unicodeInputString = "";
return;
break;
case Qt::Key_Return:
case Qt::Key_Enter:
{