Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2317 → Rev 2318

/branches/Version13x/Scribus/scribus/about.cpp
51,7 → 51,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("31").arg("May").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("1").arg("June").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/story.cpp
213,11 → 213,18
/*CB TODO
if ((k->key() + KeyMod) == ScApp->Prefs.KeyActions[60].KeyID)
{
insChars(QString(QChar(30)));
insChars(QString(QChar(30))); PageNumbers
insert("#");
emit SideBarUp(true);
return;
}
if ((k->key() + KeyMod) == ScApp->Prefs.KeyActions[67].KeyID)
{
insChars(QString(QChar(29))); Non breakable Space
insert("_");
emit SideBarUp(true);
return;
}
*/
switch (k->state())
{
919,6 → 926,17
chars->append(hg);
continue;
}
else if (hg->ch == QChar(29))
{
setFarbe(Ccol, Csha);
setAlign(Ali);
setStyle(Csty);
insert(Text);
insert("_");
Text = "";
chars->append(hg);
continue;
}
else
Text += hg->ch;
}
/branches/Version13x/Scribus/scribus/scribusview.cpp
1196,7 → 1196,10
contentsMousePressEvent(m);
return;
}
emit Amode(EditMode);
if ((currItem->itemType() == PageItem::ImageFrame) && (currItem->Pfile==""))
emit LoadPic();
else
emit Amode(EditMode);
}
else
if (currItem->itemType() == PageItem::TextFrame)