Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2557 → Rev 2558

/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("20").arg("June").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("26").arg("June").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribusXml.cpp
2215,7 → 2215,7
{
int te, te2, tsh, tsh2, tst, tst2, tsb, tsb2, tshs, tshs2;
QString text, tf, tf2, tc, tc2, tcs, tcs2, tmp, tmpy;
double ts, ts2, tsc, tsc2, tscv, tscv2, tb, tb2, tsx, tsx2, tsy, tsy2, tout, tout2, tulp, tulp2, tulw, tulw2, tstp, tstp2, tstw, tstw2;
double ts, ts2, tsc, tsc2, tscv, tscv2, tb, tb2, tsx, tsx2, tsy, tsy2, tout, tout2, tulp, tulp2, tulw, tulw2, tstp, tstp2, tstw, tstw2, xo, yo;
PageItem *item;
QDomDocument docu("scribus");
QString st="<SCRIBUSELEMUTF8></SCRIBUSELEMUTF8>";
2226,17 → 2226,27
for (uint cor=0; cor<Selitems->count(); ++cor)
ELL.append(Selitems->at(cor)->ItemNr);
qHeapSort(ELL);
if (item->OwnPage == -1)
{
xo = 0;
yo = 0;
}
else
{
xo = item->Doc->Pages.at(item->OwnPage)->Xoffset;
yo = item->Doc->Pages.at(item->OwnPage)->Yoffset;
}
if (view->GroupSel)
{
elem.setAttribute("XP", view->GroupX - doc->currentPage->Xoffset);
elem.setAttribute("YP", view->GroupY - doc->currentPage->Yoffset);
elem.setAttribute("XP", view->GroupX - xo);
elem.setAttribute("YP", view->GroupY - yo);
elem.setAttribute("W", view->GroupW);
elem.setAttribute("H", view->GroupH);
}
else
{
elem.setAttribute("XP", item->Xpos - doc->currentPage->Xoffset);
elem.setAttribute("YP", item->Ypos - doc->currentPage->Yoffset);
elem.setAttribute("XP", item->Xpos - xo);
elem.setAttribute("YP", item->Ypos - yo);
elem.setAttribute("W", item->Width);
elem.setAttribute("H", item->Height);
}
/branches/Version13x/Scribus/scribus/pageitem.cpp
1180,14 → 1180,8
hl->cstyle &= 0xEFFF; // 4095;
if (LiList.count() == 0)
{
if (((a > 0) && (itemText.at(a-1)->ch == QChar(13))) || ((a == 0) && (BackBox == 0)))
if (((a > 0) && (itemText.at(a-1)->ch == QChar(13))) || ((a == 0) && (BackBox == 0)) && (!StartOfCol))
{
/* if (((a > 0) && ((itemText.at(a-1)->ch == QChar(13)) || (itemText.at(a-1)->ch == QChar(28)) || (outs))) || ((a == 0) && (BackBox == 0)))
{
if (Doc->docParagraphStyles[absa].BaseAdj)
CurY += Doc->typographicSetttings.valueBaseGrid;
else
CurY += Doc->docParagraphStyles[absa].LineSpa; */
CurY += Doc->docParagraphStyles[absa].gapBefore;
if (chx != QChar(13))
DropCmode = Doc->docParagraphStyles[absa].Drop;
1207,7 → 1201,6
}
}
}
// outs = false;
}
if (DropCmode)
{
1357,8 → 1350,8
if (StartOfCol)
{
CurY = asce+TExtra+lineCorr+1;
if (((a > 0) && (itemText.at(a-1)->ch == QChar(13))) || ((a == 0) && (BackBox == 0)))
CurY += Doc->docParagraphStyles[hl->cab].gapBefore;
// if (((a > 0) && (itemText.at(a-1)->ch == QChar(13))) || ((a == 0) && (BackBox == 0)))
// CurY += Doc->docParagraphStyles[hl->cab].gapBefore;
}
if (Doc->docParagraphStyles[hl->cab].BaseAdj)
{
1936,7 → 1929,12
if (Doc->docParagraphStyles[hl->cab].BaseAdj)
CurY += Doc->typographicSetttings.valueBaseGrid;
else
CurY += Doc->docParagraphStyles[hl->cab].LineSpa;
{
if (a < MaxText-1)
CurY += Doc->docParagraphStyles[itemText.at(a+1)->cab].LineSpa;
else
CurY += Doc->docParagraphStyles[hl->cab].LineSpa;
}
if (AbsHasDrop)
{
if ((CurY > maxDY) && (CurY - asce > maxDY))
/branches/Version13x/Scribus/scribus/scribusview.cpp
8208,19 → 8208,9
{
Doc->FrameItems.at(a)->ItemNr = a;
}
 
if (anz > 1)
undoManager->commit();
 
if (GroupSel)
{
double x, y, w, h;
getGroupRect(&x, &y, &w, &h);
GroupSel = false;
updateContents(QRect(static_cast<int>(x-5), static_cast<int>(y-5), static_cast<int>(w+10), static_cast<int>(h+10)));
}
else
updateContents();
updateContents();
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
/branches/Version13x/Scribus/scribus.kdevses
7,11 → 7,7
<breakpointList/>
</kdevdebugger>
<kdevbookmarks>
<bookmarks>
<bookmark url="/home/franz/Entwicklung/AnonCVS/Scribus13x/Scribus/scribus/pageitem.cpp" >
<mark line="1938" />
</bookmark>
</bookmarks>
<bookmarks/>
</kdevbookmarks>
<kdevvalgrind>
<executable path="" params="" />