Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 199 → Rev 200

/trunk/Scribus/scribus/vruler.cpp
58,10 → 58,6
double of, xl, iter, iter2;
double sc = doku->Scale;
int cor = 1;
if (sc > 1)
cor = 2;
if (sc > 4)
cor = 10;
switch (doku->Einheit)
{
case 0:
/trunk/Scribus/scribus/scribusview.cpp
149,6 → 149,7
PGS->setGeometry(x+90+sadj, y, 215, h);
LY->setGeometry(x+305+sadj, y, 110, h);
HR->setGeometry(25, 1, w-24, 25);
bar.setGeometry(x+415+sadj, y, w-(415+sadj), h);
}
}
 
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(15).arg("February").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(16).arg("February").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/hruler.cpp
151,6 → 151,7
}
}
}
p.end();
}
 
/** Zeichnet den Pfeil */
/trunk/Scribus/scribus/scribus.cpp
4734,120 → 4734,124
ers.append(3);
ers.append(4);
if (HaveDoc)
{
{
StilFormate *dia = new StilFormate(this, doc, &Prefs);
if (dia->exec())
{
for (uint a=5; a<doc->Vorlagen.count(); ++a)
{
for (uint a=5; a<doc->Vorlagen.count(); ++a)
{
ff = false;
nn = doc->Vorlagen[a].Vname;
for (uint b=0; b<dia->TempVorl.count(); ++b)
{
if (nn == dia->TempVorl[b].Vname)
{
if (nn == dia->TempVorl[b].Vname)
{
nr = b;
ff = true;
break;
}
}
}
if (ff)
ers.append(nr);
else
ers.append(0);
}
}
doc->Vorlagen = dia->TempVorl;
for (uint c=0; c<view->DocPages.count(); ++c)
{
for (uint d=0; d<view->DocPages.at(c)->Items.count(); ++d)
{
for (uint d=0; d<view->DocPages.at(c)->Items.count(); ++d)
{
ite = view->DocPages.at(c)->Items.at(d);
if (ite->PType == 4)
{
for (uint e=0; e<ite->Ptext.count(); ++e)
{
for (uint e=0; e<ite->Ptext.count(); ++e)
if (ite->Ptext.at(e)->cab > 4)
{
if (ite->Ptext.at(e)->cab > 4)
ite->Ptext.at(e)->cab = ers[ite->Ptext.at(e)->cab];
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
}
else
else
{
ite->Ptext.at(e)->ccolor = ite->TxtFill;
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
// ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
ite->Ptext.at(e)->ccolor = ite->TxtFill;
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
}
}
}
}
}
}
for (uint c=0; c<view->MasterPages.count(); ++c)
{
for (uint d=0; d<view->MasterPages.at(c)->Items.count(); ++d)
{
for (uint d=0; d<view->MasterPages.at(c)->Items.count(); ++d)
{
ite = view->MasterPages.at(c)->Items.at(d);
if (ite->PType == 4)
{
for (uint e=0; e<ite->Ptext.count(); ++e)
{
for (uint e=0; e<ite->Ptext.count(); ++e)
if (ite->Ptext.at(e)->cab > 4)
{
if (ite->Ptext.at(e)->cab > 4)
ite->Ptext.at(e)->cab = ers[ite->Ptext.at(e)->cab];
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= doc->Vorlagen[ite->Ptext.at(e)->cab].FontEffect;
ite->Ptext.at(e)->ccolor = doc->Vorlagen[ite->Ptext.at(e)->cab].FColor;
ite->Ptext.at(e)->cshade = doc->Vorlagen[ite->Ptext.at(e)->cab].FShade;
ite->Ptext.at(e)->cstroke = doc->Vorlagen[ite->Ptext.at(e)->cab].SColor;
ite->Ptext.at(e)->cshade2 = doc->Vorlagen[ite->Ptext.at(e)->cab].SShade;
}
else
else
{
ite->Ptext.at(e)->ccolor = ite->TxtFill;
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
// ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
ite->Ptext.at(e)->ccolor = ite->TxtFill;
ite->Ptext.at(e)->cshade = ite->ShTxtFill;
ite->Ptext.at(e)->cstroke = ite->TxtStroke;
ite->Ptext.at(e)->cshade2 = ite->ShTxtStroke;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->cstyle &= ~127;
ite->Ptext.at(e)->cstyle |= ite->TxTStyle;
}
}
}
}
}
}
for (uint a=0; a<doc->Vorlagen.count(); ++a)
{
if (doc->Vorlagen[a].Font != "")
{
if (doc->Vorlagen[a].Font != "")
{
QString nf = doc->Vorlagen[a].Font;
if (!doc->UsedFonts.contains(nf))
{
{
doc->AddFont(nf, Prefs.AvailFonts[nf]->Font);
int ff = FontMenu->insertItem(new FmItem(nf, Prefs.AvailFonts[nf]->Font));
FontID.insert(ff, Prefs.AvailFonts[nf]->SCName);
}
}
}
}
Mpal->Spal->updateFList();
view->DrawNew();
slotDocCh();
}
}
delete dia;
}
}
}
 
void ScribusApp::setItemTextAli(int id)
/trunk/Scribus/scribus/page.cpp
6012,7 → 6012,7
nb->Ptext.at(a)->cshade = nb->ShTxtFill;
nb->Ptext.at(a)->cstroke = nb->TxtStroke;
nb->Ptext.at(a)->cshade2 = nb->ShTxtStroke;
// nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
6052,7 → 6052,7
nb->Ptext.at(a)->cshade = nb->ShTxtFill;
nb->Ptext.at(a)->cstroke = nb->TxtStroke;
nb->Ptext.at(a)->cshade2 = nb->ShTxtStroke;
// nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->cstyle &= ~127;
nb->Ptext.at(a)->cstyle |= nb->TxTStyle;
}
6095,7 → 6095,7
b->Ptext.at(a)->cshade = b->ShTxtFill;
b->Ptext.at(a)->cstroke = b->TxtStroke;
b->Ptext.at(a)->cshade2 = b->ShTxtStroke;
// b->Ptext.at(a)->csize = b->ISize;
b->Ptext.at(a)->csize = b->ISize;
b->Ptext.at(a)->cstyle &= ~127;
b->Ptext.at(a)->cstyle |= b->TxTStyle;
}