Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2442 → Rev 2443

/branches/Version13x/Scribus/scribus/gtaction.cpp
76,6 → 76,11
 
void gtAction::clearFrame()
{
for (ScText *it = textFrame->itemText.first(); it != 0; it = textFrame->itemText.next())
{
if ((it->ch == QChar(25)) && (it->cembedded != 0))
ScApp->doc->Items.remove(it->cembedded);
}
textFrame->itemText.clear();
textFrame->CPos = 0;
}
91,11 → 96,21
PageItem *nextItem = it->NextBox;
while (nextItem != 0)
{
for (ScText *itx = nextItem->itemText.first(); itx != 0; itx = nextItem->itemText.next())
{
if ((itx->ch == QChar(25)) && (itx->cembedded != 0))
ScApp->doc->Items.remove(itx->cembedded);
}
nextItem->itemText.clear();
nextItem->CPos = 0;
nextItem = nextItem->NextBox;
}
}
for (ScText *itx = it->itemText.first(); itx != 0; itx = it->itemText.next())
{
if ((itx->ch == QChar(25)) && (itx->cembedded != 0))
ScApp->doc->Items.remove(itx->cembedded);
}
it->itemText.clear();
it->CPos = 0;
}
/branches/Version13x/Scribus/scribus/serializer.cpp
68,6 → 68,11
it = nextItem;
while (nextItem != 0)
{
for (ScText *it = nextItem->itemText.first(); it != 0; it = nextItem->itemText.next())
{
if ((it->ch == QChar(25)) && (it->cembedded != 0))
doku->Items.remove(it->cembedded);
}
nextItem->itemText.clear();
nextItem->CPos = 0;
nextItem = nextItem->NextBox;
/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("11").arg("June").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("12").arg("June").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/pageitem.cpp
501,13 → 501,41
{
if (hl->embedded != 0)
{
struct ParagraphStyle vg;
QValueList<ParagraphStyle> savedParagraphStyles;
for (int xxx=0; xxx<5; ++xxx)
{
vg.LineSpaMode = Doc->docParagraphStyles[xxx].LineSpaMode;
vg.BaseAdj = Doc->docParagraphStyles[xxx].BaseAdj;
vg.LineSpa = Doc->docParagraphStyles[xxx].LineSpa;
vg.FontSize = Doc->docParagraphStyles[xxx].FontSize;
vg.Indent = Doc->docParagraphStyles[xxx].Indent;
vg.First = Doc->docParagraphStyles[xxx].First;
vg.gapBefore = Doc->docParagraphStyles[xxx].gapBefore;
vg.gapAfter = Doc->docParagraphStyles[xxx].gapAfter;
savedParagraphStyles.append(vg);
}
p->save();
p->translate(hl->xco, hl->yco - hl->embedded->Height * (hl->scalev / 1000.0));
hl->embedded->Xpos = Xpos + hl->xco;
hl->embedded->Ypos = Ypos + (hl->yco - (hl->embedded->Height * (hl->scalev / 1000.0)));
p->translate(hl->xco * p->zoomFactor(), (hl->yco - (hl->embedded->Height * (hl->scalev / 1000.0))) * p->zoomFactor());
if (hl->base != 0)
p->translate(0, -hl->embedded->Height * (hl->base / 1000.0));
p->translate(0, -hl->embedded->Height * (hl->base / 1000.0) * p->zoomFactor());
p->scale(hl->scale / 1000.0, hl->scalev / 1000.0);
hl->embedded->DrawObj(p, e);
p->restore();
for (int xxx=0; xxx<5; ++xxx)
{
Doc->docParagraphStyles[xxx].LineSpaMode = savedParagraphStyles[xxx].LineSpaMode;
Doc->docParagraphStyles[xxx].BaseAdj = savedParagraphStyles[xxx].BaseAdj;
Doc->docParagraphStyles[xxx].LineSpa = savedParagraphStyles[xxx].LineSpa;
Doc->docParagraphStyles[xxx].FontSize = savedParagraphStyles[xxx].FontSize;
Doc->docParagraphStyles[xxx].Indent = savedParagraphStyles[xxx].Indent;
Doc->docParagraphStyles[xxx].First = savedParagraphStyles[xxx].First;
Doc->docParagraphStyles[xxx].gapBefore = savedParagraphStyles[xxx].gapBefore;
Doc->docParagraphStyles[xxx].gapAfter = savedParagraphStyles[xxx].gapAfter;
}
savedParagraphStyles.clear();
}
}
 
902,7 → 930,7
int LayerLevItem = Layer2Level(Doc, docItem->LayerNr);
if (((docItem->ItemNr > ItemNr) && (docItem->LayerNr == LayerNr)) || (LayerLevItem > LayerLev))
{
if (docItem->textFlowsAroundFrame())
if ((docItem->textFlowsAroundFrame()) && (!docItem->isEmbedded))
{
pp.begin(ScApp->view->viewport());
pp.translate(docItem->Xpos - Mp->Xoffset + Dp->Xoffset, docItem->Ypos - Mp->Yoffset + Dp->Yoffset);
936,7 → 964,7
for (a = 0; a < Doc->Items.count(); ++a)
{
PageItem* docItem = Doc->Items.at(a);
if (docItem->textFlowsAroundFrame())
if ((docItem->textFlowsAroundFrame()) && (!docItem->isEmbedded))
{
pp.begin(ScApp->view->viewport());
pp.translate(docItem->Xpos, docItem->Ypos);
973,7 → 1001,7
int LayerLevItem = Layer2Level(Doc, docItem->LayerNr);
if (((docItem->ItemNr > ItemNr) && (docItem->LayerNr == LayerNr)) || (LayerLevItem > LayerLev))
{
if (docItem->textFlowsAroundFrame())
if ((docItem->textFlowsAroundFrame()) && (!docItem->isEmbedded))
{
pp.begin(ScApp->view->viewport());
pp.translate(docItem->Xpos, docItem->Ypos);
1417,19 → 1445,19
}
if (!RTab)
{
hl->xp = QMIN(QMAX(CurX+kernVal, ColBound.x()), ColBound.y());
hl->xp = QMAX(CurX+kernVal, ColBound.x());
CurX += wide+kernVal;
CurX = QMIN(QMAX(CurX, ColBound.x()), ColBound.y());
CurX = QMAX(CurX, ColBound.x());
}
else
{
CurX = QMIN(QMAX(CurX, ColBound.x()), ColBound.y());
CurX = QMAX(CurX, ColBound.x());
hl->xp = CurX;
}
if ((TabCode == 4) && (RTab))
{
CurX += (wide+kernVal) / 2;
CurX = QMIN(QMAX(CurX, ColBound.x()), ColBound.y());
CurX = QMAX(CurX, ColBound.x());
}
if (((hl->cstyle & 128) || (hl->ch == "-")) && ((HyphenCount < Doc->HyCount) || (Doc->HyCount == 0)))
{
1544,7 → 1572,7
AbsHasDrop = true;
maxDY = CurY;
CurX += Doc->docParagraphStyles[hl->cab].DropDist;
CurX = QMIN(QMAX(CurX, ColBound.x()), ColBound.y());
CurX = QMAX(CurX, ColBound.x());
maxDX = CurX;
QPointArray tcli;
tcli.resize(4);
/branches/Version13x/Scribus/scribus/scribusview.cpp
4232,6 → 4232,17
delete ss;
if (Doc->docHyphenator->AutoCheck)
Doc->docHyphenator->slotHyphenate(currItem);
for (uint a = 0; a < Doc->Items.count(); ++a)
{
Doc->Items.at(a)->ItemNr = a;
if (Doc->Items.at(a)->isBookmark)
emit NewBMNr(Doc->Items.at(a)->BMnr, a);
}
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
ScApp->outlinePalette->BuildTree(Doc);
}
else
{
8052,6 → 8063,11
}
while (nextItem != 0)
{
for (ScText *it = nextItem->itemText.first(); it != 0; it = nextItem->itemText.next())
{
if ((it->ch == QChar(25)) && (it->cembedded != 0))
Doc->Items.remove(it->cembedded);
}
nextItem->itemText.clear();
nextItem->CPos = 0;
nextItem = nextItem->NextBox;
8081,6 → 8097,17
currItem->imageClip.resize(0);
/* emit UpdtObj(Doc->currentPage->PageNr, currItem->ItemNr); */
}
for (uint a = 0; a < Doc->Items.count(); ++a)
{
Doc->Items.at(a)->ItemNr = a;
if (Doc->Items.at(a)->isBookmark)
emit NewBMNr(Doc->Items.at(a)->BMnr, a);
}
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
ScApp->outlinePalette->BuildTree(Doc);
updateContents();
emit DocChanged();
}
8123,6 → 8150,11
ScApp->fileWatcher->removeFile(currItem->Pfile);
if (currItem->itemType() == PageItem::TextFrame)
{
for (ScText *it = currItem->itemText.first(); it != 0; it = currItem->itemText.next())
{
if ((it->ch == QChar(25)) && (it->cembedded != 0))
Doc->Items.remove(it->cembedded);
}
if ((currItem->NextBox != 0) || (currItem->BackBox != 0))
{
if (currItem->BackBox == 0)
/branches/Version13x/Scribus/scribus/libpostscript/pslib.cpp
2112,6 → 2112,9
}
}
}
/* just for being save for now, remove later */
if (hl->ch == QChar(25))
chx = " ";
if (hl->ch == QChar(29))
chx = " ";
if (hl->ch == QChar(24))
/branches/Version13x/Scribus/scribus/scribus.cpp
1446,6 → 1446,17
else
currItem->CPos = 0;
currItem->HasSel = false;
for (uint a = 0; a < doc->Items.count(); ++a)
{
doc->Items.at(a)->ItemNr = a;
if (doc->Items.at(a)->isBookmark)
bookmarkPalette->BView->ChangeItem(doc->Items.at(a)->BMnr, a);
}
if (doc->masterPageMode)
doc->MasterItems = doc->Items;
else
doc->DocItems = doc->Items;
outlinePalette->BuildTree(doc);
DisableTxEdit();
}
 
2370,10 → 2381,9
return;
}
cr = currItem->itemText.at(currItem->CPos)->ch;
if (currItem->HasSel)
deleteSelectedTextFromFrame(currItem);
else
currItem->itemText.remove(currItem->CPos);
if (!currItem->HasSel)
currItem->itemText.at(currItem->CPos)->cselect = true;
deleteSelectedTextFromFrame(currItem);
currItem->Tinput = false;
if ((cr == QChar(13)) && (currItem->itemText.count() != 0))
{
2397,13 → 2407,12
if (currItem->itemText.count() == 0)
break;
cr = currItem->itemText.at(QMAX(currItem->CPos-1,0))->ch;
if (currItem->HasSel)
deleteSelectedTextFromFrame(currItem);
else
if (!currItem->HasSel)
{
currItem->CPos -= 1;
currItem->itemText.remove(currItem->CPos);
currItem->itemText.at(currItem->CPos)->cselect = true;
}
deleteSelectedTextFromFrame(currItem);
currItem->Tinput = false;
if ((cr == QChar(13)) && (currItem->itemText.count() != 0))
{
4944,6 → 4953,17
delete gt;
if (doc->docHyphenator->AutoCheck)
doc->docHyphenator->slotHyphenate(currItem);
for (uint a = 0; a < doc->Items.count(); ++a)
{
doc->Items.at(a)->ItemNr = a;
if (doc->Items.at(a)->isBookmark)
bookmarkPalette->BView->ChangeItem(doc->Items.at(a)->BMnr, a);
}
if (doc->masterPageMode)
doc->MasterItems = doc->Items;
else
doc->DocItems = doc->Items;
outlinePalette->BuildTree(doc);
view->DrawNew();
slotDocCh();
}
5785,8 → 5805,6
else
ss->GetText(currItem, st, currItem->IFont, currItem->ISize, true);
delete ss;
if (doc->docHyphenator->AutoCheck)
doc->docHyphenator->slotHyphenate(currItem);
}
view->RefreshItem(currItem);
}
/branches/Version13x/Scribus/scribus/libpdf/pdflib.cpp
2735,6 → 2735,9
}
}
}
/* just for being save for now, remove later */
if (hl->ch == QChar(25))
chx = " ";
if (hl->ch == QChar(29))
chx = " ";
if (hl->ch == QChar(24))