Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2306 → Rev 2307

/branches/Version13x/Scribus/scribus/pageitem.cpp
693,9 → 693,9
if (hl->cstyle & 2048)
{
if (Doc->docParagraphStyles[hl->cab].BaseAdj)
chs = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (Doc->docParagraphStyles[hl->cab].FontSize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
else
chs = qRound(10 * ((Doc->docParagraphStyles[hl->cab].LineSpa * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->docParagraphStyles[hl->cab].LineSpa * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (Doc->docParagraphStyles[hl->cab].FontSize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
}
oldCurY = SetZeichAttr(hl, &chs, &chx);
if ((chx == QChar(9)) && (tTabValues.count() != 0) && (tabCc < tTabValues.count()) && (!tTabValues[tabCc].tabFillChar.isNull()))
1065,16 → 1065,15
{
if (Doc->docParagraphStyles[hl->cab].BaseAdj)
{
chsd = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / RealCAscent(Doc, hl->cfont, chx, 10)));
chsd = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (DropLines-1)+(hl->cfont->numAscent * (Doc->docParagraphStyles[hl->cab].FontSize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (DropLines-1)+(hl->cfont->numAscent * (Doc->docParagraphStyles[hl->cab].FontSize / 10.0))) / RealCAscent(Doc, hl->cfont, chx, 10)));
}
else
{
chsd = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / RealCAscent(Doc, hl->cfont, chx, 10)));
chsd = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * (DropLines-1)+(hl->cfont->numAscent * (Doc->docParagraphStyles[hl->cab].FontSize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * (DropLines-1)+(hl->cfont->numAscent * (Doc->docParagraphStyles[hl->cab].FontSize / 10.0))) / RealCAscent(Doc, hl->cfont, chx, 10)));
}
hl->cstyle |= 2048;
// hl->csize = chsd;
}
else
chs = hl->csize;
/branches/Version13x/Scribus/scribus/scribus.cpp
5344,7 → 5344,7
void ScribusApp::slotEditCut()
{
uint a;
//#2031 NoFrameEdit();
NoFrameEdit();
QString BufferI = "";
if ((HaveDoc) && (view->SelItem.count() != 0))
{
5439,7 → 5439,7
void ScribusApp::slotEditCopy()
{
uint a;
//#2031 NoFrameEdit();
NoFrameEdit();
QString BufferI = "";
if ((HaveDoc) && (view->SelItem.count() != 0))
{
5520,7 → 5520,7
void ScribusApp::slotEditPaste()
{
struct ScText *hg;
//#2031 NoFrameEdit();
NoFrameEdit();
if (HaveDoc)
{
if (Buffer2.isNull())
6279,6 → 6279,7
 
void ScribusApp::NoFrameEdit()
{
actionManager->disconnectModeActions();
nodePalette->hide();
scrActions["toolsSelect"]->setEnabled(true);
scrActions["toolsSelect"]->setOn(true);
6312,6 → 6313,7
else
HaveNewSel(-1);
}
actionManager->connectModeActions();
}
 
void ScribusApp::slotSelect()